[SCM] terminatorx/master: Drop 23_new_zlib.patch, adopted upstream.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Mon Mar 10 11:24:02 UTC 2014


The following commit has been merged in the master branch:
commit eeb587ef344a22c1e45b09a5586ef404dc3d25f8
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Mar 10 11:22:46 2014 +0000

    Drop 23_new_zlib.patch, adopted upstream.

diff --git a/debian/patches/23_new_zlib.patch b/debian/patches/23_new_zlib.patch
deleted file mode 100644
index 3911a53..0000000
--- a/debian/patches/23_new_zlib.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Fix FTBFS errors with newer zlib.
-Author: Mònica Ramírez <monica at debian.org>
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=663053
-Forwarded: no
----
- src/tX_midiin.cc |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- terminatorx.orig/src/tX_midiin.cc
-+++ terminatorx/src/tX_midiin.cc
-@@ -447,7 +447,7 @@ gboolean tX_midiin::midi_learn_destroy(G
- 
- void tX_midiin::store_connections(FILE *rc, char *indent) 
- {
--	gzFile *rz=NULL;
-+	gzFile rz=NULL;
- 	
- 	tX_store("%s<midi_connections>\n", indent);
- 
diff --git a/debian/patches/series b/debian/patches/series
index 4f44d7e..a662265 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 15_icon_xpm.patch
 17_cleanup_desktop_file.patch
 22_manual.patch
-23_new_zlib.patch
 24-missing_include.patch
 25-libdl_underlinkage.patch

-- 
terminatorx packaging



More information about the pkg-multimedia-commits mailing list