Package: isdnutils
Version: 1:3.9.20060704+dfsg.2-12
Severity: normal
Tags: patch
Hello!
This patch provides Multi-Arch support, and removes the unused .la files.
Both are to further the respective release goals.
Thanks,
-Kees
--
Kees Cook @debian.org
diff -Nru isdnutils-3.9.20060704+dfsg.2/debian/changelog
isdnutils-3.9.20060704+dfsg.2/debian/changelog
--- isdnutils-3.9.20060704+dfsg.2/debian/changelog 2011-11-28
23:28:12.000000000 -0800
+++ isdnutils-3.9.20060704+dfsg.2/debian/changelog 2011-12-08
13:38:43.000000000 -0800
@@ -1,3 +1,12 @@
+isdnutils (1:3.9.20060704+dfsg.2-13) UNRELEASED; urgency=low
+
+ * debian/{compat,rules,*.install,*.links,*.dirs}: Convert to Multi-arch.
+ * debian/patches/{config_libdir,toplevel-make}.patch: add CONFIG_LIBDIR
+ override to upstream build system to support Multi-arch.
+ * debian/libcapi20-dev.install: Remove .la files (no builds use them).
+
+ -- Kees Cook <[email protected]> Thu, 08 Dec 2011 12:18:23 -0800
+
isdnutils (1:3.9.20060704+dfsg.2-12) unstable; urgency=low
* debian/libcapi20-3.links: link *.so to *.so.0.0.0 (Closes: #650156)
diff -Nru isdnutils-3.9.20060704+dfsg.2/debian/compat
isdnutils-3.9.20060704+dfsg.2/debian/compat
--- isdnutils-3.9.20060704+dfsg.2/debian/compat 2011-10-10 02:16:45.000000000
-0700
+++ isdnutils-3.9.20060704+dfsg.2/debian/compat 2011-12-08 12:18:18.000000000
-0800
@@ -1 +1 @@
-7
+9
diff -Nru isdnutils-3.9.20060704+dfsg.2/debian/control
isdnutils-3.9.20060704+dfsg.2/debian/control
--- isdnutils-3.9.20060704+dfsg.2/debian/control 2011-11-27
09:32:38.000000000 -0800
+++ isdnutils-3.9.20060704+dfsg.2/debian/control 2011-12-08
13:19:50.000000000 -0800
@@ -5,7 +5,7 @@
Uploaders: Jan-Michael Brummer <[email protected]>
DM-Upload-Allowed: yes
Standards-Version: 3.9.2
-Build-Depends: debhelper (>= 7.0.50~), bzip2, libncurses5-dev | libncurses-dev,
+Build-Depends: debhelper (>= 8.9.12~), bzip2, libncurses5-dev | libncurses-dev,
xutils-dev | imake, tcl-dev, linuxdoc-tools (>=0.9.20), groff, libtool,
libxaw7-dev, libreadline-dev, libpcap0.8-dev, autotools-dev,
automake1.7, automake1.9, autoconf2.13, autoconf, libssl-dev, psutils,
@@ -128,7 +128,9 @@
Package: libcapi20-3
Architecture: linux-any
+Multi-Arch: same
Section: libs
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Suggests: isdnutils-doc
Description: ISDN utilities - CAPI support libraries
@@ -141,6 +143,7 @@
Package: libcapi20-dev
Architecture: linux-any
+Multi-Arch: same
Section: libdevel
Depends: libcapi20-3 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Suggests: isdnutils-doc
diff -Nru isdnutils-3.9.20060704+dfsg.2/debian/isdnutils-base.dirs
isdnutils-3.9.20060704+dfsg.2/debian/isdnutils-base.dirs
--- isdnutils-3.9.20060704+dfsg.2/debian/isdnutils-base.dirs 2011-10-22
19:41:13.000000000 -0700
+++ isdnutils-3.9.20060704+dfsg.2/debian/isdnutils-base.dirs 2011-12-08
13:37:39.000000000 -0800
@@ -1,7 +1,6 @@
etc/init.d
etc/isdn
usr/bin
-usr/lib/menu
usr/sbin
usr/share/doc/isdnutils-base/examples
usr/share/isdn
diff -Nru isdnutils-3.9.20060704+dfsg.2/debian/isdnutils-xtools.dirs
isdnutils-3.9.20060704+dfsg.2/debian/isdnutils-xtools.dirs
--- isdnutils-3.9.20060704+dfsg.2/debian/isdnutils-xtools.dirs 2011-11-28
22:02:38.000000000 -0800
+++ isdnutils-3.9.20060704+dfsg.2/debian/isdnutils-xtools.dirs 2011-12-08
13:37:49.000000000 -0800
@@ -1,4 +1,3 @@
etc/isdn
usr/bin
-usr/lib/menu
usr/share/doc/isdnutils-xtools
diff -Nru isdnutils-3.9.20060704+dfsg.2/debian/libcapi20-3.dirs
isdnutils-3.9.20060704+dfsg.2/debian/libcapi20-3.dirs
--- isdnutils-3.9.20060704+dfsg.2/debian/libcapi20-3.dirs 2011-10-22
19:41:13.000000000 -0700
+++ isdnutils-3.9.20060704+dfsg.2/debian/libcapi20-3.dirs 2011-12-08
12:51:15.000000000 -0800
@@ -1,2 +1 @@
usr/share/doc/libcapi20-3
-usr/lib/capi
diff -Nru isdnutils-3.9.20060704+dfsg.2/debian/libcapi20-3.install
isdnutils-3.9.20060704+dfsg.2/debian/libcapi20-3.install
--- isdnutils-3.9.20060704+dfsg.2/debian/libcapi20-3.install 2011-11-28
22:02:21.000000000 -0800
+++ isdnutils-3.9.20060704+dfsg.2/debian/libcapi20-3.install 2011-12-08
12:20:49.000000000 -0800
@@ -1,2 +1,2 @@
-usr/lib/libcapi20.so.*
-usr/lib/capi/*.so.*
+usr/lib/*/libcapi20.so.*
+usr/lib/*/capi/*.so.*
diff -Nru isdnutils-3.9.20060704+dfsg.2/debian/libcapi20-3.links
isdnutils-3.9.20060704+dfsg.2/debian/libcapi20-3.links
--- isdnutils-3.9.20060704+dfsg.2/debian/libcapi20-3.links 2011-11-27
22:45:27.000000000 -0800
+++ isdnutils-3.9.20060704+dfsg.2/debian/libcapi20-3.links 2011-12-08
13:18:23.000000000 -0800
@@ -1,3 +1,6 @@
-usr/lib/capi/lib_capi_mod_fritzbox.so.0.0.0
usr/lib/capi/lib_capi_mod_fritzbox.so
-usr/lib/capi/lib_capi_mod_rcapi.so.0.0.0 usr/lib/capi/lib_capi_mod_rcapi.so
-usr/lib/capi/lib_capi_mod_std.so.0.0.0 usr/lib/capi/lib_capi_mod_std.so
+#!/bin/sh
+sed -e "s/@DHM@/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/g" <<EOM
+usr/lib/@DHM@/capi/lib_capi_mod_fritzbox.so.0.0.0
usr/lib/@DHM@/capi/lib_capi_mod_fritzbox.so
+usr/lib/@DHM@/capi/lib_capi_mod_rcapi.so.0.0.0
usr/lib/@DHM@/capi/lib_capi_mod_rcapi.so
+usr/lib/@DHM@/capi/lib_capi_mod_std.so.0.0.0
usr/lib/@DHM@/capi/lib_capi_mod_std.so
+EOM
diff -Nru isdnutils-3.9.20060704+dfsg.2/debian/libcapi20-dev.install
isdnutils-3.9.20060704+dfsg.2/debian/libcapi20-dev.install
--- isdnutils-3.9.20060704+dfsg.2/debian/libcapi20-dev.install 2011-11-28
22:02:21.000000000 -0800
+++ isdnutils-3.9.20060704+dfsg.2/debian/libcapi20-dev.install 2011-12-08
13:26:40.000000000 -0800
@@ -1,6 +1,5 @@
usr/include/capi20.h
usr/include/capicmd.h
usr/include/capiutils.h
-usr/lib/libcapi20*.a
-usr/lib/libcapi20*.la
-usr/lib/libcapi20*.so
+usr/lib/*/libcapi20*.a
+usr/lib/*/libcapi20*.so
diff -Nru isdnutils-3.9.20060704+dfsg.2/debian/patches/config_libdir.patch
isdnutils-3.9.20060704+dfsg.2/debian/patches/config_libdir.patch
--- isdnutils-3.9.20060704+dfsg.2/debian/patches/config_libdir.patch
1969-12-31 16:00:00.000000000 -0800
+++ isdnutils-3.9.20060704+dfsg.2/debian/patches/config_libdir.patch
2011-12-08 12:42:19.000000000 -0800
@@ -0,0 +1,45 @@
+Description: add CONFIG_LIBDIR override to upstream build system.
+Author: Kees Cook <[email protected]>
+
+Index: isdnutils-3.9.20060704+dfsg.2/doc/Configure.help
+===================================================================
+--- isdnutils-3.9.20060704+dfsg.2.orig/doc/Configure.help 2011-12-08
12:38:24.511497774 -0800
++++ isdnutils-3.9.20060704+dfsg.2/doc/Configure.help 2011-12-08
12:40:22.569076580 -0800
+@@ -50,6 +50,12 @@
+ card configurationtools. All other programs are installed in
+ another directories, configurable in the previous options.
+
++Directory to install libraries
++CONFIG_LIBDIR
++ This option tells the installation process, where to put those
++ libraries which are usable for the entire system. This is usually
++ /usr/lib or /usr/lib/$arch_triplet.
++
+ Directory to install man pages
+ CONFIG_MANDIR
+ This option tells the installation process, where to put the
+Index: isdnutils-3.9.20060704+dfsg.2/scripts/defconfig
+===================================================================
+--- isdnutils-3.9.20060704+dfsg.2.orig/scripts/defconfig 2011-12-08
12:38:24.527497988 -0800
++++ isdnutils-3.9.20060704+dfsg.2/scripts/defconfig 2011-12-08
12:40:22.569076580 -0800
+@@ -15,6 +15,7 @@
+ CONFIG_BINDIR='/usr/bin'
+ CONFIG_SBINDIR='/sbin'
+ CONFIG_CARD_SBINDIR='/sbin'
++CONFIG_LIBDIR='/usr/lib'
+ CONFIG_MANDIR='/usr/man'
+ CONFIG_FIRMWAREDIR='/usr/lib/isdn'
+ CONFIG_RUNDIR='/var/run'
+Index: isdnutils-3.9.20060704+dfsg.2/Makefile
+===================================================================
+--- isdnutils-3.9.20060704+dfsg.2.orig/Makefile 2011-12-08
12:40:56.049524446 -0800
++++ isdnutils-3.9.20060704+dfsg.2/Makefile 2011-12-08 12:41:10.477717469
-0800
+@@ -202,7 +202,7 @@
+ @set -e; for i in `echo $(BUILD_ONLY) $(SUBDIRS)`; do \
+ if [ -x $$i/configure ] ; then \
+ /bin/echo -e "\nRunning configure in $$i ...\n"; sleep
1; \
+- (cd $$i; ./configure --sbindir=$(CONFIG_SBINDIR)
--bindir=$(CONFIG_BINDIR) --mandir=$(CONFIG_MANDIR) --datadir=$(CONFIG_DATADIR)
|| $(MAKE) -C ../ ERRDIR=$$i cfgerror); \
++ (cd $$i; ./configure --sbindir=$(CONFIG_SBINDIR)
--bindir=$(CONFIG_BINDIR) --libdir=$(CONFIG_LIBDIR) --mandir=$(CONFIG_MANDIR)
--datadir=$(CONFIG_DATADIR) || $(MAKE) -C ../ ERRDIR=$$i cfgerror); \
+ elif [ -f $$i/Makefile.in ] ; then \
+ /bin/echo -e "\nRunning make -f Makefile.in config in
$$i ...\n"; sleep 1; \
+ $(MAKE) -C $$i -f Makefile.in config; \
diff -Nru isdnutils-3.9.20060704+dfsg.2/debian/patches/series
isdnutils-3.9.20060704+dfsg.2/debian/patches/series
--- isdnutils-3.9.20060704+dfsg.2/debian/patches/series 2011-11-29
00:34:05.000000000 -0800
+++ isdnutils-3.9.20060704+dfsg.2/debian/patches/series 2011-12-08
12:40:20.000000000 -0800
@@ -1,3 +1,4 @@
+config_libdir.patch
deb-build.patch
hisax-firmware.patch
ppdcapiplugin-dialmax.patch
diff -Nru isdnutils-3.9.20060704+dfsg.2/debian/patches/toplevel-make.patch
isdnutils-3.9.20060704+dfsg.2/debian/patches/toplevel-make.patch
--- isdnutils-3.9.20060704+dfsg.2/debian/patches/toplevel-make.patch
2011-10-07 08:48:46.000000000 -0700
+++ isdnutils-3.9.20060704+dfsg.2/debian/patches/toplevel-make.patch
2011-12-08 12:41:33.000000000 -0800
@@ -7,11 +7,11 @@
- if [ -x $$i/configure ] ; then \
+ if [ $$i = eicon ]; then \
/bin/echo -e "\nRunning configure in $$i ...\n"; sleep
1; \
-- (cd $$i; ./configure --sbindir=$(CONFIG_SBINDIR)
--bindir=$(CONFIG_BINDIR) --mandir=$(CONFIG_MANDIR) --datadir=$(CONFIG_DATADIR)
|| $(MAKE) -C ../ ERRDIR=$$i cfgerror); \
+- (cd $$i; ./configure --sbindir=$(CONFIG_SBINDIR)
--bindir=$(CONFIG_BINDIR) --libdir=$(CONFIG_LIBDIR) --mandir=$(CONFIG_MANDIR)
--datadir=$(CONFIG_DATADIR) || $(MAKE) -C ../ ERRDIR=$$i cfgerror); \
+ (cd $$i; echo ./configure --with-sbin=$(CONFIG_SBINDIR)
--bindir=$(CONFIG_BINDIR) --with-man=$(CONFIG_MANDIR)
--with-firmware=$(CONFIG_DATADIR); CONFIG_CARD_SBINDIR=$(CONFIG_SBINDIR)
./configure --with-sbin=$(CONFIG_SBINDIR) --bindir=$(CONFIG_BINDIR)
--with-man=$(CONFIG_MANDIR) --with-firmware=$(CONFIG_DATADIR) || $(MAKE) -C ../
ERRDIR=$$i cfgerror); \
+ elif [ -x $$i/configure ] ; then \
+ /bin/echo -e "\nRunning configure in $$i ...\n"; sleep
1; \
-+ (cd $$i; echo ./configure --sbindir=$(CONFIG_SBINDIR)
--bindir=$(CONFIG_BINDIR) --mandir=$(CONFIG_MANDIR)
--datadir=$(CONFIG_DATADIR); ./configure --sbindir=$(CONFIG_SBINDIR)
--bindir=$(CONFIG_BINDIR) --mandir=$(CONFIG_MANDIR) --datadir=$(CONFIG_DATADIR)
|| $(MAKE) -C ../ ERRDIR=$$i cfgerror); \
++ (cd $$i; echo ./configure --sbindir=$(CONFIG_SBINDIR)
--bindir=$(CONFIG_BINDIR) --libdir=$(CONFIG_LIBDIR) --mandir=$(CONFIG_MANDIR)
--datadir=$(CONFIG_DATADIR); ./configure --sbindir=$(CONFIG_SBINDIR)
--bindir=$(CONFIG_BINDIR) --libdir=$(CONFIG_LIBDIR) --mandir=$(CONFIG_MANDIR)
--datadir=$(CONFIG_DATADIR) || $(MAKE) -C ../ ERRDIR=$$i cfgerror); \
elif [ -f $$i/Makefile.in ] ; then \
/bin/echo -e "\nRunning make -f Makefile.in config in
$$i ...\n"; sleep 1; \
$(MAKE) -C $$i -f Makefile.in config; \
diff -Nru isdnutils-3.9.20060704+dfsg.2/debian/pppdcapiplugin.dirs
isdnutils-3.9.20060704+dfsg.2/debian/pppdcapiplugin.dirs
--- isdnutils-3.9.20060704+dfsg.2/debian/pppdcapiplugin.dirs 2011-10-22
19:41:13.000000000 -0700
+++ isdnutils-3.9.20060704+dfsg.2/debian/pppdcapiplugin.dirs 2011-12-08
13:38:20.000000000 -0800
@@ -1,4 +1,3 @@
etc/ppp/peers/isdn
-usr/lib/pppd
usr/share/doc/pppdcapiplugin/examples
usr/share/man/man8
diff -Nru isdnutils-3.9.20060704+dfsg.2/debian/rules
isdnutils-3.9.20060704+dfsg.2/debian/rules
--- isdnutils-3.9.20060704+dfsg.2/debian/rules 2011-11-29 01:13:46.000000000
-0800
+++ isdnutils-3.9.20060704+dfsg.2/debian/rules 2011-12-08 12:44:04.000000000
-0800
@@ -13,6 +13,7 @@
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
some_arch_match := no
ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),hurd sh))
@@ -126,7 +127,7 @@
# : # ugh
# touch eurofile/configure
- $(MAKE) subconfig
+ CONFIG_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) $(MAKE) subconfig
$(MAKE)
@@ -176,7 +177,7 @@
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
# empty dependency_libs field in *.la files
- sed -i "/dependency_libs/ s/'.*'/''/"
"$(CURDIR)/debian/tmp/usr/lib/libcapi20.la"
+ sed -i "/dependency_libs/ s/'.*'/''/"
"$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libcapi20.la"
cp -p isdnlog/holiday-??.dat debian/tmp/usr/share/isdn/
@@ -265,7 +266,7 @@
dh_compress
dh_fixperms
dh_installdeb
- dh_shlibdeps -L libcapi20-3 -l debian/libcapi20-3/usr/lib
+ dh_shlibdeps -L libcapi20-3 -l
debian/libcapi20-3/usr/lib/$(DEB_HOST_MULTIARCH)
# there's already a versioned depends in the control file for
libcapi20-3
perl -i -pe 's/, libcapi20-3//' debian/capiutils.substvars
dh_gencontrol
