--- Begin Message ---
Package: gloox
Severity: wishlist
Tags: patch
Hi,
The dpatch patch management system has been deprecated for some time. The
Lintian currently flags use of dpatch packages as an error. The new 3.0
packaging format is an improved version which, among other things, contains
patch management built-in. For more information, see:
http://wiki.debian.org/Projects/DebSrc3.0
I had some free time; see attached patch to migrate to new package
format. Note that all files in debian/patches/* are canocalized to
*.patch.
Let me know if there is anything that needs adjusting or if it is ok
to upload this version in a NMU in case you are working on other
issues needing attention.
Thanks,
Jari
>From f18d5fbe82f7b49d53e57b278c0d9e6c2231275d Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Thu, 26 Apr 2012 17:17:15 +0300
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <[email protected]>
---
debian/changelog | 16 ++++++
debian/compat | 2 +-
debian/control | 16 +++---
debian/copyright | 2 +-
debian/patches/00list | 3 -
debian/patches/10-fix-gcc4.3.patch | 59 ++++++++++++++++++++
.../{relibtoolize.dpatch => 20-relibtoolize.patch} | 0
debian/patches/fix-gcc4.3.dpatch | 56 -------------------
debian/patches/series | 2 +
.../fix-pkgconfig.patch} | 0
debian/rules | 14 ++---
debian/source/format | 1 +
12 files changed, 94 insertions(+), 77 deletions(-)
delete mode 100644 debian/patches/00list
create mode 100644 debian/patches/10-fix-gcc4.3.patch
rename debian/patches/{relibtoolize.dpatch => 20-relibtoolize.patch} (100%)
delete mode 100644 debian/patches/fix-gcc4.3.dpatch
create mode 100644 debian/patches/series
rename debian/patches/{fix-pkgconfig.dpatch => unused/fix-pkgconfig.patch} (100%)
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index abbea33..9cabe3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+gloox (1.0-1.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+ * Update to Standards-Version to 3.9.3 and debhelper to 9.
+ * Use dh_prep in rules file.
+ * Number patches, update with "quilt refresh" to make them apply cleanly
+ and move disregarded patches under debian/patches/unused directory.
+ * Fix copyright-refers-to-symlink-license (Lintian).
+ * Fix package-has-a-duplicate-build-relation (Lintian).
+ * Fix wrong-section-according-to-package-name (Lintian); use debug.
+ * Fix binary-control-field-duplicates-source (Lintian).
+ * Fix no-homepage-field (Lintian).
+
+ -- Jari Aalto <[email protected]> Thu, 26 Apr 2012 16:15:03 +0300
+
gloox (1.0-1.1) unstable; urgency=low
* Non-maintainer upload.
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index c668db9..0b0bcbc 100644
--- a/debian/control
+++ b/debian/control
@@ -1,17 +1,17 @@
Source: gloox
Priority: optional
-Maintainer: Jose Carlos Garcia Sogo <[email protected]>
-Build-Depends: debhelper (>= 5.0.0), autotools-dev, libgnutls-dev (>= 1.2.8), libidn11-dev, zlib1g-dev, doxygen, graphviz, gsfonts, dpatch
-Build-Depends-Indep: doxygen, graphviz, gsfonts
-Standards-Version: 3.8.3
Section: libs
+Maintainer: Jose Carlos Garcia Sogo <[email protected]>
+Build-Depends: debhelper (>= 9), autotools-dev, libgnutls-dev (>= 1.2.8), libidn11-dev, zlib1g-dev, doxygen, graphviz, gsfonts
+Standards-Version: 3.9.3
Vcs-Git: git://git.debian.org/git/users/jsogo/gloox.git
Vcs-Browser: http://git.debian.org/git/users/jsogo/gloox.git
+Homepage: http://freecode.com/projects/gloox
Package: libgloox-dev
Section: libdevel
Architecture: any
-Depends: libgloox8 (= ${binary:Version}), libgnutls-dev, libidn11-dev
+Depends: ${misc:Depends}, libgloox8 (= ${binary:Version}), libgnutls-dev, libidn11-dev
Description: C++ jabber/xmpp library devel files
A C++ Jabber/XMPP library that takes care of low level protocol stuff.
Additionally, it offers high level interfaces for interaction with an
@@ -23,7 +23,6 @@ Description: C++ jabber/xmpp library devel files
This package contains files needed for development with this library.
Package: libgloox8
-Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: C++ jabber/xmpp library
@@ -36,9 +35,9 @@ Description: C++ jabber/xmpp library
Package: libgloox-dbg
Priority: extra
-Section: libs
+Section: debug
Architecture: any
-Depends: libgloox-dev (= ${binary:Version})
+Depends: ${misc:Depends}, libgloox-dev (= ${binary:Version})
Description: C++ jabber/xmpp library debug symbols
A C++ Jabber/XMPP library that takes care of low level protocol stuff.
Additionally, it offers high level interfaces for interaction with an
@@ -53,6 +52,7 @@ Package: libgloox-doc
Section: doc
Priority: extra
Architecture: all
+Depends: ${misc:Depends}
Description: C++ jabber/xmpp library API documentation
A C++ Jabber/XMPP library that takes care of low level protocol stuff.
Additionally, it offers high level interfaces for interaction with an
diff --git a/debian/copyright b/debian/copyright
index f27a379..9593b2b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -22,7 +22,7 @@ License:
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
In addition, as a special exception, the copyright holders give
permission to link the code of portions of this program with the
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 528e68f..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-#fix-pkgconfig.dpatch
-fix-gcc4.3.dpatch
-relibtoolize.dpatch
diff --git a/debian/patches/10-fix-gcc4.3.patch b/debian/patches/10-fix-gcc4.3.patch
new file mode 100644
index 0000000..d21d7e6
--- /dev/null
+++ b/debian/patches/10-fix-gcc4.3.patch
@@ -0,0 +1,59 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix-gcc4.3.dpatch by Jose Carlos Garcia Sogo <[email protected]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix compiling with gcc-4.3 (#455182)
+
+@DPATCH@
+---
+ src/connectionsocks5proxy.cpp | 2 ++
+ src/tests/tag/tag_perf.cpp | 2 ++
+ src/tests/zlib/zlib_perf.cpp | 2 ++
+ src/tlsgnutlsbase.cpp | 3 +++
+ 4 files changed, 9 insertions(+)
+
+--- a/src/connectionsocks5proxy.cpp
++++ b/src/connectionsocks5proxy.cpp
+@@ -38,6 +38,8 @@
+ # include <winsock2.h>
+ #endif
+
++#include <cstdlib>
++
+ namespace gloox
+ {
+
+--- a/src/tests/tag/tag_perf.cpp
++++ b/src/tests/tag/tag_perf.cpp
+@@ -11,6 +11,8 @@
+
+ #include <sys/time.h>
+
++#include <cstdlib>
++
+ static double divider = 1000000;
+ static int num = 2500;
+ static double t;
+--- a/src/tests/zlib/zlib_perf.cpp
++++ b/src/tests/zlib/zlib_perf.cpp
+@@ -13,6 +13,8 @@
+ #include <sys/time.h>
+ #include <cstdio> // [s]print[f]
+
++#include <cstdlib>
++
+ #ifdef HAVE_ZLIB
+
+ class ZlibTest : public CompressionDataHandler
+--- a/src/tlsgnutlsbase.cpp
++++ b/src/tlsgnutlsbase.cpp
+@@ -20,6 +20,9 @@
+ #include <stdlib.h>
+ #include <string.h>
+
++#include <cstdlib>
++#include <cstring>
++
+ namespace gloox
+ {
+
diff --git a/debian/patches/relibtoolize.dpatch b/debian/patches/20-relibtoolize.patch
similarity index 100%
rename from debian/patches/relibtoolize.dpatch
rename to debian/patches/20-relibtoolize.patch
diff --git a/debian/patches/fix-gcc4.3.dpatch b/debian/patches/fix-gcc4.3.dpatch
deleted file mode 100644
index 4e75ccc..0000000
--- a/debian/patches/fix-gcc4.3.dpatch
+++ /dev/null
@@ -1,56 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix-gcc4.3.dpatch by Jose Carlos Garcia Sogo <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix compiling with gcc-4.3 (#455182)
-
-@DPATCH@
-diff -urNad gloox.git2~/src/connectionsocks5proxy.cpp gloox.git2/src/connectionsocks5proxy.cpp
---- gloox.git2~/src/connectionsocks5proxy.cpp 2008-03-05 22:49:54.000000000 +0100
-+++ gloox.git2/src/connectionsocks5proxy.cpp 2008-03-05 22:50:26.000000000 +0100
-@@ -38,6 +38,8 @@
- # include <sstream>
- #endif
-
-+#include <cstdlib>
-+
- namespace gloox
- {
-
-diff -urNad gloox.git2~/src/tests/tag/tag_perf.cpp gloox.git2/src/tests/tag/tag_perf.cpp
---- gloox.git2~/src/tests/tag/tag_perf.cpp 2008-03-05 22:49:54.000000000 +0100
-+++ gloox.git2/src/tests/tag/tag_perf.cpp 2008-03-05 22:50:26.000000000 +0100
-@@ -9,6 +9,8 @@
-
- #include <sys/time.h>
-
-+#include <cstdlib>
-+
- static double divider = 1000000;
- static int num = 2500;
- static double t;
-diff -urNad gloox.git2~/src/tests/zlib/zlib_perf.cpp gloox.git2/src/tests/zlib/zlib_perf.cpp
---- gloox.git2~/src/tests/zlib/zlib_perf.cpp 2008-03-05 22:49:54.000000000 +0100
-+++ gloox.git2/src/tests/zlib/zlib_perf.cpp 2008-03-05 22:50:26.000000000 +0100
-@@ -11,6 +11,8 @@
- #include <string>
- #include <sys/time.h>
-
-+#include <cstdlib>
-+
- #ifdef HAVE_ZLIB
-
- class ZlibTest : public CompressionDataHandler
-diff -urNad gloox.git2~/src/tlsgnutlsbase.cpp gloox.git2/src/tlsgnutlsbase.cpp
---- gloox.git2~/src/tlsgnutlsbase.cpp 2008-03-05 22:49:54.000000000 +0100
-+++ gloox.git2/src/tlsgnutlsbase.cpp 2008-03-05 22:50:26.000000000 +0100
-@@ -18,6 +18,9 @@
-
- #include <errno.h>
-
-+#include <cstdlib>
-+#include <cstring>
-+
- namespace gloox
- {
-
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a8640c9
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+10-fix-gcc4.3.patch
+20-relibtoolize.patch
diff --git a/debian/patches/fix-pkgconfig.dpatch b/debian/patches/unused/fix-pkgconfig.patch
similarity index 100%
rename from debian/patches/fix-pkgconfig.dpatch
rename to debian/patches/unused/fix-pkgconfig.patch
diff --git a/debian/rules b/debian/rules
index 85e4d9c..1a35d24 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
@@ -44,7 +43,7 @@ config.status: configure
build: build-arch build-indep
build-arch: build-arch-stamp
-build-arch-stamp: patch-stamp config.status
+build-arch-stamp: config.status
dh_testdir
$(MAKE)
@@ -59,9 +58,7 @@ build-indep-stamp:
touch build-indep-stamp
-clean: clean1 unpatch
-
-clean1:
+clean:
dh_testdir
dh_testroot
rm -f build-arch-stamp build-indep-stamp
@@ -75,7 +72,7 @@ install: install-indep install-arch
install-arch: build-arch
dh_testdir
dh_testroot
- dh_clean -k -a
+ dh_prep
dh_installdirs -a
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
@@ -83,9 +80,10 @@ install-arch: build-arch
install-indep: build-indep
dh_testdir
dh_testroot
- dh_clean -k -i
+ dh_prep
dh_installdirs -i
+ install -d -m 755 debian/libgloox-doc/usr/share/doc/libgloox-doc/html
cp -a api/* debian/libgloox-doc/usr/share/doc/libgloox-doc/html/
rm -f debian/libgloox-doc/usr/share/doc/libgloox-doc/html/*md5
@@ -121,4 +119,4 @@ binary-arch: build install
dh_builddeb -a
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch patch unpatch clean1
+.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch clean1
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)
--
1.7.10
--- End Message ---
