Imported doko's NMU

8 files changed, 33 insertions, 13 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c6618f..e420a48 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ include( FindDoxygen )
 
 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 --git a/debian/changelog b/debian/changelog
index 9dff8da..db8c124 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libept (1.0.13.1) experimental; urgency=medium
+
+  * Non maintainer upload.
+  * Rebuild using GCC 5. Addresses: #777944.
+  * Tighten dependencies on -dev packages.
+  * Rename libept1.4.12 to libept1.4.16 for the apt transition.
+  * Update links and install files.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 09 Aug 2015 23:59:39 +0200
+
 libept (1.0.13) experimental; urgency=medium
 
   [Raúl Sánchez Siles]
diff --git a/debian/control b/debian/control
index 7eb2bb4..8e61f1b 100644
--- a/debian/control
+++ b/debian/control
@@ -6,10 +6,10 @@ Uploaders: Petr Rockai <mornfall@debian.org>
 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 @@ Section: libdevel
 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 @@ Description: High-level library for managing Debian package information
  .
  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 --git a/debian/libept1.4.12.install b/debian/libept1.4.12.install
deleted file mode 100644
index 76a43a4..0000000
--- a/debian/libept1.4.12.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/*/libept.so.1.aptpkg4.12
diff --git a/debian/libept1.4.12.links b/debian/libept1.4.12.links
deleted file mode 100644
index e154ad3..0000000
--- a/debian/libept1.4.12.links
+++ /dev/null
@@ -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 --git a/debian/libept1.4.16.install b/debian/libept1.4.16.install
new file mode 100644
index 0000000..2285335
--- /dev/null
+++ b/debian/libept1.4.16.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/*/libept.so.1.aptpkg*
diff --git a/debian/libept1.4.16.links b/debian/libept1.4.16.links
new file mode 100644
index 0000000..17f43fe
--- /dev/null
+++ b/debian/libept1.4.16.links
@@ -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 --git a/debian/rules b/debian/rules
index 9a8d522..37484a8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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 @@ override_dh_auto_install:
 	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