[SCM] libutempter library packaging branch, master, updated. debian/1.1.6-1-7-g802a61c
Maximiliano Curia
maxy at moszumanska.debian.org
Tue Feb 9 10:54:12 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/krap/libutempter.git;a=commitdiff;h=c6b7fc5
The following commit has been merged in the master branch:
commit c6b7fc5e4e38954c9cb3196a4b2ac53cb1111b33
Author: Matthias Klose <doko at debian.org>
Date: Tue Feb 9 11:28:17 2016 +0100
Import of xenial version 1.1.6-1ubuntu1
* Multiarchify the library packages.
---
debian/changelog | 6 ++++++
debian/control | 3 +++
debian/libutempter-dev.install | 4 ++--
debian/libutempter0.install | 4 ++--
debian/patches/multiarch-location.diff | 15 +++++++++++++++
debian/patches/series | 1 +
debian/rules | 4 ++--
7 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index dc13750..66ce2bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libutempter (1.1.6-1ubuntu1) xenial; urgency=medium
+
+ * Multiarchify the library packages.
+
+ -- Matthias Klose <doko at ubuntu.com> Thu, 28 Jan 2016 03:34:45 +0100
+
libutempter (1.1.6-1) unstable; urgency=medium
* Team upload.
diff --git a/debian/control b/debian/control
index e7e96df..1518c9a 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-kde/krap/libutempter.git/
Package: libutempter-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
Depends: libutempter0 (= ${binary:Version}), ${misc:Depends}
Description: privileged helper for utmp/wtmp updates (development)
The libutempter library provides interface for terminal emulators such as
@@ -22,6 +23,8 @@ Description: privileged helper for utmp/wtmp updates (development)
Package: libutempter0
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: privileged helper for utmp/wtmp updates (runtime)
The libutempter library provides interface for terminal emulators such as
diff --git a/debian/libutempter-dev.install b/debian/libutempter-dev.install
index 0993bfe..4d52bff 100644
--- a/debian/libutempter-dev.install
+++ b/debian/libutempter-dev.install
@@ -1,4 +1,4 @@
usr/include/utempter.h
-usr/lib/libutempter.a
-usr/lib/libutempter.so
+usr/lib/*/libutempter.a
+usr/lib/*/libutempter.so
usr/share/man/man3/
diff --git a/debian/libutempter0.install b/debian/libutempter0.install
index 6d0fffc..65b5696 100644
--- a/debian/libutempter0.install
+++ b/debian/libutempter0.install
@@ -1,2 +1,2 @@
-usr/lib/libutempter.so.*
-usr/lib/utempter/utempter
+usr/lib/*/libutempter.so.*
+usr/lib/*/utempter/utempter
diff --git a/debian/patches/multiarch-location.diff b/debian/patches/multiarch-location.diff
new file mode 100644
index 0000000..cc6e93e
--- /dev/null
+++ b/debian/patches/multiarch-location.diff
@@ -0,0 +1,15 @@
+Index: b/Makefile
+===================================================================
+--- a/Makefile
++++ b/Makefile
+@@ -30,8 +30,8 @@ MAP = lib$(PROJECT).map
+ TARGETS = $(PROJECT) $(SHAREDLIB) $(STATICLIB)
+
+ INSTALL = install
+-libdir = /usr/lib
+-libexecdir = /usr/lib
++libdir = /usr/lib/$(DEB_HOST_MULTIARCH)
++libexecdir = /usr/lib/$(DEB_HOST_MULTIARCH)
+ includedir = /usr/include
+ mandir = /usr/share/man
+ man3dir = $(mandir)/man3
diff --git a/debian/patches/series b/debian/patches/series
index f2e16b3..1d11c9c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
keep_env_build_flags.diff
filter_pie_shared_lib.diff
+multiarch-location.diff
diff --git a/debian/rules b/debian/rules
index f5b625e..18418bd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+pie,+bindnow
override_dh_fixperms:
dh_fixperms
- chown root:utmp debian/libutempter0/usr/lib/utempter/utempter
- chmod 2755 debian/libutempter0/usr/lib/utempter/utempter
+ chown root:utmp debian/libutempter0/usr/lib/$(DEB_HOST_MULTIARCH)/utempter/utempter
+ chmod 2755 debian/libutempter0/usr/lib/$(DEB_HOST_MULTIARCH)/utempter/utempter
.PHONY: override_dh_auto_test
--
libutempter library packaging
More information about the pkg-kde-commits
mailing list