diff options
| -rw-r--r-- | debian/README.source | 48 | ||||
| -rw-r--r-- | debian/changelog | 330 | ||||
| -rw-r--r-- | debian/compat | 1 | ||||
| -rw-r--r-- | debian/control | 22 | ||||
| -rw-r--r-- | debian/copyright | 39 | ||||
| -rw-r--r-- | debian/patches/java_ignore_nonexistent_files | 17 | ||||
| -rw-r--r-- | debian/patches/no_commandline_arguments | 17 | ||||
| -rw-r--r-- | debian/patches/remove_broken_symlinks | 19 | ||||
| -rw-r--r-- | debian/patches/series | 3 | ||||
| -rw-r--r-- | debian/pycompat | 1 | ||||
| -rwxr-xr-x | debian/rules | 60 | ||||
| -rw-r--r-- | debian/scons.dirs | 3 | ||||
| -rw-r--r-- | debian/scons.docs | 1 | ||||
| -rw-r--r-- | debian/scons.manpages | 3 | ||||
| -rw-r--r-- | debian/watch | 2 |
15 files changed, 566 insertions, 0 deletions
diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..ca55125 --- /dev/null +++ b/debian/README.source @@ -0,0 +1,48 @@ +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +To get the fully patched source after unpacking the source package, cd to +the root level of the source package and run: + + quilt push -a + +The last patch listed in debian/patches/series will become the current +patch. + +To add a new set of changes, first run quilt push -a, and then run: + + quilt new <patch> + +where <patch> is a descriptive name for the patch, used as the filename in +debian/patches. Then, for every file that will be modified by this patch, +run: + + quilt add <file> + +before editing those files. You must tell quilt with quilt add what files +will be part of the patch before making changes or quilt will not work +properly. After editing the files, run: + + quilt refresh + +to save the results as a patch. + +Alternately, if you already have an external patch and you just want to +add it to the build system, run quilt push -a and then: + + quilt import -P <patch> /path/to/patch + quilt push -a + +(add -p 0 to quilt import if needed). <patch> as above is the filename to +use in debian/patches. The last quilt push -a will apply the patch to +make sure it works properly. + +To remove an existing patch from the list of patches that will be applied, +run: + + quilt delete <patch> + +You may need to run quilt pop -a to unapply patches first before running +this command. + diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..dadb9f6 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,330 @@ +scons (1.2.0-2) unstable; urgency=low + + * Upload to unstable (Closes: #522413). + * debian/patches/no_commandline_arguments: + - Fix an exception when a null command-line argument is passed in. + * Update Standards-Version to 3.8.1, no changes required. + * Add watch file. + + -- Luca Falavigna <dktrkranz@ubuntu.com> Sat, 04 Apr 2009 00:15:48 +0200 + +scons (1.2.0-1) experimental; urgency=low + + * New upstream release. + * debian/patches/remove_broken_symlinks: + - In Clean() routine, try to delete symlinks even if files they point + to are not available (Closes: #485521). + * debian/patches/qt_missing_moc: + - Dropped, implemented upstream time ago. + * Add description to debian/patches/* to make Lintian happy. + + -- Luca Falavigna <dktrkranz@ubuntu.com> Fri, 26 Dec 2008 18:06:57 +0100 + +scons (1.1.0-1) experimental; urgency=low + + * New upstream release. + * debian/patches/java_ignore_nonexistent_files: + - Check for file/symlink existence before trying to use it in Java(), + this prevents IOError exception (Closes: #338232). + * Provide a README.source to document quilt usage, as per policy. + + -- Luca Falavigna <dktrkranz@ubuntu.com> Sat, 11 Oct 2008 18:23:42 +0200 + +scons (1.0.1-1) experimental; urgency=low + + * New upstream release. + + -- Luca Falavigna <dktrkranz@ubuntu.com> Wed, 10 Sep 2008 20:29:32 +0200 + +scons (1.0.0-1) unstable; urgency=low + + * New upstream release. + - Document better SideEffect usage (Closes: #430470). + - debian/patches/manpage_indentation dropped, implemented upstream. + * Add DM-Upload-Allowed field. + + -- Luca Falavigna <dktrkranz@ubuntu.com> Wed, 13 Aug 2008 09:11:43 +0000 + +scons (0.98.5-1) unstable; urgency=low + + * New upstream release. + * debian/patches/manpage_indentation: + - Fix scons manpage indentation, thanks Colin Watson (Closes: #472903). + * debian/control: + - Bump Standards-Version to 3.8.0 (no changes required). + + -- Luca Falavigna <dktrkranz@ubuntu.com> Tue, 10 Jun 2008 07:21:31 +0000 + +scons (0.98.4-1) unstable; urgency=low + + * New upstream release. + * debian/control: + - Set myself as Maintainer, move Mark Brown to Uploaders + (Closes: #477925). + * debian/copyright: + - Update copyright holder. + + -- Luca Falavigna <dktrkranz@ubuntu.com> Mon, 19 May 2008 16:08:06 +0200 + +scons (0.98.3-1) unstable; urgency=low + + [ Mark Brown ] + * Add Luca Falavigna to Uploaders pending probable formation of a team. + + [ Luca Falavigna ] + * New upstream release: + - Options object backwards compatibility (Closes: #477912). + * Add quilt support, existing patches are now managed with it: + - debian/patches/qt_missing_moc. + * debian/control: + - Move python-central to Build-Depends-Indep. + - Bump to Standards-Version: 3.7.3. + - Add Homepage field. + * debian/compat: + - Bump version to 5. + * debian/scons.manpages: + - Add scons-time.1 man page. + + -- Mark Brown <broonie@debian.org> Wed, 30 Apr 2008 21:41:02 +0100 + +scons (0.98.2-3) unstable; urgency=low + + * Rebuild with python-central 0.6.6 for more bug fixes (closes: #476976). + + -- Mark Brown <broonie@debian.org> Sun, 27 Apr 2008 11:43:36 +0100 + +scons (0.98.2-2) unstable; urgency=low + + * Backport fix for propagation of CXXFLAGS to SHCXXFLAGS (closes: #477930). + + -- Mark Brown <broonie@debian.org> Sat, 26 Apr 2008 11:34:30 +0100 + +scons (0.98.2-1) unstable; urgency=low + + * New upstream release. + * Build against new python-central, picking up new generated code which + fixes upgrades (closes: #476976). + + -- Mark Brown <broonie@debian.org> Tue, 22 Apr 2008 20:55:03 +0100 + +scons (0.98.1-1) unstable; urgency=low + + * New upstream release. + + -- Mark Brown <broonie@debian.org> Sat, 19 Apr 2008 12:42:01 +0100 + +scons (0.98.0-1) unstable; urgency=low + + * New upstream release. + + -- Mark Brown <broonie@debian.org> Tue, 01 Apr 2008 19:26:31 +0100 + +scons (0.97.0d20080304-1) unstable; urgency=low + + * Snapshot of revision 2680. + * This snapshot supports passing lists of Nodes to the File() constructor. + + -- Mark Brown <broonie@debian.org> Tue, 04 Mar 2008 19:24:23 +0000 + +scons (0.97.0d20080303-1) unstable; urgency=low + + * Snapshot of revision 2678. + * This snapshot supports passing lists of Nodes to Chmod() (closes: #464136). + + -- Mark Brown <broonie@debian.org> Mon, 03 Mar 2008 20:15:36 +0000 + +scons (0.97.0d20071212-3) unstable; urgency=low + + * Apply upstream patch fixing handling of missing files specified with + absolute paths in ifdefed code (closes: #457056). + + -- Mark Brown <broonie@debian.org> Wed, 19 Dec 2007 19:25:28 +0000 + +scons (0.97.0d20071212-2) unstable; urgency=low + + * Apply upstream patch fixing handling of absolute paths (closes: #456518). + + -- Mark Brown <broonie@debian.org> Mon, 17 Dec 2007 18:17:14 +0000 + +scons (0.97.0d20071212-1) unstable; urgency=low + + * New upstream release. + + -- Mark Brown <broonie@debian.org> Fri, 14 Dec 2007 20:22:42 +0000 + +scons (0.97.0d20071203-1) unstable; urgency=low + + * Unofficial upstream snapshot (SVN revision 2509). + * Incorporates fix for build failures when cleaning (closes: #444204). + + -- Mark Brown <broonie@debian.org> Mon, 03 Dec 2007 19:29:59 +0000 + +scons (0.97.0d20070918-1) unstable; urgency=low + + * New upstream release. + + -- Mark Brown <broonie@debian.org> Wed, 19 Sep 2007 12:09:26 +0100 + +scons (0.97.0d20070809-1) unstable; urgency=low + + * New upstream release. + + -- Mark Brown <broonie@debian.org> Sat, 11 Aug 2007 00:06:27 +0100 + +scons (0.97-1) unstable; urgency=low + + * New upstream release. + + -- Mark Brown <broonie@debian.org> Fri, 18 May 2007 18:49:36 +0100 + +scons (0.96.93-2) unstable; urgency=low + + * Apply patch from Tom Parker <debian@tevp.net> fixing QT builder when used + with missing moc files (closes: #400922). + + -- Mark Brown <broonie@debian.org> Wed, 29 Nov 2006 19:27:39 +0000 + +scons (0.96.93-1) unstable; urgency=low + + * New upstream release. + + -- Mark Brown <broonie@debian.org> Tue, 7 Nov 2006 19:21:10 +0000 + +scons (0.96.92-2) unstable; urgency=low + + * Make some vauge wavings at the new Python policy, picking python-central + at random (closes: #380944). + * Install into our own module directory again since it seems to be more + policy compliant. + * Invoke setup.py in the clean target for good measure. + * Move build dependencies to Build-Depends. + * Policy 3.7.2 (no changes). + + -- Mark Brown <broonie@debian.org> Tue, 1 Aug 2006 20:04:42 +0100 + +scons (0.96.92-1) unstable; urgency=low + + * New upstream release. + + -- Mark Brown <broonie@debian.org> Sat, 6 May 2006 11:43:02 +0100 + +scons (0.96.91-2) experimental; urgency=low + + * Ask setup.py not to install man pages into /usr/man (closes: #338415). + * Ship upstream release notes. + * Install into the standard Python directory. + * Don't installed versioned copies of scripts. + * Fix .R->.RI typo in man page. + + -- Mark Brown <broonie@debian.org> Sun, 13 Nov 2005 15:35:53 +0000 + +scons (0.96.91-1) experimental; urgency=low + + * New upstream release. + * Uploaded to experimental since it is still a prerelease (closes: #312289). + + -- Mark Brown <broonie@debian.org> Wed, 14 Sep 2005 20:50:08 +0100 + +scons (0.96.90-1) experimental; urgency=low + + * New upstream release. + * Uploaded to experimental since it is still a prerelease (closes: #312289). + + -- Mark Brown <broonie@debian.org> Wed, 29 Jun 2005 22:46:48 +0100 + +scons (0.96.1-2) unstable; urgency=low + + * Ship upstream release notes. + * Install into standard Python directories. + + -- Mark Brown <broonie@debian.org> Sun, 13 Nov 2005 15:11:40 +0000 + +scons (0.96.1-1) unstable; urgency=low + + * New upstream release. + + -- Mark Brown <broonie@debian.org> Tue, 24 Aug 2004 08:57:22 +0100 + +scons (0.96-1) unstable; urgency=low + + * New upstream release. + + -- Mark Brown <broonie@debian.org> Wed, 18 Aug 2004 22:30:42 +0100 + +scons (0.95-1) unstable; urgency=low + + * New upstream release. + + -- Mark Brown <broonie@debian.org> Mon, 8 Mar 2004 20:59:58 +0000 + +scons (0.94-1) unstable; urgency=low + + * New upstream release. + + -- Mark Brown <broonie@debian.org> Sat, 8 Nov 2003 12:49:24 +0000 + +scons (0.93-1) unstable; urgency=low + + * New upstream release. + + -- Mark Brown <broonie@debian.org> Fri, 24 Oct 2003 08:45:46 +0100 + +scons (0.92-2) unstable; urgency=low + + * Build depend on python-dev (closes: #216373). + + -- Mark Brown <broonie@debian.org> Sat, 18 Oct 2003 13:39:04 +0100 + +scons (0.92-1) unstable; urgency=low + + * New maintainer. + * New upstream release (closes: #174332). + * Rewrite description (closes: #198315). + * Use dh_python (closes: #212703). + * Update to debhelper version 4 and use setup.py for installation. + * Update to policy 3.6.1 (no changes). + + -- Mark Brown <broonie@debian.org> Wed, 15 Oct 2003 20:35:57 +0100 + +scons (0.08-1) unstable; urgency=low + + * New upstream release (Closes: #158373) + + -- Moshe Zadka <moshez@debian.org> Mon, 21 Oct 2002 16:52:11 +0200 + +scons (0.07-3) unstable; urgency=low + + * Removing /usr/doc links + * Python 2.1 -> Python 2.2 + + -- Moshe Zadka <moshez@debian.org> Tue, 27 Aug 2002 18:48:02 +0300 + +scons (0.07-2) unstable; urgency=low + + * Ugh, who would put distutils.core in python-dev? Changing build + dependancies (Closes: #146601) + * While we're at it, update Standards-Version + + -- Moshe Zadka <moshez@debian.org> Sat, 11 May 2002 08:25:07 +0300 + +scons (0.07-1) unstable; urgency=low + + * New upstream version + * Packaging properly, instead of as debian native + * Modifying copyright to include upstream location (Closes: #144491) + * Fixing my e-mail address (Closes: #144490) + * Thanks for looking after my packages, tbm ;-) + + -- Moshe Zadka <moshez@debian.org> Sat, 4 May 2002 13:05:53 +0300 + +scons (0.06-1) unstable; urgency=low + + * New upstream version + + -- Moshe Zadka <moshez@debian.org> Mon, 15 Apr 2002 19:22:09 +0300 + +scons (0.05-1) unstable; urgency=low + + * First upload (closes: #140128) + + -- Moshe Zadka <moshez@debian.org> Wed, 27 Mar 2002 10:40:42 +0200 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..7ed6ff8 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +5 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..f6c013d --- /dev/null +++ b/debian/control @@ -0,0 +1,22 @@ +Source: scons +Section: devel +Priority: optional +Maintainer: Luca Falavigna <dktrkranz@ubuntu.com> +Uploaders: Mark Brown <broonie@debian.org> +Build-Depends: debhelper (>= 5.0.37.2), python-dev, quilt +Build-Depends-Indep: python-central (>= 0.5) +Standards-Version: 3.8.1 +XS-Python-Version: current +Homepage: http://www.scons.org/ +DM-Upload-Allowed: yes + +Package: scons +Architecture: all +Depends: ${python:Depends} +XB-Python-Version: ${python:Versions} +Description: A replacement for Make + SCons is a make replacement providing a range of enhanced features such + as automated dependency generation and built in compilation cache + support. SCons rule sets are Python scripts so as well as the features + it provides itself SCons allows you to use the full power of Python + to control compilation. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..fcd06d7 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,39 @@ +This package was debianized by Moshe Zadka <moshez@debian.org> on +Wed, 27 Mar 2002 10:40:28 +0200. + +It was downloaded from http://www.scons.org + +Upstream Author: +Steven Knight +knight at baldmt dot com +http://www.baldmt.com/~knight/ + +With plenty of help from the SCons Development team: + Chad Austin + Charles Crain + Steve Leblanc + Anthony Roach + + +Copyright: + +Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 The SCons Foundation + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/debian/patches/java_ignore_nonexistent_files b/debian/patches/java_ignore_nonexistent_files new file mode 100644 index 0000000..123b72c --- /dev/null +++ b/debian/patches/java_ignore_nonexistent_files @@ -0,0 +1,17 @@ +Description: Check for file/symlink existence before trying to use it in Java(). +Upstream bug: http://scons.tigris.org/issues/show_bug.cgi?id=2207 +Debian bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=338232 + +Index: scons-1.1.0/engine/SCons/Tool/javac.py +=================================================================== +--- scons-1.1.0.orig/engine/SCons/Tool/javac.py 2008-10-11 18:11:46.083270910 +0200 ++++ scons-1.1.0/engine/SCons/Tool/javac.py 2008-10-11 18:13:04.519739110 +0200 +@@ -94,6 +94,8 @@ + version = env.get('JAVAVERSION', '1.4') + full_tlist = [] + for f in slist: ++ if not os.path.exists(f.rfile().get_abspath()): ++ continue + tlist = [] + source_file_based = True + pkg_dir = None diff --git a/debian/patches/no_commandline_arguments b/debian/patches/no_commandline_arguments new file mode 100644 index 0000000..a5be27c --- /dev/null +++ b/debian/patches/no_commandline_arguments @@ -0,0 +1,17 @@ +Description: Fix an exception when a null command-line argument is passed in. +Upstream bug: http://scons.tigris.org/issues/show_bug.cgi?id=2368 +Ubuntu bug: https://launchpad.net/bugs/338492 + +Index: scons-1.2.0/engine/SCons/Script/Main.py +=================================================================== +--- scons-1.2.0.orig/engine/SCons/Script/Main.py 2009-03-06 08:13:35.000000000 +0000 ++++ scons-1.2.0/engine/SCons/Script/Main.py 2009-03-06 08:13:57.000000000 +0000 +@@ -869,7 +869,7 @@ + targets = [] + xmit_args = [] + for a in parser.largs: +- if a[0] == '-': ++ if a[:1] == '-': + continue + if '=' in a: + xmit_args.append(a) diff --git a/debian/patches/remove_broken_symlinks b/debian/patches/remove_broken_symlinks new file mode 100644 index 0000000..f28a4d7 --- /dev/null +++ b/debian/patches/remove_broken_symlinks @@ -0,0 +1,19 @@ +Description: In Clean() routine, try to delete symlinks even if files they point to are not available. +Upstream bug: http://scons.tigris.org/issues/show_bug.cgi?id=2095 +Debian bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=485521 + +Index: scons-1.2.0/engine/SCons/Script/Main.py +=================================================================== +--- scons-1.2.0.orig/engine/SCons/Script/Main.py 2008-12-26 17:46:29.470044569 +0100 ++++ scons-1.2.0/engine/SCons/Script/Main.py 2008-12-26 17:46:40.238042348 +0100 +@@ -328,6 +328,10 @@ + # then delete dir itself + if remove: os.rmdir(path) + display("Removed directory " + pathstr) ++ else: ++ if os.path.islink(path): ++ if remove: os.unlink(path) ++ display("Removed " + pathstr) + except (IOError, OSError), e: + print "scons: Could not remove '%s':" % pathstr, e.strerror + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..db145e8 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,3 @@ +java_ignore_nonexistent_files +remove_broken_symlinks +no_commandline_arguments diff --git a/debian/pycompat b/debian/pycompat new file mode 100644 index 0000000..0cfbf08 --- /dev/null +++ b/debian/pycompat @@ -0,0 +1 @@ +2 diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..a1a35fa --- /dev/null +++ b/debian/rules @@ -0,0 +1,60 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/quilt/quilt.make + +configure: configure-stamp +configure-stamp: + dh_testdir + touch configure-stamp + +build: patch configure-stamp build-stamp +build-stamp: + dh_testdir + python setup.py build + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + python setup.py clean + rm -f build-stamp configure-stamp + rm -rf build/ + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + python setup.py install --root=`pwd`/debian/scons --no-compile --no-install-man --no-version-script --standalone-lib + rm -rf debian/scons/usr/man + +# Build architecture-independent files here. +binary-indep: build install + dh_testdir + dh_testroot + dh_installdocs + dh_pycentral + dh_installman + dh_installchangelogs CHANGES.txt + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +# Build architecture-dependent files here. +binary-arch: build install + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure diff --git a/debian/scons.dirs b/debian/scons.dirs new file mode 100644 index 0000000..93a451b --- /dev/null +++ b/debian/scons.dirs @@ -0,0 +1,3 @@ +usr/bin +usr/share/doc/scons +usr/share/man/man1 diff --git a/debian/scons.docs b/debian/scons.docs new file mode 100644 index 0000000..71dfd5b --- /dev/null +++ b/debian/scons.docs @@ -0,0 +1 @@ +README.txt diff --git a/debian/scons.manpages b/debian/scons.manpages new file mode 100644 index 0000000..ce14d14 --- /dev/null +++ b/debian/scons.manpages @@ -0,0 +1,3 @@ +scons.1 +sconsign.1 +scons-time.1 diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..d3c1057 --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/scons/scons-([0-9.]+)\.tar.gz |