16 files changed, 107 insertions, 101 deletions
diff --git a/debian/README b/debian/README
deleted file mode 100644
index 168d971..0000000
--- a/debian/README
+++ /dev/null
@@ -1,2 +0,0 @@
-To make sure that all the data sources are working and up to date, you can run
-"ept-cache info" and follow the instructions.
diff --git a/debian/changelog b/debian/changelog
index d153a59..819bcb9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,78 @@
+libept (1.1) experimental; urgency=medium
+
+  * Removed need of tagcoll and wibble
+  * Removed popcon/ support
+
+ -- Enrico Zini <enrico@debian.org>  Thu, 10 Sep 2015 19:50:32 +0200
+
+libept (1.0.14) unstable; urgency=medium
+
+  * New version that includes Matthias' changes
+  * Removed compatibility symlink, not needed anymore
+
+ -- Enrico Zini <enrico@debian.org>  Tue, 11 Aug 2015 19:50:06 +0200
+
+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]
+   * Fix "missing link /usr/lib/libept.so.1.0.5.4.12" Link now depends on
+     architecture using dh-exec (Closes: #727694)
+
+  [Enrico Zini]
+  * Added cmake_minimum_required. Closes: #788770
+  * Simplified debtags code
+     - tag and vocabulary data are loaded only from /var/lib/debtags/
+     - local patches are not supported anymore
+     - tag and vocabulary merging are not supported anymore
+     - removed support for patched collections
+  * Removed obsolete package ept-cache. Closes: #436748
+
+ -- Enrico Zini <enrico@debian.org>  Thu, 18 Jun 2015 10:32:52 +0200
+
+libept (1.0.12.1) unstable; urgency=medium
+
+  * Redone parsing of Tag fields, to cope with multiline fields
+  * Get tag data from /var/lib/debtags/package-tags and
+    /var/lib/debtags/vocabulary if they are available. Closes: #762347
+  * Updated standards-version, no changes required.
+  * Set priority to optional. Closes: #741632
+  * Migrated to dh_installdeb maintscript support. Closes: #659749
+
+ -- Enrico Zini <enrico@debian.org>  Mon, 06 Oct 2014 14:36:56 +0200
+
+libept (1.0.12) unstable; urgency=low
+
+  * Fixes a case of sizeof(struct stat) disagreeing between libwibble and
+    libept on some architectures.
+
+ -- Enrico Zini <enrico@debian.org>  Thu, 24 Oct 2013 20:55:21 +0200
+
+libept (1.0.11) unstable; urgency=low
+
+  * Added explicit template instantiation with the symbols aptitude needs.
+    Closes: #727540
+
+ -- Enrico Zini <enrico@debian.org>  Thu, 24 Oct 2013 19:02:55 +0200
+
+libept (1.0.10) unstable; urgency=low
+
+  * Dropped Conflict on long-disappeared version of debtags
+  * Ported to debhelper
+  * Ported to libwibble 1.1
+  * Removed obsolete debian/README
+
+ -- Enrico Zini <enrico@debian.org>  Thu, 24 Oct 2013 01:36:13 +0200
+
 libept (1.0.9) unstable; urgency=low
 
   [ Adam Conrad ]
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 8906ce0..e000b3b 100644
--- a/debian/control
+++ b/debian/control
@@ -1,10 +1,14 @@
 Source: libept
 Section: libdevel
-Priority: important
+Priority: optional
 Maintainer: Enrico Zini <enrico@debian.org>
 Uploaders: Petr Rockai <mornfall@debian.org>
-Build-Depends: cdbs, debhelper (>> 5), dh-buildinfo, doxygen, libapt-pkg-dev (>= 0.6.46.1), libwibble-dev (>= 0.1.23), libwibble-dev (<< 0.2), libtagcoll2-dev (>= 2.0.6), libtagcoll2-dev (<< 2.1), pkg-config, libxapian-dev (>= 1.0.5), cmake (>= 2.6)
-Standards-Version: 3.9.0.0
+Build-Depends:
+  debhelper (>= 9), dh-exec, dh-buildinfo,
+  cmake (>= 2.6), pkg-config, doxygen,
+  libapt-pkg-dev (>= 1.0.10),
+  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
 
@@ -13,8 +17,9 @@ Section: libdevel
 Priority: optional
 Architecture: any
 Recommends: pkg-config
-Depends: libept1.4.12 (= ${binary:Version}), libwibble-dev (>= 0.1.21), libwibble-dev (<< 0.2), libtagcoll2-dev (>= 2.0.6), libtagcoll2-dev (<< 2.1), libapt-pkg-dev (>= 0.6.46.1), libxapian-dev (>= 1.0.5), ${misc:Depends}
-Conflicts: debtags (<< 0.7)
+Depends:
+  libept1.4.16 (= ${binary:Version}),
+  libapt-pkg-dev (>= 1.0.10), libxapian-dev (>= 1.2.21-1.2), ${misc:Depends}
 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.
@@ -28,9 +33,10 @@ 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}
 Description: High-level library for managing Debian package information
  The library defines a very minimal framework in which many sources of data
