[SCM] libtunepimp/master: Use dpkg source format 3.0 (quilt), and drop use of dpatch.

js at users.alioth.debian.org js at users.alioth.debian.org
Sat Jan 1 16:17:30 UTC 2011 

The following commit has been merged in the master branch:
commit 36a2b5e7a92c7b0554d0718156ec5916231cd1db
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Jan 1 17:15:24 2011 +0100

    Use dpkg source format 3.0 (quilt), and drop use of dpatch.

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b408e6c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/.pc
diff --git a/debian/patches/000-Fix_FTBFS_with_gcc4.3.dpatch b/debian/patches/000-Fix_FTBFS_with_gcc4.3.patch
similarity index 94%
rename from debian/patches/000-Fix_FTBFS_with_gcc4.3.dpatch
rename to debian/patches/000-Fix_FTBFS_with_gcc4.3.patch
index 882121b..6e0e905 100644
--- a/debian/patches/000-Fix_FTBFS_with_gcc4.3.dpatch
+++ b/debian/patches/000-Fix_FTBFS_with_gcc4.3.patch
@@ -1,12 +1,5 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 000-Fix_FTBFS_with_gcc4.3
-## by Martin Michlmayr <tbm at cyrius.com>, Matthias Klose <doko at ubuntu.com>
-## Update by Adam Cécile (Le_Vert) <gandalf at le-vert.net>
-##
-## DP: Add missing includes to get it built with gcc4.3.
-
- at DPATCH@
-
+Description: Add missing includes to get it built with gcc4.3.
+Author: Martin Michlmayr <tbm at cyrius.com>, Matthias Klose <doko at ubuntu.com>
 diff -Nur libtunepimp-0.5.3/include/tunepimp-0.5/metadata.h libtunepimp-0.5.3.new/include/tunepimp-0.5/metadata.h
 --- libtunepimp-0.5.3/include/tunepimp-0.5/metadata.h	2006-11-18 11:52:08.000000000 +0100
 +++ libtunepimp-0.5.3.new/include/tunepimp-0.5/metadata.h	2008-02-11 22:14:55.180744506 +0100
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 7c7f92e..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,4 +0,0 @@
-000-Fix_FTBFS_with_gcc4.3.dpatch
-010-bug_560466_ftbfs_gcc4.4_const_char.dpatch
-020-gcc_4.4_add_include.dpatch
-030-new-libmpcdec-API.dpatch
diff --git a/debian/patches/010-bug_560466_ftbfs_gcc4.4_const_char.dpatch b/debian/patches/010-bug_560466_ftbfs_gcc4.4_const_char.dpatch
deleted file mode 100644
index 3bdcc64..0000000
--- a/debian/patches/010-bug_560466_ftbfs_gcc4.4_const_char.dpatch
+++ /dev/null
@@ -1,28 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## /tmp/bug-560466-ftbfs-gcc4.4-const-char.patch.dpatch by  <jari.aalto at cante.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fa
-## DP: Author: Jari Aalto <jari.aalto at cante.net>
-## DP: 
-## DP: 
-## DP: Fix FTBFS invalid conversion from const char* to char*
-## DP:     
-## DP:     Signed-off-by: Jari Aalto <jari.aalto at cante.net>
-
- at DPATCH@
-
-diff --git a/lib/fileio.cpp b/lib/fileio.cpp
-index a1602da..ac03a31 100644
---- a/lib/fileio.cpp
-+++ b/lib/fileio.cpp
-@@ -122,7 +122,8 @@ int taccess(const char *pathname, int mode, const char *encoding)
- 
- void tmktempname(const char *path, char *newPath, int newPathLen)
- {
--    char *ptr, *temp;
-+    const char *ptr;
-+    char *temp;
- 
-     temp = (char *)malloc(strlen(path) + 32);
-     ptr = strrchr(path, dirSepChar);
diff --git a/debian/patches/010-bug_560466_ftbfs_gcc4.4_const_char.patch b/debian/patches/010-bug_560466_ftbfs_gcc4.4_const_char.patch
new file mode 100644
index 0000000..f0e5ba3
--- /dev/null
+++ b/debian/patches/010-bug_560466_ftbfs_gcc4.4_const_char.patch
@@ -0,0 +1,16 @@
+Description: Fix FTBFS invalid conversion from const char* to char*
+Author: Jari Aalto <jari.aalto at cante.net>
+diff --git a/lib/fileio.cpp b/lib/fileio.cpp
+index a1602da..ac03a31 100644
+--- a/lib/fileio.cpp
++++ b/lib/fileio.cpp
+@@ -122,7 +122,8 @@ int taccess(const char *pathname, int mode, const char *encoding)
+ 
+ void tmktempname(const char *path, char *newPath, int newPathLen)
+ {
+-    char *ptr, *temp;
++    const char *ptr;
++    char *temp;
+ 
+     temp = (char *)malloc(strlen(path) + 32);
+     ptr = strrchr(path, dirSepChar);
diff --git a/debian/patches/020-gcc_4.4_add_include.dpatch b/debian/patches/020-gcc_4.4_add_include.patch
similarity index 91%
rename from debian/patches/020-gcc_4.4_add_include.dpatch
rename to debian/patches/020-gcc_4.4_add_include.patch
index 83ce7f6..cc88812 100644
--- a/debian/patches/020-gcc_4.4_add_include.dpatch
+++ b/debian/patches/020-gcc_4.4_add_include.patch
@@ -1,17 +1,5 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## /tmp/=20-gcc-4.4-add-include.patch.dpatch by  <jari.aalto at cante.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: ac9
-## DP: Author: Jari Aalto <jari.aalto at cante.net>
-## DP: 
-## DP: 
-## DP:     Gcc 4.4 add missing #include
-## DP:     
-## DP:     Signed-off-by: Jari Aalto <jari.aalto at cante.net>
-
- at DPATCH@
-
+Description: Gcc 4.4 add missing #include
+Author: Jari Aalto <jari.aalto at cante.net>
 diff --git a/include/tunepimp-0.5/metadata.h b/include/tunepimp-0.5/metadata.h
 index ea08cf5..842704c 100644
 --- a/include/tunepimp-0.5/metadata.h
diff --git a/debian/patches/030-new-libmpcdec-API.dpatch b/debian/patches/030-new-libmpcdec-API.patch
similarity index 94%
rename from debian/patches/030-new-libmpcdec-API.dpatch
rename to debian/patches/030-new-libmpcdec-API.patch
index 0a46950..f550d54 100644
--- a/debian/patches/030-new-libmpcdec-API.dpatch
+++ b/debian/patches/030-new-libmpcdec-API.patch
@@ -1,12 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 030-new-libmpcdec-API.dpatch by Stefano Zacchiroli <zack at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: port libtunepimp to new libmpcdec API
-## DP: patch by Yavor Doganov
-## DP: pach from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=476378#39
-
- at DPATCH@
+Description: port libtunepimp to new libmpcdec API
+Author: Yavor Doganov <yavor at gnu.org>
+Origin: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=476378#39
+Bug-Debian: http://bugs.debian.org/476378
 diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' libtunepimp-0.5.3~/lib/plugins.cpp libtunepimp-0.5.3/lib/plugins.cpp
 --- libtunepimp-0.5.3~/lib/plugins.cpp	2006-11-18 11:52:33.000000000 +0100
 +++ libtunepimp-0.5.3/lib/plugins.cpp	2010-02-20 14:08:42.998179599 +0100
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..7ee11ef
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+000-Fix_FTBFS_with_gcc4.3.patch
+010-bug_560466_ftbfs_gcc4.4_const_char.patch
+020-gcc_4.4_add_include.patch
+030-new-libmpcdec-API.patch
diff --git a/debian/rules b/debian/rules
index 75bdea2..00a0255 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,8 +5,6 @@
 
 include /usr/share/cdbs/1/rules/buildcore.mk
 
-include /usr/share/dpatch/dpatch.make
-
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DESTDIR = $(CURDIR)/debian/tmp
@@ -18,7 +16,7 @@ else
 	CFLAGS += -O2
 endif
 
-config.status: configure patch-stamp
+config.status: configure
 	dh_testdir
 	./configure --host=$(DEB_HOST_GNU_TYPE) \
 		    --build=$(DEB_BUILD_GNU_TYPE) \
@@ -32,7 +30,7 @@ build-stamp: config.status tunepimp.doxy
 	doxygen tunepimp.doxy
 	touch $@
 
-clean:: unpatch
+clean::
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp config.log stamp-h
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..9cdfca9
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1,2 @@
+unapply-patches
+abort-on-upstream-changes

-- 
libtunepimp packaging

More information about the pkg-multimedia-commits mailing list