Control: tags -1 + patch confirmed

please find attached a patch to build with all the rebuilt build-dependencies,
changing the soname.  The soname bump is at least needed for the changed
libstdc++6 ABI.

diff -Nru libept-1.0.13/CMakeLists.txt libept-1.0.13.1/CMakeLists.txt
--- libept-1.0.13/CMakeLists.txt        2015-06-18 01:33:59.000000000 +0200
+++ libept-1.0.13.1/CMakeLists.txt      2015-08-04 12:43:08.000000000 +0200
@@ -5,7 +5,7 @@
 
 add_custom_target( unit )
 
-set( EPT_VERSION "1.0.13" )
+set( EPT_VERSION "1.0.13.1" )
 
 # Get the soversion from libapt-pkg to include in our own
 execute_process(
diff -Nru libept-1.0.13/debian/changelog libept-1.0.13.1/debian/changelog
--- libept-1.0.13/debian/changelog      2015-06-18 10:33:46.000000000 +0200
+++ libept-1.0.13.1/debian/changelog    2015-08-04 12:28:45.000000000 +0200
@@ -1,3 +1,13 @@
+libept (1.0.13.1) wily; urgency=medium
+
+  * Non maintainer upload.
+  * Rebuild using GCC 5.
+  * Tighten dependencies on -dev packages.
+  * Rename libept1.4.12 to libept1.4.16 for the apt transition.
+  * Update links and install files.
+
+ -- Matthias Klose <d...@ubuntu.com>  Thu, 30 Jul 2015 18:38:18 +0200
+
 libept (1.0.13) experimental; urgency=medium
 
   [Raúl Sánchez Siles]
diff -Nru libept-1.0.13/debian/control libept-1.0.13.1/debian/control
--- libept-1.0.13/debian/control        2015-06-18 11:01:41.000000000 +0200
+++ libept-1.0.13.1/debian/control      2015-08-04 12:37:03.000000000 +0200
@@ -6,10 +6,10 @@
 Build-Depends:
   debhelper (>= 9), dh-exec, dh-buildinfo,
   cmake (>= 2.6), pkg-config, doxygen,
-  libapt-pkg-dev (>= 0.6.46.1),
-  libwibble-dev (>= 1.1), libwibble-dev (<< 2.0),
-  libtagcoll2-dev (>= 2.0.6), libtagcoll2-dev (<< 2.1),
-  libxapian-dev (>= 1.0.5)
+  libapt-pkg-dev (>= 1.0.10),
+  libwibble-dev (>= 1.1-1+b1), libwibble-dev (<< 2.0),
+  libtagcoll2-dev (>= 2.0.14-1+b1), libtagcoll2-dev (<< 2.1),
+  libxapian-dev (>= 1.2.21-1.2)
 Standards-Version: 3.9.6.0
 Vcs-Git: git://git.debian.org/git/debtags/libept.git
 Vcs-Browser: http://git.debian.org/?p=debtags/libept.git
@@ -19,10 +19,11 @@
 Architecture: any
 Recommends: pkg-config
 Depends:
-  libept1.4.12 (= ${binary:Version}),
-  libwibble-dev (>= 1.1), libwibble-dev (<< 2.0),
-  libtagcoll2-dev (>= 2.0.6), libtagcoll2-dev (<< 2.1),
-  libapt-pkg-dev (>= 0.6.46.1), libxapian-dev (>= 1.0.5), ${misc:Depends}
+  libept1.4.16 (= ${binary:Version}),
+  libwibble-dev (>= 1.1-1+b1), libwibble-dev (<< 2.0),
+  libtagcoll2-dev (>= 2.0.14-1+b1), libtagcoll2-dev (<< 2.1),
+  libapt-pkg-dev (>= 1.0.10), libxapian-dev (>= 1.2.21-1.2), ${misc:Depends}
+Built-Using: ${libwibble:Source}, ${tagcoll2:Source}
 Description: High-level library for managing Debian package information
  The library defines a very minimal framework in which many sources of data
  about Debian packages can be implemented and queried together.
@@ -36,11 +37,12 @@
  .
  This is the development library.
 
-Package: libept1.4.12
+Package: libept1.4.16
 Section: libs
 Architecture: any
 Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Built-Using: ${libwibble:Source}, ${tagcoll2:Source}
 Description: High-level library for managing Debian package information
  The library defines a very minimal framework in which many sources of data
  about Debian packages can be implemented and queried together.
diff -Nru libept-1.0.13/debian/libept1.4.12.install 
libept-1.0.13.1/debian/libept1.4.12.install
--- libept-1.0.13/debian/libept1.4.12.install   2015-06-18 11:01:29.000000000 
+0200
+++ libept-1.0.13.1/debian/libept1.4.12.install 1970-01-01 01:00:00.000000000 
+0100
@@ -1 +0,0 @@
-debian/tmp/usr/lib/*/libept.so.1.aptpkg4.12
diff -Nru libept-1.0.13/debian/libept1.4.12.links 
libept-1.0.13.1/debian/libept1.4.12.links
--- libept-1.0.13/debian/libept1.4.12.links     2015-06-18 11:01:26.000000000 
+0200
+++ libept-1.0.13.1/debian/libept1.4.12.links   1970-01-01 01:00:00.000000000 
+0100
@@ -1,2 +0,0 @@
-#!/usr/bin/dh-exec
-usr/lib/${DEB_HOST_MULTIARCH}/libept.so.1.aptpkg4.12 
usr/lib/libept.so.1.0.5.4.12
diff -Nru libept-1.0.13/debian/libept1.4.16.install 
libept-1.0.13.1/debian/libept1.4.16.install
--- libept-1.0.13/debian/libept1.4.16.install   1970-01-01 01:00:00.000000000 
+0100
+++ libept-1.0.13.1/debian/libept1.4.16.install 2015-07-30 18:36:49.000000000 
+0200
@@ -0,0 +1 @@
+debian/tmp/usr/lib/*/libept.so.1.aptpkg*
diff -Nru libept-1.0.13/debian/libept1.4.16.links 
libept-1.0.13.1/debian/libept1.4.16.links
--- libept-1.0.13/debian/libept1.4.16.links     1970-01-01 01:00:00.000000000 
+0100
+++ libept-1.0.13.1/debian/libept1.4.16.links   2015-07-30 18:37:09.000000000 
+0200
@@ -0,0 +1,2 @@
+#!/usr/bin/dh-exec
+usr/lib/${DEB_HOST_MULTIARCH}/libept.so.1.aptpkg4.16 
usr/lib/libept.so.1.0.5.4.16
diff -Nru libept-1.0.13/debian/rules libept-1.0.13.1/debian/rules
--- libept-1.0.13/debian/rules  2015-06-18 10:21:02.000000000 +0200
+++ libept-1.0.13.1/debian/rules        2015-08-04 12:42:23.000000000 +0200
@@ -2,6 +2,9 @@
 
 BUILDDIR = $(CURDIR)/debian/build
 
+libwibble_source = $(shell dpkg-query -f '$${source:Package} (= 
$${source:Version}), ' -W libwibble-dev)
+tagcoll2_source = $(shell dpkg-query -f '$${source:Package} (= 
$${source:Version}), ' -W libtagcoll2-dev)
+
 %:
        dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR)
 
@@ -19,6 +22,11 @@
        dh_installdocs -plibept-dev -n $(BUILDDIR)/doc/html
        dh_installdocs -plibept-dev -n $(BUILDDIR)/doc/libept.doxytags
 
+override_dh_gencontrol:
+       dh_gencontrol -- \
+         -Vlibwibble:Source="$(libwibble_source)" \
+         -Vtagcoll2:Source="$(tagcoll2_source)"
+
 debsrc:
        debian/check_versions
        gbp buildpackage --git-pristine-tar -S -us -uc

Reply via email to