diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 472 | ||||
| -rw-r--r-- | debian/compat | 1 | ||||
| -rw-r--r-- | debian/control | 21 | ||||
| -rw-r--r-- | debian/copyright | 44 | ||||
| -rw-r--r-- | debian/docs | 1 | ||||
| -rw-r--r-- | debian/manpages | 3 | ||||
| -rw-r--r-- | debian/patches/java_ignore_nonexistent_files.patch | 21 | ||||
| -rw-r--r-- | debian/patches/manpages.patch | 92 | ||||
| -rw-r--r-- | debian/patches/parallel_build.patch | 38 | ||||
| -rw-r--r-- | debian/patches/remove_stale_files.patch | 31 | ||||
| -rw-r--r-- | debian/patches/series | 4 | ||||
| -rwxr-xr-x | debian/rules | 12 | ||||
| -rw-r--r-- | debian/source/format | 1 | ||||
| -rw-r--r-- | debian/watch | 2 |
14 files changed, 743 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..95ca010 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,472 @@ +scons (2.3.0-2) unstable; urgency=low + + * Upload to unstable. + * debian/patches/java_ignore_nonexistent_files.patch: + - Do not check for symlink reference, check whether files can be + opened instead, and return a valid tuple anyway (LP: #1101094). + * debian/patches/manpages.patch: + - Fix spelling errors in the man pages. + * debian/control: + - Move VCS repository under collab-maint. + + -- Luca Falavigna <dktrkranz@debian.org> Sun, 05 May 2013 11:42:32 +0200 + +scons (2.3.0-1) experimental; urgency=low + + * New upstream release. + * debian/patches/remove_stale_files.patch: + - Refresh for new upstream release. + * debian/control: + - Bump Standards-Version to 3.9.4, no changes required. + + -- Luca Falavigna <dktrkranz@debian.org> Mon, 11 Mar 2013 22:30:58 +0100 + +scons (2.2.0-1) experimental; urgency=low + + * New upstream release. + - New documentation for custom Decider functions (Closes: #579337). + * debian/patches/remove_stale_files.patch: + - Refresh for new upstream release. + * debian/compat: + - Bump compatibility level to 9. + * debian/control: + - Bump Standards-Version to 3.9.3, no changes required. + + -- Luca Falavigna <dktrkranz@debian.org> Mon, 20 Aug 2012 23:26:43 +0200 + +scons (2.1.0-1) unstable; urgency=low + + * New upstream release. + * debian/patches/fortran03.patch: + - Remove, merged upstream. + * debian/patches/remove_stale_files.patch: + - Refresh for new upstream release. + + -- Luca Falavigna <dktrkranz@debian.org> Sat, 10 Sep 2011 11:14:31 +0200 + +scons (2.0.1-2) unstable; urgency=low + + * debian/patches/parallel_build.patch: + - Disable parallel build on sparc machines as a workaround to weird + build failures seen on several packages (Closes: #632228). + * debian/control: + - Bump Standards-Version to 3.9.2, no changes required. + + -- Luca Falavigna <dktrkranz@debian.org> Sat, 02 Jul 2011 13:34:20 +0200 + +scons (2.0.1-1) unstable; urgency=low + + * New upstream release. + * Switch to dh_python2. + * debian/control: + - Bump Standards-Version to 3.9.1, no changes required. + * debian/watch: + - Adjust to ignore development versions. + + -- Luca Falavigna <dktrkranz@debian.org> Thu, 10 Feb 2011 23:10:48 +0100 + +scons (2.0.0-1) unstable; urgency=low + + * New upstream release. + - No longer use string exceptions (Closes: #585353). + * Refresh patches for new upstream release. + * debian/patches/fortran03.patch: + - Add fortran03 support, thanks Alastair McKinstry! (Closes: #583658). + * debian/watch: + - Look for 2.0 branch. + + -- Luca Falavigna <dktrkranz@debian.org> Tue, 15 Jun 2010 16:14:58 +0200 + +scons (1.3.0-1) unstable; urgency=low + + * New upstream release. + + -- Luca Falavigna <dktrkranz@debian.org> Thu, 25 Mar 2010 20:42:14 +0100 + +scons (1.2.0.d20100306-1) unstable; urgency=low + + * New upstream checkpoint release. + * debian/patches/manpages.patch: + - Removed, applied upstream. + * debian/control: + - Bump Standards-Version to 3.8.4, no changes required. + + -- Luca Falavigna <dktrkranz@debian.org> Wed, 10 Mar 2010 13:58:54 +0100 + +scons (1.2.0.d20100117-1) unstable; urgency=low + + * New upstream checkpoint release. + * Switch to format 3.0 (quilt). + + -- Luca Falavigna <dktrkranz@debian.org> Sat, 23 Jan 2010 15:14:43 +0100 + +scons (1.2.0.d20091224-1) unstable; urgency=low + + * New upstream checkpoint release. + * debian/patches/manpages.patch: + - Changes applied in previous release were fixed upstream. + - Fix several spelling and syntax errors. + + -- Luca Falavigna <dktrkranz@debian.org> Tue, 29 Dec 2009 13:14:34 +0100 + +scons (1.2.0.d20090919-1) unstable; urgency=low + + * New upstream checkpoint release. + * debian/patches/remove_stale_files.patch: + - Remove stale files created by SCons when building Debian packages. + Check if DH_INTERNAL_OPTIONS is set, then delete selected files. This + is a workaround to fix double compilation, it will reverted when + upstream implements support for deep clean (Closes: #519948). + * debian/patches/manpages.patch: + - Fix errors in manpages. + + -- Luca Falavigna <dktrkranz@debian.org> Sat, 05 Dec 2009 18:16:57 +0100 + +scons (1.2.0.d20090905-1) unstable; urgency=low + + * New upstream checkpoint release. + * Remove obsolete patches, they have been merged upstream: + - debian/patches/no_commandline_arguments.patch + - debian/patches/remove_broken_symlinks.patch + * Update my e-mail address. + * Remove DM-Upload-Allowed field. + * Update copyright informations. + * Switch to debhelper 7. + * Switch to python-support. + * Do not build-depend on unnecessary python-dev, replace it with python. + * Add Vcs-* fields to document where SCons debianisation is stored. + * Bump Standards-Version to 3.8.3, no changes required. + * Adhere to DEP3. + + -- Luca Falavigna <dktrkranz@debian.org> Wed, 09 Sep 2009 20:26:05 +0200 + +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..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..650d55d --- /dev/null +++ b/debian/control @@ -0,0 +1,21 @@ +Source: scons +Section: devel +Priority: optional +Maintainer: Luca Falavigna <dktrkranz@debian.org> +Uploaders: Mark Brown <broonie@debian.org> +Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~) +Standards-Version: 3.9.4 +X-Python-Version: >= 2.4 +Homepage: http://www.scons.org/ +Vcs-Git: git://anonscm.debian.org/collab-maint/scons.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/scons.git;a=summary + +Package: scons +Architecture: all +Depends: ${python:Depends}, ${misc:Depends} +Description: 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..cad3d09 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,44 @@ +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 © 2001-2009 The SCons Foundation +Copyright © 1999-2006 Gregory P. Ward. +Copyright © 2001-2003 Steven Knight +Copyright © 2001-2004 Twisted Matrix Laboratories +Copyright © 2002-2006 Python Software Foundation. +Copyright © 2003-2005 Peter Astrand +Copyright © 2003 Stichting NLnet Labs + +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/docs b/debian/docs new file mode 100644 index 0000000..71dfd5b --- /dev/null +++ b/debian/docs @@ -0,0 +1 @@ +README.txt diff --git a/debian/manpages b/debian/manpages new file mode 100644 index 0000000..ce14d14 --- /dev/null +++ b/debian/manpages @@ -0,0 +1,3 @@ +scons.1 +sconsign.1 +scons-time.1 diff --git a/debian/patches/java_ignore_nonexistent_files.patch b/debian/patches/java_ignore_nonexistent_files.patch new file mode 100644 index 0000000..5ba4713 --- /dev/null +++ b/debian/patches/java_ignore_nonexistent_files.patch @@ -0,0 +1,21 @@ +Description: Ignore nonexistent files before trying to use them in Java() +Origin: Debian +Bug-Debian: http://bugs.debian.org/338232 +Forwarded: http://scons.tigris.org/issues/show_bug.cgi?id=2207 + +Index: scons/engine/SCons/Tool/JavaCommon.py +=================================================================== +--- scons.orig/engine/SCons/Tool/JavaCommon.py 2013-03-23 03:19:25.394200546 +0100 ++++ scons/engine/SCons/Tool/JavaCommon.py 2013-03-23 03:28:01.158216345 +0100 +@@ -282,7 +282,10 @@ + return self.outer_state + + def parse_java_file(fn, version=default_java_version): +- return parse_java(open(fn, 'r').read(), version) ++ try: ++ return parse_java(open(fn, 'r').read(), version) ++ except IOError: ++ return (None, []) + + def parse_java(contents, version=default_java_version, trace=None): + """Parse a .java file and return a double of package directory, diff --git a/debian/patches/manpages.patch b/debian/patches/manpages.patch new file mode 100644 index 0000000..a43189a --- /dev/null +++ b/debian/patches/manpages.patch @@ -0,0 +1,92 @@ +Description: Fix spelling errors in the man pages +Author: Luca Falavigna <dktrkranz@debian.org> + +Index: scons/scons-time.1 +=================================================================== +--- scons.orig/scons-time.1 2013-03-11 22:26:44.957856419 +0100 ++++ scons/scons-time.1 2013-03-12 18:40:32.016953762 +0100 +@@ -198,7 +198,7 @@ + .B --number= + option, + and can be used to look at the +-impact of commited changes to the ++impact of committed changes to the + SCons code base on a particular + configuration over time. + .P +@@ -645,7 +645,7 @@ + Specifies the run number to be used in the names of + the log files and profile outputs generated by this run. + .IP +-When used in conjuction with the ++When used in conjunction with the + .BI --aegis= PROJECT + option, + .I NUMBER +@@ -653,7 +653,7 @@ + that will be retrieved automatically from the specified Aegis + .IR PROJECT . + .IP +-When used in conjuction with the ++When used in conjunction with the + .BI --svn= URL + option, + .I NUMBER +Index: scons/scons.1 +=================================================================== +--- scons.orig/scons.1 2013-03-11 22:26:44.957856419 +0100 ++++ scons/scons.1 2013-03-12 18:42:09.364956744 +0100 +@@ -2903,7 +2903,7 @@ + This builder method is only + provided when Microsoft Visual C++ is being used as the compiler. + The PCH builder method is generally used in +-conjuction with the PCH construction variable to force object files to use ++conjunction with the PCH construction variable to force object files to use + the precompiled header: + + .ES +@@ -3081,7 +3081,7 @@ + .I "Example 2." + The \fBPOTUpdate\fP() builder may be used with no target specified, in which + case default target \fBmessages.pot\fP will be used. The +-default target may also be overriden by setting \fB$POTDOMAIN\fP construction ++default target may also be overridden by setting \fB$POTDOMAIN\fP construction + variable or providing it as an override to \fBPOTUpdate\fP() builder: + .ES + # SConstruct script +@@ -3189,7 +3189,7 @@ + (they're \fBIgnore\fPd from \fB'.'\fP node). Instead, + they are added automatically to special \fBAlias\fP + (\fB'po-update'\fP by default). The alias name may be changed +-through the \fB$POUPDATE_ALIAS\fP construction variable. You can easilly ++through the \fB$POUPDATE_ALIAS\fP construction variable. You can easily + update \fBPO\fP files in your project by \fBscons + po-update\fP. + +@@ -3858,7 +3858,7 @@ + \fBLINGUAS\fP file. Note, that the updated + \fBPOT\fP and \fBPO\fP files are usually going to be + committed back to the repository, so they must be updated within the source +-directory (and not in variant directories). Additionaly, the file listing of ++directory (and not in variant directories). Additionally, the file listing of + \fBpo/\fP directory contains \fBLINGUAS\fP file, + so the source tree looks familiar to translators, and they may work with the + project in their usual way. +@@ -5302,7 +5302,7 @@ + will print: + + .ES +-'$CC -c -o $TARGET $CCFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS $SOURCES' ++\'$CC -c -o $TARGET $CCFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS $SOURCES' + .EE + .IP + While this SConstruct: +@@ -15403,7 +15403,7 @@ + tools, if they are both installed, regardless of the order of the bin + directories in the PATH variable. If you have both MSVC and MinGW + installed and you want to use MinGW instead of MSVC, +-then you must explictly tell SCons to use MinGW by passing ++then you must explicitly tell SCons to use MinGW by passing + + .ES + tools=['mingw'] diff --git a/debian/patches/parallel_build.patch b/debian/patches/parallel_build.patch new file mode 100644 index 0000000..3af9a90 --- /dev/null +++ b/debian/patches/parallel_build.patch @@ -0,0 +1,38 @@ +Description: Disable parallel build on sparc machines +Origin: Debian +Bug-Debian: http://bugs.debian.org/632228 +Forwarded: no + +Index: scons/engine/SCons/Job.py +=================================================================== +--- scons.orig/engine/SCons/Job.py 2011-07-02 13:09:20.281651892 +0200 ++++ scons/engine/SCons/Job.py 2011-07-02 13:12:49.925651735 +0200 +@@ -83,7 +83,7 @@ + """ + + self.job = None +- if num > 1: ++ if num > 1 and not self._check_sparc_machine(): + stack_size = explicit_stack_size + if stack_size is None: + stack_size = default_stack_size +@@ -163,6 +163,19 @@ + except AttributeError: + pass + ++ def _check_sparc_machine(self): ++ """ Check whether machine is sparc""" ++ try: ++ from platform import machine ++ except ImportError: ++ pass ++ else: ++ if 'sparc' in machine(): ++ SCons.Warnings.warn(SCons.Warnings.StackSizeWarning, ++ 'Parallel build disabled on sparc, ' ++ 'see Debian bug #632228') ++ return True ++ + class Serial(object): + """This class is used to execute tasks in series, and is more efficient + than Parallel, but is only appropriate for non-parallel builds. Only diff --git a/debian/patches/remove_stale_files.patch b/debian/patches/remove_stale_files.patch new file mode 100644 index 0000000..2c86153 --- /dev/null +++ b/debian/patches/remove_stale_files.patch @@ -0,0 +1,31 @@ +Description: Remove stale files created by SCons when building Debian packages +Origin: Debian +Bug-Debian: http://bugs.debian.org/519948 +Forwarded: http://scons.tigris.org/issues/show_bug.cgi?id=1571 + +Index: b/engine/SCons/Script/Main.py +=================================================================== +--- a/engine/SCons/Script/Main.py 2010-01-23 15:11:19.624932557 +0100 ++++ b/engine/SCons/Script/Main.py 2010-01-23 15:11:35.084931903 +0100 +@@ -1073,6 +1073,21 @@ + if not nodes: + exit_status = 2 + ++ # Remove temporary files left by SCons ++ if options.clean: ++ if os.environ.has_key('DH_INTERNAL_OPTIONS'): ++ import shutil ++ for path in ('.sconsign.dblite', '.sconf_temp'): ++ try: ++ if os.path.isfile(path): ++ print 'Removing autogenerated file %s' % path ++ os.remove(path) ++ if os.path.isdir(path): ++ print 'Removing autogenerated directory %s' % path ++ shutil.rmtree(path) ++ except OSError: ++ pass ++ + def _build_targets(fs, options, targets, target_top): + + global this_build_status diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..bb71714 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,4 @@ +java_ignore_nonexistent_files.patch +remove_stale_files.patch +parallel_build.patch +manpages.patch diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..60e93ec --- /dev/null +++ b/debian/rules @@ -0,0 +1,12 @@ +#!/usr/bin/make -f + +%: + dh $@ --with python2 + +clean: + rm -fr build + dh $@ + +override_dh_auto_install: + dh_auto_install -- --no-version-script --standalone-lib --no-install-man + diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..4a3f16b --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/scons/scons-([0-9.]+)\.tar\.gz |