Imported Debian patch 2.0.9.dfsg-1debian/2.0.9.dfsg-1

8 files changed, 27 insertions, 12 deletions

diff --git a/debian/changelog b/debian/changelog
index 3ef705e..bfd6fe4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+zeromq (2.0.9.dfsg-1) unstable; urgency=medium
+
+  * New upstream version. 
+  * Move all manpages in libzmq0 to zeromq-dev package (closes: #595890) 
+  * Updated to standards version 3.9.1.
+  * Add lintian-overrides for spelling-error-in-copyright due to error in
+    upstream license of xmlParser.
+  * Use Breaks: instead of Conflicts: in zeromq-bin package, fixes 
+    conflicts-with-version from lintian.
+  * Various other minor fixes for warnings from lintian.
+
+ -- Martin Lucina <mato@kotelna.sk>  Wed, 08 Sep 2010 15:25:45 +0200
+
 zeromq (2.0.7.dfsg-1) unstable; urgency=low
 
   * New upstream version.
diff --git a/debian/control b/debian/control
index 40e30fa..4f25577 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,11 @@ Section: libs
 Priority: optional
 Maintainer: Martin Lucina <mato@kotelna.sk>
 Build-Depends: debhelper (>= 7), libglib2.0-dev [amd64 i386], python [amd64 i386], uuid-dev
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Homepage: http://www.zeromq.org/
 
 Package: libzmq0
 Architecture: any
-Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: zeromq-bin
 Description: The ZeroMQ messaging library
@@ -25,7 +24,7 @@ Package: zeromq-bin
 Architecture: any
 Section: utils
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: zeromq-utils (<= 2.0.6beta.dfsg-1)
+Breaks: zeromq-utils (<= 2.0.6beta.dfsg-1)
 Replaces: zeromq-utils (<= 2.0.6beta.dfsg-1)
 Description: Utilities for ZeroMQ
  The 0MQ lightweight messaging kernel is a library which extends the
@@ -37,9 +36,9 @@ Description: Utilities for ZeroMQ
  .
  This package contains the ZeroMQ devices:
  .
- * zmq_queue (Forwarder device for request-response messaging)
- * zmq_forwarder (Forwarder device for publish-subscribe messaging)
- * zmq_streamer (Streamer device for parallelized pipeline messaging)
+  * zmq_queue (Forwarder device for request-response messaging)
+  * zmq_forwarder (Forwarder device for publish-subscribe messaging)
+  * zmq_streamer (Streamer device for parallelized pipeline messaging)
  .
  These are building blocks intended to serve as intermediate nodes in
  complex messaging topologies.
diff --git a/debian/libzmq-dbg.lintian-overrides b/debian/libzmq-dbg.lintian-overrides
new file mode 100644
index 0000000..f7e7de2
--- /dev/null
+++ b/debian/libzmq-dbg.lintian-overrides
@@ -0,0 +1,2 @@
+# Spelling error is in upstream license text (xmlParser)
+libzmq-dbg binary: spelling-error-in-copyright
diff --git a/debian/libzmq-dev.lintian-overrides b/debian/libzmq-dev.lintian-overrides
new file mode 100644
index 0000000..81c6601
--- /dev/null
+++ b/debian/libzmq-dev.lintian-overrides
@@ -0,0 +1,2 @@
+# Spelling error is in upstream license text (xmlParser)
+libzmq-dev binary: spelling-error-in-copyright
diff --git a/debian/libzmq-dev.manpages b/debian/libzmq-dev.manpages
index 63f4dae..fe4ecb4 100644
--- a/debian/libzmq-dev.manpages
+++ b/debian/libzmq-dev.manpages
@@ -1,2 +1,2 @@
 debian/tmp/usr/share/man/man3/*
-debian/tmp/usr/share/man/man7/zmq_cpp.7
+debian/tmp/usr/share/man/man7/*
diff --git a/debian/libzmq0.lintian-overrides b/debian/libzmq0.lintian-overrides
new file mode 100644
index 0000000..8e8efc3
--- /dev/null
+++ b/debian/libzmq0.lintian-overrides
@@ -0,0 +1,2 @@
+# Spelling error is in upstream license text (xmlParser)
+libzmq0 binary: spelling-error-in-copyright
diff --git a/debian/libzmq0.manpages b/debian/libzmq0.manpages
deleted file mode 100644
index b846209..0000000
--- a/debian/libzmq0.manpages
+++ /dev/null
@@ -1,5 +0,0 @@
-debian/tmp/usr/share/man/man7/zmq.7
-debian/tmp/usr/share/man/man7/zmq_inproc.7
-debian/tmp/usr/share/man/man7/zmq_ipc.7
-debian/tmp/usr/share/man/man7/zmq_pgm.7
-debian/tmp/usr/share/man/man7/zmq_tcp.7
diff --git a/debian/zeromq-bin.lintian-overrides b/debian/zeromq-bin.lintian-overrides
new file mode 100644
index 0000000..f162251
--- /dev/null
+++ b/debian/zeromq-bin.lintian-overrides
@@ -0,0 +1,2 @@
+# Spelling error is in upstream license text (xmlParser)
+zeromq-bin binary: spelling-error-in-copyright