diff options
author | Daniel Glassey <wdg@debian.org> | 2018-10-22 11:20:38 +0700 |
---|---|---|
committer | glasseyes <dglassey@gmail.com> | 2018-10-23 21:40:00 +0700 |
commit | b09b7f875e948886e9e77a8d0b5d3abfa4ae04e4 (patch) | |
tree | 0e02625cfc5676aef0a260aff0eee9ea26e6e829 | |
parent | 9cc65e4e85490aa1eac40306f7fdebfb8c755eb4 (diff) |
Import Debian changes 10.99.33-2
kmflcomp (10.99.33-2) unstable; urgency=medium
* d/compat 11
* change from cdbs to dh
-rw-r--r-- | debian/changelog | 7 | ||||
-rw-r--r-- | debian/compat | 2 | ||||
-rw-r--r-- | debian/control | 4 | ||||
-rw-r--r-- | debian/libkmflcomp-dev.install | 5 | ||||
-rw-r--r-- | debian/libkmflcomp0.install | 2 | ||||
-rw-r--r-- | debian/libkmflcomp0.symbols | 1 | ||||
-rwxr-xr-x | debian/rules | 16 |
7 files changed, 17 insertions, 20 deletions
diff --git a/debian/changelog b/debian/changelog index 3ec7c08..3a61b62 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +kmflcomp (10.99.33-2) unstable; urgency=medium + + * d/compat 11 + * change from cdbs to dh + + -- Daniel Glassey <wdg@debian.org> Mon, 22 Oct 2018 11:20:38 +0700 + kmflcomp (10.99.33-1) unstable; urgency=medium * transition not required so uploading to unstable diff --git a/debian/compat b/debian/compat index ec63514..b4de394 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +11 diff --git a/debian/control b/debian/control index 0e110e2..5938c0c 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,8 @@ Priority: optional Section: utils Maintainer: Daniel Glassey <wdg@debian.org> Homepage: http://www.keyman.com -Build-Depends: cdbs (>= 0.4.27), debhelper (>= 9), libx11-dev, dh-autoreconf -Standards-Version: 3.9.8.0 +Build-Depends: debhelper (>= 11), libx11-dev +Standards-Version: 4.2.1 Package: libkmflcomp-dev Section: libdevel diff --git a/debian/libkmflcomp-dev.install b/debian/libkmflcomp-dev.install index 27620f9..cead934 100644 --- a/debian/libkmflcomp-dev.install +++ b/debian/libkmflcomp-dev.install @@ -1,4 +1,3 @@ usr/include/kmfl/* -usr/lib/lib*.a -usr/lib/lib*.so -usr/lib/*.la +usr/lib/*/lib*.a +usr/lib/*/lib*.so diff --git a/debian/libkmflcomp0.install b/debian/libkmflcomp0.install index d0dbfd1..3ddde58 100644 --- a/debian/libkmflcomp0.install +++ b/debian/libkmflcomp0.install @@ -1 +1 @@ -usr/lib/lib*.so.* +usr/lib/*/lib*.so.* diff --git a/debian/libkmflcomp0.symbols b/debian/libkmflcomp0.symbols index f9dafbc..42de4f9 100644 --- a/debian/libkmflcomp0.symbols +++ b/debian/libkmflcomp0.symbols @@ -1,4 +1,5 @@ libkmflcomp.so.0 libkmflcomp0 #MINVER# +* Build-Depends-Package: libkmflcomp-dev IConvertUTF16toUTF32@Base 0.9.10 IConvertUTF16toUTF8@Base 0.9.10 IConvertUTF32toUTF16@Base 0.9.10 diff --git a/debian/rules b/debian/rules index 6c33a8e..b3e5de1 100755 --- a/debian/rules +++ b/debian/rules @@ -1,17 +1,7 @@ #!/usr/bin/make -f # -*- mode: makefile; coding: utf-8 -*- -# Copyright © 2005 Doug Rintoul <doug_rintoul@sil.org> -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/autotools.mk -include /usr/share/cdbs/1/rules/autoreconf.mk - -DPKG_EXPORT_BUILDFLAGS = 1 -include /usr/share/dpkg/buildflags.mk - -DEB_SHLIBDEPS_INCLUDE := debian/libkmflcomp/usr/lib/ -DEB_DH_INSTALL_SOURCEDIR := debian/tmp - -install/libkmflcomp-dev:: - sed -i "/dependency_libs/ s/'.*'/''/" `find debian/ -name '*.la'` +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +%: + dh $@ --with autoreconf |