[SCM] amsynth/master: Revert "Make package's builds reproducible"
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Fri Jan 22 22:45:05 UTC 2016
The following commit has been merged in the master branch:
commit b21a22671b196f586411e378f921b4b8b0f54c9d
Author: Alessio Treglia <alessio.treglia at smartodds.co.uk>
Date: Fri Jan 22 22:35:42 2016 +0000
Revert "Make package's builds reproducible"
This reverts commit 36d1579fa54bf05d3c4c54d6bced02a5559613bf.
The patch has been applied upstream.
diff --git a/debian/patches/0001-reproducible_build.patch b/debian/patches/0001-reproducible_build.patch
deleted file mode 100644
index 2527089..0000000
--- a/debian/patches/0001-reproducible_build.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Support Debian reproducible builds.
- See https://wiki.debian.org/ReproducibleBuilds for more information.
-Author: Alessio Treglia <alessio at debian.org>
-Bug: https://code.google.com/p/amsynth/issues/detail?id=93
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=788751
----
- src/main.cc | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- amsynth.orig/src/main.cc
-+++ amsynth/src/main.cc
-@@ -324,7 +324,11 @@ int main( int argc, char *argv[] )
- while ((opt = getopt_long(argc, argv, "vhstdzxm:c:a:r:p:b:U:P:n:", longopts, &longindex)) != -1) {
- switch (opt) {
- case 'v':
-+#ifndef DEBIAN_REPRODUCIBLE_BUILDS
- cout << PACKAGE_STRING << " -- compiled " << __DATE__ << " " << __TIME__ << endl;
-+#else
-+ cout << PACKAGE_STRING << endl;
-+#endif
- return 0;
- case 'h':
- cout << help_text;
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index f8f464d..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-reproducible_build.patch
diff --git a/debian/rules b/debian/rules
index 2a06ad2..9147a22 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,8 +13,6 @@ ifneq ($(DEB_HOST_ARCH_OS),linux)
EXTRA_CONFIG_FLAGS=--with-alsa=no
endif
-CFLAGS += -DDEBIAN_REPRODUCIBLE_BUILDS
-
%:
dh $@ --parallel --with autoreconf
--
amsynth packaging
More information about the pkg-multimedia-commits
mailing list