diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 585 | ||||
| -rw-r--r-- | debian/compat | 1 | ||||
| -rw-r--r-- | debian/control | 24 | ||||
| -rw-r--r-- | debian/copyright | 63 | ||||
| -rw-r--r-- | debian/docs | 1 | ||||
| -rw-r--r-- | debian/manpages | 4 | ||||
| -rw-r--r-- | debian/patches/0100-parallel_build.patch | 38 | ||||
| -rw-r--r-- | debian/patches/0105-java_ignore_nonexistent_files.patch | 21 | ||||
| -rw-r--r-- | debian/patches/0110-remove_stale_files.patch | 31 | ||||
| -rw-r--r-- | debian/patches/0115-secure_script_scons.patch | 21 | ||||
| -rw-r--r-- | debian/patches/0120-fix-bibtex-call.patch | 40 | ||||
| -rw-r--r-- | debian/patches/0600-manpage-spelling.patch | 126 | ||||
| -rw-r--r-- | debian/patches/series | 6 | ||||
| -rwxr-xr-x | debian/rules | 12 | ||||
| -rw-r--r-- | debian/scons-configure-cache.1 | 27 | ||||
| -rw-r--r-- | debian/source/format | 1 | ||||
| -rw-r--r-- | debian/watch | 5 |
17 files changed, 1006 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..ca830c5 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,585 @@ +scons (2.5.1-1) unstable; urgency=medium + + * New upstream release. + * debian/patches/0600-manpage-spelling.patch: + - Fix spelling error. + * Add missing man page: + - New debian/scons-configure-cache.1. + - Add new man page to debian/manpages. + * Bump compat to 10: + - Change debian/compat to 10. + - Change debhelper version at debian/control to >= 10. + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Fri, 04 Nov 2016 10:08:14 +0100 + +scons (2.5.0-2) unstable; urgency=medium + + * debian/control: + - Use http for the homepage link as https is not supported. + - Bump Standards-Version to 3.9.8 (no changes required). + * debian/patches: + - Refresh 0600-manpage-spelling.patch. + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Sun, 11 Sep 2016 09:43:19 +0200 + +scons (2.5.0-1) unstable; urgency=medium + + * New upstream release. + * Refresh patches. + * New debian/patches/0120-fix-bibtex-call.patch to create + Bibtex bibliography always (Closes: #749716). + * debian/watch: + - bump version to 4 (no changes required). + * debian/copyright: + - Add year 2016. + * debian/control: + - Bump Standards-Version to 3.9.7 (no changes required). + - Use secure URIs. + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Sun, 10 Apr 2016 19:50:46 +0200 + +scons (2.4.1-1) unstable; urgency=medium + + * New upstream version. + * Refresh and rename patches. + * New debian/patches/0600-manpage-spelling.patch. + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Mon, 16 Nov 2015 08:44:32 +0100 + +scons (2.4.0-1) unstable; urgency=medium + + * New upstream release. + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Mon, 28 Sep 2015 18:41:11 +0200 + +scons (2.3.6-1) unstable; urgency=medium + + * New upstream release. + - Remove obsolete debian/patches/scons-isystem.patch and + debian/patches/manpage-spelling.patch + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Sun, 02 Aug 2015 12:16:47 +0200 + +scons (2.3.4-1) unstable; urgency=medium + + * New upstream release + - Remove obsolete debian/patches/manpages.patch. + - New debian/patches/manpage-spelling.patch: + + Correct spelling in scons.1. + * debian/control: + - Update required python version to >= 2.7~. + - Bump Standards-Version to 3.9.6 (no changes required). + - Change Vcs-* to new cgit based repository viewer + - Add Build-Depends dh-python to prevent dh warnings. + * debian/copyright: + - Rewrite into machine-readable format. + - Add new section debian/* with license GPL-3.0+. + - Add new section debian/patches/* with license Expat. + - Add myself to the list of authors for debian/*. + - Update copyright years for 2014-2015. + * debian/watch + - Rewrite regex for finding all file extensions. + * Remove the search of libs in local source dirs for security reasons: + - New debian/patches/0020-secure_script_scons.patch. + * Refresh debian/patches + - manpage-spelling.patch, java_ignore_nonexistent_files.patch, + remove_stale_files.patch. + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Mon, 01 Jun 2015 10:03:17 +0200 + +scons (2.3.1-2) unstable; urgency=medium + + * New maintainer (Closes: #755496). + * debian/control: + - Set myself as maintainer. + - Set László Böszörményi as co-maintainer. + * Add debian/patch/scons-isystem.patch (Closes: #760804, #761565) + - add -isystem support to scons + Thanks to James McCoy <jamessan@debian.org>! + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Sat, 08 Nov 2014 10:40:32 +0100 + +scons (2.3.1-1) unstable; urgency=medium + + * New upstream release. + * debian/patches/remove_stale_files.patch: + - Refresh for new upstream release. + * debian/patches/manpages.patch: + - Restore man pages from version 2.3.0, otherwise empty. + * debian/control: + - Bump Standards-Version to 3.9.5, no changes required. + + -- Luca Falavigna <dktrkranz@debian.org> Sat, 26 Apr 2014 12:22:43 +0200 + +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..f599e28 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +10 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..fca11e7 --- /dev/null +++ b/debian/control @@ -0,0 +1,24 @@ +Source: scons +Section: devel +Priority: optional +Maintainer: Jörg Frings-Fürst <debian@jff-webhosting.net> +Uploaders: Laszlo Boszormenyi (GCS) <gcs@debian.org> +Build-Depends: + debhelper (>= 10), + dh-python, + python (>= 2.7~) +Standards-Version: 3.9.8 +X-Python-Version: >= 2.7 +Homepage: http://www.scons.org/ +Vcs-Git: https://anonscm.debian.org/cgit/collab-maint/scons.git +Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/scons.git + +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..12c6fd4 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,63 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: scons +Upstream-Contact: Steven Knight <knight@baldmt.com> +Source: http://www.scons.org + +Files: * +Copyright: 2001-2016 The SCons Foundation + 1999-2006 Gregory P. Ward + 2001-2003 Steven Knight + 2001-2004 Twisted Matrix Laboratories + 2002-2006 Python Software Foundation + 2003-2005 Peter Astrand + 2003 Stichting NLnet Labs +License: Expat + +Files: debian/* +Copyright: 2002 Moshe Zadka <moshez@debian.org> + 2003-2008 Mark Brown <broonie@debian.org> + 2008-2014 Luca Falavigna <dktrkranz@ubuntu.com> + 2014-2016 Jörg Frings-Fürst <debian@jff-webhosting.net> +License: GPL-3.0+ + +Files: debian/patches/* +Copyright: 2010-2014 Luca Falavigna <dktrkranz@ubuntu.com> + 2014-2016 Jörg Frings-Fürst <debian@jff-webhosting.net> +License: Expat + +License: Expat + 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. + +License: GPL-3.0+ + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + . + On Debian systems, the complete text of the GNU General Public License version + 3 can be found in "/usr/share/common-licenses/GPL-3". 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..b9c7b07 --- /dev/null +++ b/debian/manpages @@ -0,0 +1,4 @@ +scons.1 +sconsign.1 +scons-time.1 +debian/scons-configure-cache.1 diff --git a/debian/patches/0100-parallel_build.patch b/debian/patches/0100-parallel_build.patch new file mode 100644 index 0000000..3af9a90 --- /dev/null +++ b/debian/patches/0100-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/0105-java_ignore_nonexistent_files.patch b/debian/patches/0105-java_ignore_nonexistent_files.patch new file mode 100644 index 0000000..6cf704e --- /dev/null +++ b/debian/patches/0105-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: trunk/engine/SCons/Tool/JavaCommon.py +=================================================================== +--- trunk.orig/engine/SCons/Tool/JavaCommon.py ++++ trunk/engine/SCons/Tool/JavaCommon.py +@@ -283,7 +283,10 @@ if java_parsing: + 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/0110-remove_stale_files.patch b/debian/patches/0110-remove_stale_files.patch new file mode 100644 index 0000000..d4be6bf --- /dev/null +++ b/debian/patches/0110-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: trunk/engine/SCons/Script/Main.py +=================================================================== +--- trunk.orig/engine/SCons/Script/Main.py ++++ trunk/engine/SCons/Script/Main.py +@@ -1094,6 +1094,21 @@ def _main(parser): + print 'Found nothing to build' + 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/0115-secure_script_scons.patch b/debian/patches/0115-secure_script_scons.patch new file mode 100644 index 0000000..7463f32 --- /dev/null +++ b/debian/patches/0115-secure_script_scons.patch @@ -0,0 +1,21 @@ +Description: Comment out the search for libs in local source dirs +Author: Jörg Frings-Fürst <debian@jff-webhosting.net> +Forwarded: https://pairlist2.pair.net/pipermail/scons-dev/2014-November/002008.html +Last-Update: 2015-02-11 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/script/scons +=================================================================== +--- trunk.orig/script/scons ++++ trunk/script/scons +@@ -75,8 +75,8 @@ if "SCONS_LIB_DIR" in os.environ: + + # - running from source takes priority (since 2.3.2), excluding SCONS_LIB_DIR settings + script_path = os.path.abspath(os.path.dirname(__file__)) +-source_path = os.path.join(script_path, '..', 'engine') +-libs.append(source_path) ++# source_path = os.path.join(script_path, '..', 'engine') ++# libs.append(source_path) + + local_version = 'scons-local-' + __version__ + local = 'scons-local' diff --git a/debian/patches/0120-fix-bibtex-call.patch b/debian/patches/0120-fix-bibtex-call.patch new file mode 100644 index 0000000..ea82ca5 --- /dev/null +++ b/debian/patches/0120-fix-bibtex-call.patch @@ -0,0 +1,40 @@ +Description: Create Bibtex bibliography always +Author: Alvaro G. M. <alvaro.gamez@hazent.com> +Bug: http://scons.tigris.org/issues/show_bug.cgi?id=2967 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=749716 +Forwarded: http://scons.tigris.org/issues/show_bug.cgi?id=2967 +Last-Update: 2016-01-31 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/engine/SCons/Tool/tex.py +=================================================================== +--- trunk.orig/engine/SCons/Tool/tex.py ++++ trunk/engine/SCons/Tool/tex.py +@@ -346,6 +346,13 @@ def InternalLaTeXAuxAction(XXXLaTeXActio + if result != 0: + check_file_error_message(env['BIBTEX'], 'blg') + must_rerun_latex = True ++ if Verbose: ++ print "Need to run bibtex on ",auxfilename ++ bibfile = env.fs.File(SCons.Util.splitext(target_aux)[0]) ++ result = BibTeXAction(bibfile, bibfile, env) ++ if result != 0: ++ check_file_error_message(env['BIBTEX'], 'blg') ++ must_rerun_latex = True + + # Now decide if biber will need to be run. + # When the backend for biblatex is biber (by choice or default) the +@@ -369,6 +376,13 @@ def InternalLaTeXAuxAction(XXXLaTeXActio + if result != 0: + check_file_error_message(env['BIBER'], 'blg') + must_rerun_latex = True ++ if Verbose: ++ print "Need to run biber on ",bcffilename ++ bibfile = env.fs.File(SCons.Util.splitext(target_bcf)[0]) ++ result = BiberAction(bibfile, bibfile, env) ++ if result != 0: ++ check_file_error_message(env['BIBER'], 'blg') ++ must_rerun_latex = True + + # Now decide if latex will need to be run again due to index. + if check_MD5(suffix_nodes['.idx'],'.idx') or (count == 1 and run_makeindex): diff --git a/debian/patches/0600-manpage-spelling.patch b/debian/patches/0600-manpage-spelling.patch new file mode 100644 index 0000000..f66ea23 --- /dev/null +++ b/debian/patches/0600-manpage-spelling.patch @@ -0,0 +1,126 @@ +Description: Correct manpage spelling errors +Author: Jörg Frings-Fürst <debian@jff-webhosting.net> +Last-Update: 2016-09-11 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/scons.1 +=================================================================== +--- trunk.orig/scons.1 ++++ trunk/scons.1 +@@ -443,7 +443,7 @@ call should use or generate the results + .PP + \-\-config=auto + .RS 4 +-scons will use its normal dependency mechanisms to decide if a test must be rebuilt or not\&. This saves time by not running the same configuration tests every time you invoke scons, but will overlook changes in system header files or external commands (such as compilers) if you don\*(Aqt specify those dependecies explicitly\&. This is the default behavior\&. ++scons will use its normal dependency mechanisms to decide if a test must be rebuilt or not\&. This saves time by not running the same configuration tests every time you invoke scons, but will overlook changes in system header files or external commands (such as compilers) if you don\*(Aqt specify those dependencies explicitly\&. This is the default behavior\&. + .RE + .PP + \-\-config=force +@@ -6350,7 +6350,7 @@ env\&.Substfile(\*(Aqfoo\&.in\*(Aq, SUBS + good_foo = [(\*(Aq$foobar\*(Aq, \*(Aq$foobar\*(Aq), (\*(Aq$foo\*(Aq, \*(Aq$foo\*(Aq)] + env\&.Substfile(\*(Aqfoo\&.in\*(Aq, SUBST_DICT = good_foo) + +-# UNPREDICTABLE \- one substitution could be futher expanded ++# UNPREDICTABLE \- one substitution could be further expanded + bad_bar = {\*(Aq@bar@\*(Aq: \*(Aq@soap@\*(Aq, \*(Aq@soap@\*(Aq: \*(Aqlye\*(Aq} + env\&.Substfile(\*(Aqbar\&.in\*(Aq, SUBST_DICT = bad_bar) + +@@ -6582,7 +6582,7 @@ file\&. Note, that the updated + POT + and + PO +-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 ++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)\&. Additionally, the file listing of + po/ + directory contains + LINGUAS +@@ -7122,7 +7122,7 @@ Example: + AllowSubstExceptions() + + # Also allow a string containing a zero\-division expansion +-# like \*(Aq${1 / 0}\*(Aq to evalute to \*(Aq\*(Aq\&. ++# like \*(Aq${1 / 0}\*(Aq to evaluate to \*(Aq\*(Aq\&. + AllowSubstExceptions(IndexError, NameError, ZeroDivisionError) + .fi + .if n \{\ +@@ -9198,7 +9198,7 @@ Return([vars\&.\&.\&., stop=]) + .RS 4 + By default, this stops processing the current SConscript file and returns to the calling SConscript file the values of the variables named in the + \fIvars\fR +-string arguments\&. Multiple strings contaning variable names may be passed to ++string arguments\&. Multiple strings containing variable names may be passed to + \fBReturn\fR\&. Any strings that contain white space + .sp + The optional +@@ -10118,7 +10118,7 @@ function to create a copy of your source + \fIvariant_dir\fR + is not found but exists under + \fIsrc_dir\fR, the file or directory is copied to +-\fIvariant_dir\fR\&. Target files can be built in a different directory than the original sources by simply refering to the sources (and targets) within the variant tree\&. ++\fIvariant_dir\fR\&. Target files can be built in a different directory than the original sources by simply referring to the sources (and targets) within the variant tree\&. + .sp + + \fBVariantDir\fR +@@ -11373,7 +11373,7 @@ is used to create PDF output from an XML + .PP + DOCBOOK_FOPFLAGS + .RS 4 +-Additonal command\-line flags for the PDF renderer ++Additional command\-line flags for the PDF renderer + fop + or + xep\&. +@@ -11400,7 +11400,7 @@ is used to resolve XIncludes for a given + .PP + DOCBOOK_XMLLINTFLAGS + .RS 4 +-Additonal command\-line flags for the external executable ++Additional command\-line flags for the external executable + xmllint\&. + .RE + .PP +@@ -11431,7 +11431,7 @@ is used to transform an XML file via a g + .PP + DOCBOOK_XSLTPROCFLAGS + .RS 4 +-Additonal command\-line flags for the external executable ++Additional command\-line flags for the external executable + xsltproc + (or + saxon, +@@ -11440,7 +11440,7 @@ xalan)\&. + .PP + DOCBOOK_XSLTPROCPARAMS + .RS 4 +-Additonal parameters that are not intended for the XSLT processor executable, but the XSL processing itself\&. By default, they get appended at the end of the command line for ++Additional parameters that are not intended for the XSLT processor executable, but the XSL processing itself\&. By default, they get appended at the end of the command line for + saxon + and + saxon\-xslt, respectively\&. +@@ -14052,7 +14052,7 @@ A list of installed versions of the Metr + .PP + NAME + .RS 4 +-Specfies the name of the project to package\&. ++Specifies the name of the project to package\&. + .RE + .PP + no_import_lib +@@ -16437,7 +16437,7 @@ builder\&. + .PP + _XGETTEXTFROMFLAGS + .RS 4 +-Internal "macro"\&. Genrates list of ++Internal "macro"\&. Generates list of + \-D<dir> + flags from the + \fB$XGETTEXTPATH\fR +@@ -18375,7 +18375,7 @@ a = Action("build < ${SOURCE\&.file} > $ + The + \fBAction\fR() global function also takes an + \fBexitstatfunc\fR +-keyword argument which specifies a function that is passed the exit status (or return value) from the specified action and can return an arbitrary or modified value\&. This can be used, for example, to specify that an Action object\*(Aqs return value should be ignored under special conditions and SCons should, therefore, consider that the action always suceeds: ++keyword argument which specifies a function that is passed the exit status (or return value) from the specified action and can return an arbitrary or modified value\&. This can be used, for example, to specify that an Action object\*(Aqs return value should be ignored under special conditions and SCons should, therefore, consider that the action always succeeds: + .sp + .if n \{\ + .RS 4 diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..3b82bac --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,6 @@ +0600-manpage-spelling.patch +0115-secure_script_scons.patch +0105-java_ignore_nonexistent_files.patch +0110-remove_stale_files.patch +0100-parallel_build.patch +0120-fix-bibtex-call.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/scons-configure-cache.1 b/debian/scons-configure-cache.1 new file mode 100644 index 0000000..285e4af --- /dev/null +++ b/debian/scons-configure-cache.1 @@ -0,0 +1,27 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4. +.TH SCONS-CONFIGURE-CACHE "1" "November 2016" "scons-configure-cache 1.0" "User Commands" +.SH NAME +scons-configure-cache \- Configure Scons cache. +.SH DESCRIPTION +usage: scons\-configure\-cache [\-h] [\-\-prefix\-len <number>] [\-\-version] +.IP +cache\-dir +.PP +Modify the configuration of an scons cache directory +.SS "positional arguments:" +.TP +cache\-dir +Path to scons cache directory +.SS "optional arguments:" +.TP +\fB\-h\fR, \fB\-\-help\fR +show this help message and exit +.TP +\fB\-\-prefix\-len\fR <number> +Length of cache file name used as subdirectory prefix +.TP +\fB\-\-version\fR +show program's version number and exit +.PP +Unless you specify an option, it will not be changed (if it is already set in +the cache config), or changed to an appropriate default (it it is not set). 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..916aabd --- /dev/null +++ b/debian/watch @@ -0,0 +1,5 @@ +# +# remove zip to get tar.gz +# +version=4 +http://sf.net/scons/scons-(\d\S*)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) |