merge 2.3.1-2 into 2.3.4-1

6 files changed, 28 insertions, 14 deletions

diff --git a/debian/changelog b/debian/changelog
index 9e463ae..d0c3d68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,29 +1,36 @@
-scons (2.3.4-1) unstable; urgency=medium
+scons (2.3.4-1) experimental; urgency=medium
 
-  * New maintainer (closes: #755496).
   * New upstream release
     - Remove obsolete debian/patches/manpages.patch.
     - New debian/patches/manpage-spelling.patch:
       + Correct spelling in scons.1.
   * debian/control:
-    - Set myself as maintainer.
-    - Set László Böszörményi as co-maintainer.
     - 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.
   * debian/watch
     - Rewrite regex for finding all file extensions.
-  * Add debian/source/options:
-    - Set compression to xz & compression-level to 9 to save space.
-  * Add debian/patch/scons-isystem.diff (Closes: #760804, #761565)
+
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Sat, 08 Nov 2014 14:30:56 +0100
+
+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>  Thu, 23 Oct 2014 22:04:29 +0200
+ -- 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
 
diff --git a/debian/control b/debian/control
index 595e182..8d5144d 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Jörg Frings-Fürst <debian@jff-webhosting.net>
 Uploaders: László Böszörményi <gcs@debian.org>
 Build-Depends:
  debhelper (>= 9),
+ dh-python,
  python (>= 2.7~)
 Standards-Version: 3.9.6
 X-Python-Version: >= 2.7
diff --git a/debian/copyright b/debian/copyright
index dfa405f..7b2f947 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,18 +5,26 @@ Source: http://www.scons.org
 
 Files: *
 Copyright: 2001-2014 The SCons Foundation
-           1999-2006 Gregory P. Ward.
+           1999-2006 Gregory P. Ward
            2001-2003 Steven Knight
            2001-2004 Twisted Matrix Laboratories
-           2002-2006 Python Software Foundation.
+           2002-2006 Python Software Foundation
            2003-2005 Peter Astrand
            2003      Stichting NLnet Labs
 License: Expat
 
 Files: debian/*
-Copyright: 2014      Jörg Frings-Fürst <debian@jff-webhosting.net>
+Copyright: 2002      Moshe Zadka <moshez@debian.org>
+           2003-2008 Mark Brown <broonie@debian.org>
+           2008-2014 Luca Falavigna <dktrkranz@ubuntu.com>
+           2014      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      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
diff --git a/debian/patches/scons-isystem.diff b/debian/patches/scons-isystem.patch
index d3b6b60..d3b6b60 100644
--- a/debian/patches/scons-isystem.diff
+++ b/debian/patches/scons-isystem.patch
diff --git a/debian/patches/series b/debian/patches/series
index 2a5d014..b5afaea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,4 @@ manpage-spelling.patch
 java_ignore_nonexistent_files.patch
 remove_stale_files.patch
 parallel_build.patch
-scons-isystem.diff
+scons-isystem.patch
diff --git a/debian/source/options b/debian/source/options
deleted file mode 100644
index 22a4de9..0000000
--- a/debian/source/options
+++ /dev/null
@@ -1,2 +0,0 @@
-compression = xz
-compression-level = 9