@@ -44,14 +50,3 @@ Description: High-level library for managing Debian package information
   * The Xapian index built by apt-xapian-index
  .
  This is the shared library.
-
-Package: ept-cache
-Priority: extra
-Architecture: all
-Section: misc
-Depends: ${shlibs:Depends}, ${misc:Depends}, apt-xapian-index (>= 0.30)
-Recommends: debtags
-Description: Obsolete commandline tool to search the package archive
- ept-cache has been superseded by axi-cache, provided by apt-xapian-index.
- .
- This package provides a dummy ept-cache script that just call axi-cache.
diff --git a/debian/debuild.opts b/debian/debuild.opts
deleted file mode 100644
index b962575..0000000
--- a/debian/debuild.opts
+++ /dev/null
@@ -1 +0,0 @@
--i_darcs -I_darcs -iwibble -Iwibble
diff --git a/debian/ept-cache.docs b/debian/ept-cache.docs
deleted file mode 100644
index 7cfd8c2..0000000
--- a/debian/ept-cache.docs
+++ /dev/null
@@ -1 +0,0 @@
-doc/FAQ
diff --git a/debian/ept-cache.install b/debian/ept-cache.install
deleted file mode 100644
index 468332f..0000000
--- a/debian/ept-cache.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/bin/
diff --git a/debian/ept-cache.postinst b/debian/ept-cache.postinst
deleted file mode 100644
index a43d119..0000000
--- a/debian/ept-cache.postinst
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "configure" ]; then
-	if [ -d /var/lib/apt-xapian ]; then
-		echo "Removing old index /var/lib/apt-xapian..."
-		rm -r /var/lib/apt-xapian
-	fi
-fi
-
-# FIXME: remove test when we are not interested in lenny anymore
-if test -x /usr/bin/dpkg-maintscript-helper && dpkg-maintscript-helper supports rm_conffile; then
-	dpkg-maintscript-helper rm_conffile /etc/cron.weekly/ept-cache 1.0.1 -- "$@"
-fi
-
-#DEBHELPER#
diff --git a/debian/ept-cache.postrm b/debian/ept-cache.postrm
deleted file mode 100644
index 90d458c..0000000
--- a/debian/ept-cache.postrm
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# FIXME: remove test when we are not interested in lenny anymore
-if test -x /usr/bin/dpkg-maintscript-helper && dpkg-maintscript-helper supports rm_conffile; then
-	dpkg-maintscript-helper rm_conffile /etc/cron.weekly/ept-cache 1.0.1 -- "$@"
-fi
-
-#DEBHELPER#
diff --git a/debian/ept-cache.preinst b/debian/ept-cache.preinst
deleted file mode 100644
index 90d458c..0000000
--- a/debian/ept-cache.preinst
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# FIXME: remove test when we are not interested in lenny anymore
-if test -x /usr/bin/dpkg-maintscript-helper && dpkg-maintscript-helper supports rm_conffile; then
-	dpkg-maintscript-helper rm_conffile /etc/cron.weekly/ept-cache 1.0.1 -- "$@"
-fi
-
-#DEBHELPER#
diff --git a/debian/ept-cache.prerm b/debian/ept-cache.prerm
deleted file mode 100644
index 90d458c..0000000
--- a/debian/ept-cache.prerm
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# FIXME: remove test when we are not interested in lenny anymore
-if test -x /usr/bin/dpkg-maintscript-helper && dpkg-maintscript-helper supports rm_conffile; then
-	dpkg-maintscript-helper rm_conffile /etc/cron.weekly/ept-cache 1.0.1 -- "$@"
-fi
-
-#DEBHELPER#
diff --git a/debian/libept-dev.install b/debian/libept-dev.install
index 18a4201..a6a8693 100644
--- a/debian/libept-dev.install
+++ b/debian/libept-dev.install
@@ -1,5 +1,4 @@
 debian/tmp/usr/include/*
-debian/tmp/usr/lib/lib*.a
-debian/tmp/usr/lib/lib*.so
-debian/tmp/usr/lib/pkgconfig/*
-debian/tmp/usr/share/doc/libept-dev/*
+debian/tmp/usr/lib/*/lib*.a
+debian/tmp/usr/lib/*/lib*.so
+debian/tmp/usr/lib/*/pkgconfig/*
diff --git a/debian/libept1.4.12.install b/debian/libept1.4.12.install
deleted file mode 100644
index 389d6db..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 133c3b6..0000000
--- a/debian/libept1.4.12.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/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/rules b/debian/rules
index d47988e..e689b30 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,35 +1,25 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
+BUILDDIR = $(CURDIR)/debian/build
 
-#DEB_CMAKE_EXTRA_FLAGS += -DOPT_FLAGS="" 
+%:
+	dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR)
 
+override_dh_fixperms:
+	dh_fixperms
+	test -e /usr/bin/dh_buildinfo && dh_buildinfo
 
-DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
+override_dh_auto_build:
+	dh_auto_build
+	make -C $(BUILDDIR) check
+	make -C $(BUILDDIR) doc
 
-DEB_MAKE_CHECK_TARGET := unit
-
-DEB_DH_MAKESHLIBS_ARGS_libept1.4.12 = -V
-
-# comment out CONFIGURE and uncomment CMAKE flags to use cmake
-#DEB_CONFIGURE_EXTRA_FLAGS += --disable-shared --with-pic
-#DEB_CMAKE_EXTRA_FLAGS += -DBUILD_TESTING=ON
-
-# Store build information
-common-binary-post-install-arch common-binary-post-install-indep::
-	dh_buildinfo
-
-build/libept-dev::
-	make -C ${DEB_BUILDDIR} doc
-
-install/libept-dev::
-	mkdir -p debian/tmp/usr/share/doc/libept-dev/
-	cp -r ${DEB_BUILDDIR}/doc/html debian/tmp/usr/share/doc/libept-dev/
-	cp ${DEB_BUILDDIR}/doc/libept.doxytags debian/tmp/usr/share/doc/libept-dev/
-	gzip -9 debian/tmp/usr/share/doc/libept-dev/libept.doxytags
+override_dh_auto_install:
+	dh_auto_install
+	dh_installdocs -plibept-dev -n $(BUILDDIR)/doc/html
+	dh_installdocs -plibept-dev -n $(BUILDDIR)/doc/libept.doxytags
 
 debsrc:
 	debian/check_versions
-	git-buildpackage --git-pristine-tar -S -us -uc
+	gbp buildpackage --git-pristine-tar -S -us -uc