[SCM] wavpack/master: Drop all patches that were merged upstream

slomo at users.alioth.debian.org slomo at users.alioth.debian.org
Thu Oct 31 15:56:32 UTC 2013


The following commit has been merged in the master branch:
commit be0f47cf944194906e27e7574cd44a48a93d6a1a
Author: Sebastian Dröge <sebastian at centricular.com>
Date:   Thu Oct 31 16:52:38 2013 +0100

    Drop all patches that were merged upstream

diff --git a/debian/changelog b/debian/changelog
index 76882ec..8432aea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 wavpack (4.70.0-1) unstable; urgency=low
 
-  * New upstream release.
+  * New upstream release:
+    + debian/patches/0001-pkgconfig.patch,
+      debian/patches/0002-largefile.patch:
+      - Drop patches that were merged upstream.
 
  -- Sebastian Dröge <slomo at debian.org>  Thu, 31 Oct 2013 16:47:06 +0100
 
diff --git a/debian/patches/0001-pkgconfig.patch b/debian/patches/0001-pkgconfig.patch
deleted file mode 100644
index 1bdf61f..0000000
--- a/debian/patches/0001-pkgconfig.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Set libdir properly to enable MultiArch.
-Author: Alessio Treglia <alessio at debian.org>
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=651017
-Forwarded: no
----
- wavpack.pc.in |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- wavpack.orig/wavpack.pc.in
-+++ wavpack/wavpack.pc.in
-@@ -1,5 +1,5 @@
- prefix=@prefix@
--libdir=${prefix}/lib
-+libdir=@libdir@
- includedir=${prefix}/include
- 
- Name: wavpack
diff --git a/debian/patches/0002-largefile.patch b/debian/patches/0002-largefile.patch
deleted file mode 100644
index 273c0ba..0000000
--- a/debian/patches/0002-largefile.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Enable largefile support on 32bit systems.
-Author: Alessio Treglia <alessio at debian.org>
-Bug-Debian: http://bugs.debian.org/666340
-Forwarded: no
----
- configure.ac |    3 +++
- 1 file changed, 3 insertions(+)
-
---- wavpack.orig/configure.ac
-+++ wavpack/configure.ac
-@@ -48,6 +48,9 @@ AC_HEADER_STDC
- AC_CHECK_LIBM
- AC_SUBST(LIBM)
- 
-+# Check for large files support
-+AC_SYS_LARGEFILE
-+
- # Check if cross-compiling on mingw
- AC_MINGW32
- 
diff --git a/debian/patches/series b/debian/patches/series
index 65abfcd..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +0,0 @@
-0001-pkgconfig.patch
-0002-largefile.patch

-- 
wavpack packaging



More information about the pkg-multimedia-commits mailing list