diff -Nru qpid-cpp-0.16/debian/changelog qpid-cpp-0.16/debian/changelog --- qpid-cpp-0.16/debian/changelog 2014-08-21 12:48:38.000000000 +0000 +++ qpid-cpp-0.16/debian/changelog 2014-10-26 11:43:53.000000000 +0000 @@ -1,8 +1,18 @@ -qpid-cpp (0.16-7.2build1) utopic; urgency=medium +qpid-cpp (0.16-9) unstable; urgency=medium - * Rebuild for Perl 5.20.0. + * Update package sections to match override. + * Make libibverbs-dev build-dependency linux-any. - -- Colin Watson Thu, 21 Aug 2014 13:48:38 +0100 + -- Laszlo Boszormenyi (GCS) Sun, 26 Oct 2014 07:22:52 +0000 + +qpid-cpp (0.16-8) unstable; urgency=low + + * Add Japanese Debconf translation (closes: #692839). + * Remove qpidd.sasldb on purge (closes: #715438). + * Update Standards-Version to 3.9.6 . + * New maintainer (closes: #757652). + + -- Laszlo Boszormenyi (GCS) Sat, 25 Oct 2014 11:53:58 +0000 qpid-cpp (0.16-7.2) unstable; urgency=medium diff -Nru qpid-cpp-0.16/debian/control qpid-cpp-0.16/debian/control --- qpid-cpp-0.16/debian/control 2014-04-29 21:19:41.000000000 +0000 +++ qpid-cpp-0.16/debian/control 2014-10-26 11:46:15.000000000 +0000 @@ -1,10 +1,10 @@ Source: qpid-cpp Section: misc Priority: extra -Maintainer: Cajus Pollmeier -Build-Depends: debhelper (>= 8.9.0~), autotools-dev, autoconf (>= 2.61), automake (>= 1.9.6), libtool (>= 1.5.22), libboost-all-dev (>= 1.35), ruby, ruby-dev, uuid-dev, libsasl2-dev, libxqilla-dev (>= 2.0.0), libibverbs-dev, librdmacm-dev, libnspr4-dev, libnss3-dev, libssl-dev, sasl2-bin, libxerces-c-dev (>= 2.7.0), swig (>= 1.3.35), python (>= 2.6.6-3~), doxygen, help2man, valgrind [any-i386 any-amd64 arm], zip, procps, libnss3-tools, pkg-config, python-qpid, libperl-dev, dh-autoreconf, dpkg-dev (>= 1.16.1~), chrpath +Maintainer: Laszlo Boszormenyi (GCS) +Build-Depends: debhelper (>= 8.9.0~), autotools-dev, autoconf (>= 2.61), automake (>= 1.9.6), libtool (>= 1.5.22), libboost-all-dev (>= 1.35), ruby, ruby-dev, uuid-dev, libsasl2-dev, libxqilla-dev (>= 2.0.0), libibverbs-dev [linux-any], librdmacm-dev, libnspr4-dev, libnss3-dev, libssl-dev, sasl2-bin, libxerces-c-dev (>= 2.7.0), swig (>= 1.3.35), python (>= 2.6.6-3~), doxygen, help2man, valgrind [any-i386 any-amd64 arm], zip, procps, libnss3-tools, pkg-config, python-qpid, libperl-dev, dh-autoreconf, dpkg-dev (>= 1.16.1~), chrpath X-Python-Version: 2.7 -Standards-Version: 3.9.3 +Standards-Version: 3.9.6 Homepage: http://qpid.apache.org Vcs-Git: git://github.com/cajus/qpid-cpp-debian.git Vcs-Browser: https://github.com/cajus/qpid-cpp-debian @@ -35,6 +35,7 @@ Package: libqmf1 Architecture: any +Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Pre-Depends: multiarch-support Multi-Arch: same @@ -62,6 +63,7 @@ Package: libqmf2-1 Architecture: any +Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Pre-Depends: multiarch-support Multi-Arch: same @@ -89,6 +91,7 @@ Package: libqmfconsole2 Architecture: any +Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Pre-Depends: multiarch-support Multi-Arch: same @@ -115,6 +118,7 @@ Package: libqpidmessaging2 Architecture: any +Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Pre-Depends: multiarch-support Multi-Arch: same @@ -141,6 +145,7 @@ Package: libsslcommon2 Architecture: any +Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Pre-Depends: multiarch-support Multi-Arch: same @@ -167,6 +172,7 @@ Package: librdmawrap2 Architecture: any +Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Pre-Depends: multiarch-support Multi-Arch: same @@ -193,6 +199,7 @@ Package: libqpidtypes1 Architecture: any +Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Pre-Depends: multiarch-support Multi-Arch: same @@ -219,6 +226,7 @@ Package: libqpidcommon2 Architecture: any +Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Pre-Depends: multiarch-support Multi-Arch: same @@ -245,6 +253,7 @@ Package: libqpidclient2 Architecture: any +Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Pre-Depends: multiarch-support Multi-Arch: same @@ -271,6 +280,7 @@ Package: libqpidbroker2 Architecture: any +Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Pre-Depends: multiarch-support Multi-Arch: same @@ -297,6 +307,7 @@ Package: libqmfengine1 Architecture: any +Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Pre-Depends: multiarch-support Multi-Arch: same diff -Nru qpid-cpp-0.16/debian/copyright qpid-cpp-0.16/debian/copyright --- qpid-cpp-0.16/debian/copyright 2012-09-28 22:32:22.000000000 +0000 +++ qpid-cpp-0.16/debian/copyright 2014-10-25 11:55:32.000000000 +0000 @@ -17,7 +17,8 @@ can be found in the file '/usr/share/common-licenses/Apache-2.0'. Files: debian/* -Copyright: 2010, Cajus Pollmeier +Copyright: 2014, Laszlo Boszormenyi (GCS) , + 2010, Cajus Pollmeier License: GPL-2+ On Debian systems, the complete text of the GNU General Public License can be found in the file '/usr/share/common-licenses/GPL-2'. diff -Nru qpid-cpp-0.16/debian/po/ja.po qpid-cpp-0.16/debian/po/ja.po --- qpid-cpp-0.16/debian/po/ja.po 1970-01-01 00:00:00.000000000 +0000 +++ qpid-cpp-0.16/debian/po/ja.po 2014-10-25 12:32:31.000000000 +0000 @@ -0,0 +1,57 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# victory , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: qpid-cpp\n" +"Report-Msgid-Bugs-To: qpid-cpp@packages.debian.org\n" +"POT-Creation-Date: 2012-08-17 04:48+0000\n" +"PO-Revision-Date: 2012-08-17 13:48+0900\n" +"Last-Translator: victory \n" +"Language-Team: Japanese \n" +"Language: ja\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: password +#. Description +#: ../qpidd.templates:1001 +msgid "Administrator password:" +msgstr "管理者パスワード:" + +#. Type: password +#. Description +#: ../qpidd.templates:1001 +msgid "Please enter the password for the Qpid daemon administrator." +msgstr "Qpid デーモン管理者用のパスワードを入力してください。" + +#. Type: password +#. Description +#: ../qpidd.templates:2001 +msgid "Re-enter password to verify:" +msgstr "確認用にパスワードを再入力してください:" + +#. Type: password +#. Description +#: ../qpidd.templates:2001 +msgid "" +"Please enter the same Qpid daemon administrator password again to verify " +"that you have typed it correctly." +msgstr "" +"入力に間違いがないことを確認するため、同一の Qpid デーモン管理者用パスワードを" +"入力してください。" + +#. Type: note +#. Description +#: ../qpidd.templates:3001 +msgid "Password input error" +msgstr "パスワードの入力に誤りがあります" + +#. Type: note +#. Description +#: ../qpidd.templates:3001 +msgid "The two passwords you entered were not the same. Please try again." +msgstr "入力された 2 つのパスワードが同一ではありません。やり直してください。" diff -Nru qpid-cpp-0.16/debian/qpidd.postrm qpid-cpp-0.16/debian/qpidd.postrm --- qpid-cpp-0.16/debian/qpidd.postrm 2012-09-28 22:32:22.000000000 +0000 +++ qpid-cpp-0.16/debian/qpidd.postrm 2014-10-25 12:37:10.000000000 +0000 @@ -8,6 +8,7 @@ if [ "$1" = "purge" ]; then echo -n "Removing qpidd configuration... " + rm -f /etc/qpid/qpidd.sasldb 2>/dev/null || true rm -f /etc/qpid/qpidd.conf 2>/dev/null || true rm -r /etc/qpid/qpidd.acl 2>/dev/null || true rm -rf /etc/qpid/sasl 2>/dev/null || true diff -Nru qpid-cpp-0.16/debian/rules qpid-cpp-0.16/debian/rules --- qpid-cpp-0.16/debian/rules 2014-04-29 23:26:58.000000000 +0000 +++ qpid-cpp-0.16/debian/rules 2014-10-25 12:44:43.000000000 +0000 @@ -1,10 +1,5 @@ #!/usr/bin/make -f # -*- makefile -*- -# debian/rules for qpidd that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 @@ -22,10 +17,15 @@ export RUBY_LIB_ARCH = $(shell ruby -r rbconfig -e 'print RbConfig::CONFIG["archdir"]' | sed 's,/ruby/,/ruby/vendor_ruby/,') export RUBY_INC_ARCH = $(shell ruby -r rbconfig -e 'print RbConfig::CONFIG["rubyarchhdrdir"]') +override_dh_auto_clean: + dh_clean + find $(CURDIR) -name \*.pyc -exec rm {} + + rm -f $(CURDIR)/bindings/qpid/perl/Makefile.old + override_dh_auto_configure: dh_auto_configure -- --with-sasl --with-xml --with-rdma --with-ssl --with-swig --libexecdir='/usr/lib' --enable-fast-install override_dh_auto_test: %: - dh $@ --with python2 --with autoreconf + dh $@ --parallel --with python2 --with autoreconf