merge 2.3.1-2 into 2.3.4-1

1 files changed, 15 insertions, 8 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