[SCM] faad2/master: Remove debian/patches/faad2_version.patch, upstream has changed the FAAD2_VERSION macro to read 'unknown'; refresh debian/patches/reproducible-build.patch

[fabian at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c01df4fc8924b1f47df2d879914b10f4a80ddb2a
Author: Fabian Greffrath <fabian at debian.org>
Date:   Thu Sep 28 22:36:17 2017 +0200

    Remove debian/patches/faad2_version.patch, upstream has changed the FAAD2_VERSION macro to read 'unknown'; refresh debian/patches/reproducible-build.patch

diff --git a/debian/patches/faad2_version.patch b/debian/patches/faad2_version.patch
deleted file mode 100644
index a2664ff..0000000
--- a/debian/patches/faad2_version.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Set the FAAD2_VERSION macro back to the version string.
- In the next upstream release this macro will read "unknown version" and an API
- will be provided to retrieve the actual library version at run-time.
-Author: Fabian Greffrath <fabian at debian.org>
-
---- a/include/neaacdec.h
-+++ b/include/neaacdec.h
-@@ -73,7 +73,7 @@ extern "C" {
-   #endif
- #endif
- 
--#define FAAD2_VERSION PACKAGE_VERSION
-+#define FAAD2_VERSION "2.8.1"
- 
- /* object types for AAC */
- #define MAIN       1
diff --git a/debian/patches/reproducible-build.patch b/debian/patches/reproducible-build.patch
index 13df0cc..ed0e4d1 100644
--- a/debian/patches/reproducible-build.patch
+++ b/debian/patches/reproducible-build.patch
@@ -6,11 +6,11 @@ Author: Fabian Greffrath <fabian+debian at greffrath.com>
 
 --- a/frontend/main.c
 +++ b/frontend/main.c
-@@ -1301,7 +1301,6 @@ int main(int argc, char *argv[])
+@@ -1194,7 +1194,6 @@ int main(int argc, char *argv[])
+     NeAACDecGetVersion(&faad_id_string, &faad_copyright_string);
  
- 
-     faad_fprintf(stderr, " *********** Ahead Software MPEG-4 AAC Decoder V%s ******************\n\n", FAAD2_VERSION);
+     faad_fprintf(stderr, " *********** Ahead Software MPEG-4 AAC Decoder V%s ******************\n\n", faad_id_string);
 -    faad_fprintf(stderr, " Build: %s\n", __DATE__);
-     faad_fprintf(stderr, " Copyright 2002-2004: Ahead Software AG\n");
-     faad_fprintf(stderr, " http://www.audiocoding.com\n");
-     faad_fprintf(stderr, "\n Latest version and bug tracking available here:\n");
+     faad_fprintf(stderr, "%s", faad_copyright_string);
+     if (cap & FIXED_POINT_CAP)
+         faad_fprintf(stderr, " Fixed point version\n");
diff --git a/debian/patches/series b/debian/patches/series
index 9c49ff9..55077d0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-faad2_version.patch
 reproducible-build.patch

-- 
faad2 packaging