diff options
| author | Martin Lucina <mato@kotelna.sk> | 2011-04-07 15:37:46 +0200 |
|---|---|---|
| committer | Martin Lucina <martin@lucina.net> | 2012-01-23 08:53:43 +0100 |
| commit | 8eea9178e40abf16c0e469465a58fba3beaaf754 (patch) | |
| tree | da36e07db727b5c30c8e5c7745275b9d6d48131f /debian | |
| parent | 3e20cb1b8a2b1ca222011df37334e5f4f88dd565 (diff) | |
| parent | 8e61b98c5e2943b149c825310b24e714a6127072 (diff) | |
Imported Debian patch 2.1.4-1debian/2.1.4-1
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rwxr-xr-x | debian/rules | 15 |
3 files changed, 16 insertions, 10 deletions
diff --git a/debian/changelog b/debian/changelog index a6b3bdc..f54fc17 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,13 @@ +zeromq (2.1.4-1) experimental; urgency=low + + * New upstream version. + * OpenPGM re-enabled for amd64 and i386, still using embedded library. + + -- Martin Lucina <mato@kotelna.sk> Thu, 07 Apr 2011 15:37:46 +0200 + zeromq (2.1.3-1) experimental; urgency=low - * New upstream version (closes: #619374). + * New upstream version. * 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 diff --git a/debian/control b/debian/control index 37c2012..15b5b10 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: zeromq Section: libs Priority: optional Maintainer: Martin Lucina <mato@kotelna.sk> -Build-Depends: debhelper (>= 7), uuid-dev +Build-Depends: debhelper (>= 7), uuid-dev, python [amd64 i386] Standards-Version: 3.9.1 Homepage: http://www.zeromq.org/ diff --git a/debian/rules b/debian/rules index 6d8f530..a6187d5 100755 --- a/debian/rules +++ b/debian/rules @@ -2,14 +2,13 @@ #export DH_VERBOSE=1 -# 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 +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))) @@ -44,7 +43,7 @@ clean: rm -f build-stamp configure-stamp if [ -e Makefile ]; then make distclean; fi - rm -rf foreign/openpgm/libpgm-2.0.20rc5 config.log + rm -rf foreign/openpgm/build-staging config.log dh_clean |