[SCM] snd/master: Imported Debian patch 11.7-4

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4ca23beffa7c1984932a323e3d583c30d8c69cb8
Author: Santiago Vila <sanvila at debian.org>
Date:   Fri Sep 4 19:13:22 2015 +0200

    Imported Debian patch 11.7-4

diff --git a/debian/changelog b/debian/changelog
index b9d8e2a..75dee68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+snd (11.7-4) unstable; urgency=medium
+
+  * QA upload.
+  * debian/control: Drop transitional packages snd-nox-alsa and snd-gtk
+    after a stable release has happened.
+  * Add debian/patches/09-do-not-show-the-build-date.diff to make the
+    build reproducible.
+
+ -- Santiago Vila <sanvila at debian.org>  Fri, 04 Sep 2015 19:13:22 +0200
+
 snd (11.7-3) unstable; urgency=low
 
   * QA upload.
diff --git a/debian/control b/debian/control
index 1f2b056..d2802b3 100644
--- a/debian/control
+++ b/debian/control
@@ -97,24 +97,3 @@ Description: Sound file editor (without X support)
  the Scheme programming language.
  .
  This package contains a version of snd compiled without support for X.
-
-Package: snd-nox-alsa
-Architecture: all
-Depends: snd-nox (>= ${source:Version}),
- ${misc:Depends}
-Description: Sound file editor (dummy transitional package)
- Snd is a powerful sound file editor that can be customized and extended using
- the Scheme programming language.
- .
- This dummy package is provided for a smooth transition from snd-nox-alsa to
- snd-nox package. It may be safely removed after installation.
-
-Package: snd-gtk
-Architecture: all
-Depends: ${misc:Depends},
- snd-gtk-pulse (>= ${source:Version}) | snd-gtk-jack (>= ${source:Version})
-Description: Sound file editor (dummy transitional package)
- Snd is a powerful sound file editor that can be customized and extended using
- the Scheme programming language.
- .
- This is a dummy package and it may be safely removed after installation.
diff --git a/debian/patches/09-do-not-show-the-build-date.diff b/debian/patches/09-do-not-show-the-build-date.diff
new file mode 100644
index 0000000..a86ad8c
--- /dev/null
+++ b/debian/patches/09-do-not-show-the-build-date.diff
@@ -0,0 +1,14 @@
+From: Santiago Vila <sanvila at debian.org>
+Subject: Do not show the build date, as it makes the build not to be reproducible
+
+--- snd-11.7.orig/snd-help.c
++++ snd-11.7/snd-help.c
+@@ -429,7 +429,7 @@ char *version_info(void)
+ #if SND_AS_WIDGET
+ 	  _("\n    compiled as a widget"),
+ #endif
+-#ifdef __DATE__
++#if 0
+ 	  "\n    Compiled ", __DATE__, " ", __TIME__,
+ #endif
+ #ifdef __VERSION__
diff --git a/debian/patches/series b/debian/patches/series
index 57c61e8..7b10ac4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 06-hurd.diff
 07-link-order.diff
 08-link-dl-harder.diff
+09-do-not-show-the-build-date.diff

-- 
snd packaging