From 968694544c874eeca29fd8f2207622ce9222511b Mon Sep 17 00:00:00 2001 From: Alexander Ponyatykh Date: Tue, 19 Nov 2019 22:39:34 +0300 Subject: [PATCH] Update packaging * New maintainer. * Switch to debhelper. * Remove d/watch file pointing to a dead site. * Don't install .la files. * Multiarchify. * Remove unneeded dependencies (closes: bug#810434). --- debian/changelog | 12 ++++++++++++ debian/compat | 1 - debian/control | 9 ++++----- debian/libg15render-dev.install | 7 +++---- debian/{docs => libg15render1.docs} | 0 debian/libg15render1.install | 4 ++-- debian/rules | 30 +++++++---------------------- debian/watch | 7 ------- 8 files changed, 28 insertions(+), 42 deletions(-) delete mode 100644 debian/compat rename debian/{docs => libg15render1.docs} (100%) delete mode 100644 debian/watch diff --git a/debian/changelog b/debian/changelog index 3be7535..adc0c88 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +libg15render (1.3.0~svn316-3) UNRELEASED; urgency=medium + + * New maintainer. + * Switch to debhelper. + * Remove d/watch file pointing to a dead site. + * Don't install .la files. + * Multiarchify. + * Remove unneeded build dependencies (closes: bug#810434). + * Add build dependency on pkg-config. + + -- Alexander Ponyatykh Tue, 19 Nov 2019 21:53:55 +0300 + libg15render (1.3.0~svn316-2.4) unstable; urgency=medium * Non-maintainer upload. diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 7ed6ff8..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/debian/control b/debian/control index b6cf3b3..0b7b2e6 100644 --- a/debian/control +++ b/debian/control @@ -1,11 +1,10 @@ Source: libg15render Section: libs Priority: optional -Maintainer: Giacomo Catenazzi -Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libtool, automake1.11, - libg15-dev, libusb-dev, libfreetype6-dev, pkg-config, quilt -Standards-Version: 3.8.2 -Homepage: http://www.g15tools.com +Maintainer: Alexander Ponyatykh +Build-Depends: debhelper-compat (= 12), pkg-config, libfreetype6-dev +Standards-Version: 4.4.1 +Homepage: https://sourceforge.net/projects/g15tools/ Package: libg15render1 Section: libs diff --git a/debian/libg15render-dev.install b/debian/libg15render-dev.install index e4dec96..0f13edf 100644 --- a/debian/libg15render-dev.install +++ b/debian/libg15render-dev.install @@ -1,5 +1,4 @@ -debian/tmp/usr/include/* usr/include/ -debian/tmp/usr/lib/lib*.a usr/lib/ -debian/tmp/usr/lib/lib*.so usr/lib/ -debian/tmp/usr/lib/*.la usr/lib/ +debian/tmp/usr/include/* +debian/tmp/usr/lib/*/lib*.a +debian/tmp/usr/lib/*/lib*.so diff --git a/debian/docs b/debian/libg15render1.docs similarity index 100% rename from debian/docs rename to debian/libg15render1.docs diff --git a/debian/libg15render1.install b/debian/libg15render1.install index 5723507..b245f40 100644 --- a/debian/libg15render1.install +++ b/debian/libg15render1.install @@ -1,2 +1,2 @@ -debian/tmp/usr/lib/lib*.so.* usr/lib/ -debian/tmp/usr/share/g15tools/fonts/G15/* usr/share/g15tools/fonts/G15/ +debian/tmp/usr/lib/*/lib*.so.* +debian/tmp/usr/share/g15tools/fonts/G15/* diff --git a/debian/rules b/debian/rules index 291c85d..cd8ee14 100755 --- a/debian/rules +++ b/debian/rules @@ -1,28 +1,12 @@ #!/usr/bin/make -f -AUTOMAKE_REMOVE := Makefile Makefile.in configure aclocal.m4 -AUTOMAKE_REMOVE += src/*.lo src/*.o src/*.la src/Makefile src/Makefile.in -AUTOMAKE_REMOVE += config.status config.log config.h config.h.in config/* -AUTOMAKE_REMOVE += libtool stamp-h1 .libs src/.libs +DH_VERBOSE = 1 +%: + dh $@ -UPSTREAM_DEBIANDIR_REMOVE := debian/dirs -clean:: - -rm -Rf $(AUTOMAKE_REMOVE) - -rm -f $(UPSTREAM_DEBIANDIR_REMOVE) +override_dh_makeshlibs: + dh_makeshlibs --version-info=None -makebuilddir:: Makefile - -Makefile:: Makefile.am bootstrap - ./bootstrap - - -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/autotools.mk - -DEB_CONFIGURE_EXTRA_FLAGS = --enable-ttf - -common-install-arch:: - for file in debian/tmp/usr/lib/*.la; do \ - sed -i "/dependency_libs/ s/'.*'/''/" $$file ; \ - done +override_dh_auto_configure: + dh_auto_configure -- --enable-ttf diff --git a/debian/watch b/debian/watch deleted file mode 100644 index 615da81..0000000 --- a/debian/watch +++ /dev/null @@ -1,7 +0,0 @@ -# See uscan(1) for format - -# Compulsory line, this is a version 3 file -version=3 - -http://sf.net/g15tools libg15render-(.*)\.tar\.bz2 -