[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#769122: unblock: qpid-proton/0.7-8



On Wed, Nov 12, 2014 at 01:47:11PM +0100, Cyril Brulebois wrote:
> You've got a link to the dsc file for the version(s) currently in
> testing in sid at [1] (on the right of version number in the "versions"
> box). You can use "dget $url_to_dsc" to fetch the source package, then
> run "debdiff $old_dsc $new_dsc" and attach that.
> 
>  1. https://packages.qa.debian.org/q/qpid-proton.html

Thank you! I've downloaded the set of files needed to do the debdiff.
Here is the output generated between 0.7-1 and 0.7-8:

diff -Nru qpid-proton-0.7/debian/changelog qpid-proton-0.7/debian/changelog
--- qpid-proton-0.7/debian/changelog	2014-06-02 16:05:32.000000000 -0400
+++ qpid-proton-0.7/debian/changelog	2014-11-12 10:20:17.000000000 -0500
@@ -1,3 +1,70 @@
+qpid-proton (0.7-8) unstable; urgency=low
+
+  * Bumped the release to include the FTBFS bug id. (Closes: #768617)
+
+ -- Darryl L. Pierce <mcpierce@gmail.com>  Tue, 11 Nov 2014 08:07:12 -0500
+
+qpid-proton (0.7-7) unstable; urgency=low
+
+  * Fix FTBFS for on Jessie. 
+  * Removed dependency on libsslcommon2, replaced it with libssl-dev.
+
+ -- Darryl L. Pierce <mcpierce@gmail.com>  Mon, 10 Nov 2014 16:28:20 -0500
+
+qpid-proton (0.7-6) unstable; urgency=low
+
+  * Added package control statements to handle any name conflicts for -dev.
+
+ -- Darryl L. Pierce <mcpierce@gmail.com>  Thu, 04 Sep 2014 18:36:35 -0400
+
+qpid-proton (0.7-5) unstable; urgency=low
+
+  * Added CMake files to libqpid-proton-dev.
+  * Added pkg-config files to libqpid-proton-dev.
+
+ -- Darryl L. Pierce <mcpierce@gmail.com>  Thu, 04 Sep 2014 11:07:38 -0400
+
+qpid-proton (0.7-4) unstable; urgency=medium
+
+  * Bumped the release number.
+
+ -- Darryl L. Pierce <mcpierce@gmail.com>  Wed, 30 Jul 2014 16:37:43 -0400
+
+qpid-proton (0.7-3) unstable; urgency=medium
+
+  * Renamed libqpid-proton2-dev package to libqpid-proton-dev.
+  * Manually linking rt and uuid to libqpid-proton since CMake does not find them.
+
+ -- Darryl L. Pierce <mcpierce@gmail.com>  Wed, 30 Jul 2014 10:24:55 -0400
+
+qpid-proton (0.7-2) unstable; urgency=medium
+
+  * Fixed the licensing to be GPLv3 for all Debian packaging files.
+
+ -- Darryl Pierce <mcpierce@gmail.com>  Mon, 21 Jul 2014 08:36:31 -0400
+
+qpid-proton (0.7-1.2) unstable; urgency=low
+
+  * Fixed various lintian error messages.
+
+ -- Darryl Pierce <mcpierce@gmail.com>  Mon, 14 Jul 2014 10:02:46 -0400
+
+qpid-proton (0.7-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Removed examples from libqpid-proton-dev-docs.
+  * Added an extended description to libqpid-proton.
+  * Renamed libqpid-proton to libqpid-proton2 to reflect soversion.
+  * Removed dependencies from -doc packages on binary packages.
+  * Fixed multi-arch for qpid-proton package.
+  * Fixed the descriptions for each package.
+  * Added the qpid-proton-dump package.
+  * Added a Debian watch file.
+  * Fixed license for free getopt code from Mark Kim.
+  * Fixed the sections for packages. 
+
+ -- Darryl Pierce <mcpierce@gmail.com>  Fri, 09 May 2014 07:59:57 -0400
+
 qpid-proton (0.7-1) unstable; urgency=low
 
   * Initial release. (Closes: #732302)
diff -Nru qpid-proton-0.7/debian/control qpid-proton-0.7/debian/control
--- qpid-proton-0.7/debian/control	2014-06-02 16:57:51.000000000 -0400
+++ qpid-proton-0.7/debian/control	2014-11-12 10:20:30.000000000 -0500
@@ -2,18 +2,18 @@
 Section: libs
 Priority: optional
 Maintainer: Debian Middleware Maintainers <pkg-middleware-maintainers@lists.alioth.debian.org>
-Uploaders: Darryl L. Pierce <dpierce@redhat.com>, Daniel Pocock <daniel@pocock.pro>
+Uploaders: Darryl L. Pierce <mcpierce@gmail.com>, Daniel Pocock <daniel@pocock.pro>
 Build-Depends: debhelper (>= 9.0.0~),
                cmake,
 	       swig,
 	       pkg-config,
 	       doxygen,
 	       uuid-dev,
-	       libsslcommon2-dev,
+               libssl-dev,
 	       python-epydoc,
 	       python (>=2.6.6-3~),
 	       python-dev (>=2.6.6-3~)
-Standards-Version: 3.9.3
+Standards-Version: 3.9.5
 Homepage: http://qpid.apache.org/proton
 Vcs-Browser: http://git.debian.org/?p=pkg-middleware/qpid-proton.git
 Vcs-Git: git://git.debian.org/git/pkg-middleware/qpid-proton.git
@@ -34,6 +34,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: C libraries for Qpid Proton
  Qpid Proton is a high-performance, lightweight messaging library. It can be
  used in the widest range of messaging applications, including brokers, client
@@ -44,9 +45,13 @@
  This package provides the shared libraries for Qpid Proton.
 
 Package: libqpid-proton2-dev
+Provides: libqpid-proton-dev
+Replaces: libqpid-proton-dev
+Conflicts: libqpid-proton-dev
 Architecture: any
 Section: libdevel
 Depends: libqpid-proton2 (= ${binary:Version}), ${misc:Depends}
+Multi-Arch: same
 Description: Development libraries for writing messaging apps with Qpid Proton
  Qpid Proton is a high-performance, lightweight messaging library. It can be
  used in the widest range of messaging applications, including brokers, client
@@ -57,6 +62,9 @@
  This package provides the C development libraries for Qpid Proton.
 
 Package: libqpid-proton2-dev-examples
+Provides: libqpid-proton-dev-examples
+Replaces: libqpid-proton-dev-examples
+Conflicts: libqpid-proton-dev-examples
 Architecture: all
 Section: libdevel
 Depends: libqpid-proton2-dev (>= ${binary:Version}), ${misc:Depends}
@@ -70,6 +78,9 @@
  This package provides C language examples for Qpid Proton.
 
 Package: libqpid-proton2-dev-doc
+Provides: libqpid-proton-dev-doc
+Replaces: libqpid-proton-dev-doc
+Conflicts: libqpid-proton-dev-doc
 Architecture: all
 Section: doc
 Depends: ${misc:Depends}
@@ -85,7 +96,10 @@
 Package: python-qpid-proton
 Architecture: any
 Section: python
-Depends: libqpid-proton2, ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Depends: libqpid-proton2,
+         ${python:Depends},
+         python (>= 2.6),
+         ${shlibs:Depends}, ${misc:Depends}
 Provides: ${python:Provides}
 Description: Python language bindings for Qpid Proton messaging framework
  Qpid Proton is a high-performance, lightweight messaging library. It can be
diff -Nru qpid-proton-0.7/debian/libqpid-proton2-dev.install qpid-proton-0.7/debian/libqpid-proton2-dev.install
--- qpid-proton-0.7/debian/libqpid-proton2-dev.install	2014-06-02 16:40:48.000000000 -0400
+++ qpid-proton-0.7/debian/libqpid-proton2-dev.install	2014-11-12 10:20:17.000000000 -0500
@@ -1,2 +1,4 @@
 usr/lib/*/libqpid-proton.so
 usr/include/proton
+usr/lib/*/cmake/Proton
+usr/lib/*/pkgconfig/libqpid-proton.pc
diff -Nru qpid-proton-0.7/debian/patches/fix-gettime-reference.diff qpid-proton-0.7/debian/patches/fix-gettime-reference.diff
--- qpid-proton-0.7/debian/patches/fix-gettime-reference.diff	1969-12-31 19:00:00.000000000 -0500
+++ qpid-proton-0.7/debian/patches/fix-gettime-reference.diff	2014-11-12 10:17:06.000000000 -0500
@@ -0,0 +1,24 @@
+Description: fix-gettime-reference
+ Added rt to the end of the link line to help find gettime method.
+ .
+ qpid-proton (0.7-3precise) precise; urgency=medium
+ .
+   *  Renamed libqpid-proton2-dev package to libqpid-proton-dev.
+Author: Darryl Pierce <mcpierce@gmail.com>
+
+---
+--- qpid-proton-0.7.orig/proton-c/CMakeLists.txt
++++ qpid-proton-0.7/proton-c/CMakeLists.txt
+@@ -304,7 +304,7 @@ add_library (
+   ${qpid-proton-platform}
+   )
+ 
+-target_link_libraries (qpid-proton ${UUID_LIB} ${SSL_LIB} ${TIME_LIB} ${PLATFORM_LIBS})
++target_link_libraries (qpid-proton ${UUID_LIB} ${SSL_LIB} ${TIME_LIB} ${PLATFORM_LIBS} rt)
+ 
+ set_target_properties (
+   qpid-proton
+--- /dev/null
++++ qpid-proton-0.7/patches/series
+@@ -0,0 +1 @@
++fix-gettime-reference.diff
diff -Nru qpid-proton-0.7/debian/patches/fix-uuid-reference.diff qpid-proton-0.7/debian/patches/fix-uuid-reference.diff
--- qpid-proton-0.7/debian/patches/fix-uuid-reference.diff	1969-12-31 19:00:00.000000000 -0500
+++ qpid-proton-0.7/debian/patches/fix-uuid-reference.diff	2014-11-12 10:17:06.000000000 -0500
@@ -0,0 +1,25 @@
+Description: Fix UUID link reference
+ On Precise it's not properly finding the UUID library.
+ .
+ qpid-proton (0.7-3precise) precise; urgency=medium
+ .
+   *  Renamed libqpid-proton2-dev package to libqpid-proton-dev.
+Author: Darryl Pierce <mcpierce@gmail.com>
+
+---
+--- qpid-proton-0.7.orig/proton-c/CMakeLists.txt
++++ qpid-proton-0.7/proton-c/CMakeLists.txt
+@@ -304,7 +304,7 @@ add_library (
+   ${qpid-proton-platform}
+   )
+ 
+-target_link_libraries (qpid-proton ${UUID_LIB} ${SSL_LIB} ${TIME_LIB} ${PLATFORM_LIBS} rt)
++target_link_libraries (qpid-proton ${UUID_LIB} ${SSL_LIB} ${TIME_LIB} ${PLATFORM_LIBS} rt uuid)
+ 
+ set_target_properties (
+   qpid-proton
+--- qpid-proton-0.7.orig/patches/series
++++ qpid-proton-0.7/patches/series
+@@ -1 +1,2 @@
+ fix-gettime-reference.diff
++fix-uuid-reference.diff
diff -Nru qpid-proton-0.7/debian/rules qpid-proton-0.7/debian/rules
--- qpid-proton-0.7/debian/rules	2014-06-02 16:49:30.000000000 -0400
+++ qpid-proton-0.7/debian/rules	2014-11-12 10:17:06.000000000 -0500
@@ -20,12 +20,16 @@
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 export DH_ALWAYS_EXCLUDE=LICENSE
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 %:
 	dh $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DPROTON_DISABLE_RPATH=true -DNOBUILD_RUBY=on -DSYSINSTALL_BINDINGS=on
+	dh_auto_configure -- -DPROTON_DISABLE_RPATH=true \
+                             -DNOBUILD_RUBY=on \
+                             -DSYSINSTALL_BINDINGS=on \
+                             -DLIB_INSTALL_DIR=/usr/lib/${DEB_HOST_MULTIARCH}
 
 override_dh_auto_build:
 	dh_auto_build -- all docs
diff -Nru qpid-proton-0.7/debian/source/lintian-overrides qpid-proton-0.7/debian/source/lintian-overrides
--- qpid-proton-0.7/debian/source/lintian-overrides	1969-12-31 19:00:00.000000000 -0500
+++ qpid-proton-0.7/debian/source/lintian-overrides	2014-11-11 13:17:17.000000000 -0500
@@ -0,0 +1,2 @@
+# Python lib package prepared using non-standard CMake build system, but deps appear to be detected OK
+qpid-proton source: python-depends-but-no-python-helper python-qpid-proton

-- 
Darryl L. Pierce <mcpierce@gmail.com>
http://mcpierce.blogspot.com/
Famous last words:
   "I wonder what happens if we do it this way?"

Attachment: pgpNgw6kUJSMr.pgp
Description: PGP signature


Reply to: