Imported Debian patch 2.1.3-1debian/2.1.3-1

9 files changed, 21 insertions, 42 deletions

diff --git a/debian/changelog b/debian/changelog
index 3dde86b..a6b3bdc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+zeromq (2.1.3-1) experimental; urgency=low
+
+  * New upstream version (closes: #619374).
+  * The zeromq-bin package has been removed, as upstream has removed the
+    devices.
+  * Temporarily disabled OpenPGM builds on i386 and amd64 due to changes in
+    upstream OpenPGM intergration. 
+
+ -- Martin Lucina <mato@kotelna.sk>  Mon, 28 Mar 2011 10:39:51 +0200
+
 zeromq (2.0.10-1) unstable; urgency=low
 
   * New upstream version.
diff --git a/debian/control b/debian/control
index 4f25577..37c2012 100644
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,13 @@ Source: zeromq
 Section: libs
 Priority: optional
 Maintainer: Martin Lucina <mato@kotelna.sk>
-Build-Depends: debhelper (>= 7), libglib2.0-dev [amd64 i386], python [amd64 i386], uuid-dev
+Build-Depends: debhelper (>= 7), uuid-dev
 Standards-Version: 3.9.1
 Homepage: http://www.zeromq.org/
 
-Package: libzmq0
+Package: libzmq1
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: zeromq-bin
 Description: The ZeroMQ messaging library
  The 0MQ lightweight messaging kernel is a library which extends the
  standard socket interfaces with features traditionally provided by
@@ -20,33 +19,10 @@ Description: The ZeroMQ messaging library
  .
  This package contains the ZeroMQ shared library.
 
-Package: zeromq-bin
-Architecture: any
-Section: utils
-Depends: ${shlibs:Depends}, ${misc:Depends}
-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
- standard socket interfaces with features traditionally provided by
- specialised messaging middleware products. 0MQ sockets provide an
- abstraction of asynchronous message queues, multiple messaging
- patterns, message filtering (subscriptions), seamless access to
- multiple transport protocols and more.
- .
- 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)
- .
- These are building blocks intended to serve as intermediate nodes in
- complex messaging topologies.
-
 Package: libzmq-dev
 Architecture: any
 Section: libdevel
-Depends: libzmq0 (= ${binary:Version}), ${misc:Depends}
+Depends: libzmq1 (= ${binary:Version}), ${misc:Depends}
 Description: Development files and static library for the ZeroMQ library
  The 0MQ lightweight messaging kernel is a library which extends the
  standard socket interfaces with features traditionally provided by
@@ -61,7 +37,7 @@ Package: libzmq-dbg
 Architecture: any
 Priority: extra
 Section: debug
-Depends: libzmq0 (= ${binary:Version}), ${misc:Depends}
+Depends: libzmq1 (= ${binary:Version}), ${misc:Depends}
 Description: Debugging files for the ZeroMQ messaging library
  The 0MQ lightweight messaging kernel is a library which extends the
  standard socket interfaces with features traditionally provided by
diff --git a/debian/libzmq0.docs b/debian/libzmq1.docs
index 6f83607..6f83607 100644
--- a/debian/libzmq0.docs
+++ b/debian/libzmq1.docs
diff --git a/debian/libzmq0.install b/debian/libzmq1.install
index f63a68f..f63a68f 100644
--- a/debian/libzmq0.install
+++ b/debian/libzmq1.install
diff --git a/debian/libzmq0.lintian-overrides b/debian/libzmq1.lintian-overrides
index 8e8efc3..8e8efc3 100644
--- a/debian/libzmq0.lintian-overrides
+++ b/debian/libzmq1.lintian-overrides
diff --git a/debian/rules b/debian/rules
index 9003360..6d8f530 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,13 +2,14 @@
 
 #export DH_VERBOSE=1
 
-DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
-
-ifneq (,$(filter $(DEB_HOST_ARCH),i386 amd64))
-    pgm_opt := --with-pgm
-else
+# Temporarily disabled due to upstream changes in OpenPGM integration.
+# DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
+# 
+# ifneq (,$(filter $(DEB_HOST_ARCH),i386 amd64))
+#     pgm_opt := --with-pgm
+# else
     pgm_opt :=
-endif
+# endif
 
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
     NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
diff --git a/debian/zeromq-bin.install b/debian/zeromq-bin.install
deleted file mode 100644
index 5c5566e..0000000
--- a/debian/zeromq-bin.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin/zmq_forwarder
-usr/bin/zmq_queue
-usr/bin/zmq_streamer
diff --git a/debian/zeromq-bin.lintian-overrides b/debian/zeromq-bin.lintian-overrides
deleted file mode 100644
index f162251..0000000
--- a/debian/zeromq-bin.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# Spelling error is in upstream license text (xmlParser)
-zeromq-bin binary: spelling-error-in-copyright
diff --git a/debian/zeromq-bin.manpages b/debian/zeromq-bin.manpages
deleted file mode 100644
index bcc9687..0000000
--- a/debian/zeromq-bin.manpages
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/tmp/usr/share/man/man1/zmq_forwarder.1
-debian/tmp/usr/share/man/man1/zmq_queue.1
-debian/tmp/usr/share/man/man1/zmq_streamer.1