Package: popt Version: 1.16-1 Followup-For: Bug #638447 User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu precise ubuntu-patch
Hi Paul, I've applied a modified version of this patch to Ubuntu. (As long as we're changing the .install files, we might as well modernize them all the way, I think.) Please find my updated patch attached. It may also be of interest that in Ubuntu I've changed the build-dependency on gettext to 'gettext:any', as required for in-archive cross-compilation support (https://wiki.ubuntu.com/MultiarchCross). I don't believe this syntax is supported yet on the Debian autobuilders however. Cheers, -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. Ubuntu Developer http://www.debian.org/ slanga...@ubuntu.com vor...@debian.org
=== modified file 'debian/control' --- debian/control 2010-05-13 05:14:50 +0000 +++ debian/control 2011-11-08 23:26:56 +0000 @@ -2,7 +2,7 @@ Section: devel Priority: optional Maintainer: Paul Martin <p...@debian.org> -Build-Depends: debhelper (>> 7), gettext, quilt +Build-Depends: debhelper (>= 8.1.3~), gettext, quilt Homepage: http://rpm5.org/ Standards-Version: 3.8.4 @@ -11,6 +11,8 @@ Section: libs Priority: important Depends: ${shlibs:Depends}, ${misc:Depends} +Pre-Depends: ${misc:Pre-Depends} +Multi-Arch: same Conflicts: popt, libpopt-dev (<= 1.4-1), rpm (<= 4.0.2-3) Replaces: popt Description: lib for parsing cmdline parameters @@ -28,6 +30,7 @@ Section: libdevel Priority: optional Depends: libc6-dev | libc-dev, libpopt0 (= ${binary:Version}), ${misc:Depends} +Multi-Arch: same Conflicts: popt Replaces: popt Description: lib for parsing cmdline parameters - development files === modified file 'debian/libpopt-dev.install' --- debian/libpopt-dev.install 2006-06-06 18:28:41 +0000 +++ debian/libpopt-dev.install 2011-11-08 23:20:50 +0000 @@ -1,5 +1,5 @@ -debian/tmp/usr/lib*/libpopt.so usr/lib -debian/tmp/usr/lib*/libpopt.la usr/lib -debian/tmp/usr/lib*/libpopt.a usr/lib -debian/tmp/usr/share/man/man3/popt.3 usr/share/man/man3 -debian/tmp/usr/include/popt.h usr/include +usr/lib/*/libpopt.so +usr/lib/*/libpopt.la +usr/lib/*/libpopt.a +usr/share/man/man3/popt.3 +usr/include/popt.h === removed file 'debian/libpopt-dev.links' --- debian/libpopt-dev.links 2003-11-20 19:50:10 +0000 +++ debian/libpopt-dev.links 1970-01-01 00:00:00 +0000 @@ -1 +0,0 @@ -lib/libpopt.so.0 usr/lib/libpopt.so === added file 'debian/libpopt-dev.links.in' --- debian/libpopt-dev.links.in 1970-01-01 00:00:00 +0000 +++ debian/libpopt-dev.links.in 2011-11-08 23:19:53 +0000 @@ -0,0 +1 @@ +lib/DEB_HOST_MULTIARCH/libpopt.so.0 usr/lib/DEB_HOST_MULTIARCH/libpopt.so === removed file 'debian/libpopt0.install' --- debian/libpopt0.install 2008-06-10 14:37:05 +0000 +++ debian/libpopt0.install 1970-01-01 00:00:00 +0000 @@ -1,2 +0,0 @@ -debian/tmp/usr/lib*/libpopt.so.* lib -debian/tmp/usr/share/locale/*/LC_MESSAGES/popt.mo === added file 'debian/libpopt0.install.in' --- debian/libpopt0.install.in 1970-01-01 00:00:00 +0000 +++ debian/libpopt0.install.in 2011-11-08 23:20:19 +0000 @@ -0,0 +1,2 @@ +usr/lib/DEB_HOST_MULTIARCH/libpopt.so.* lib/DEB_HOST_MULTIARCH +usr/share/locale/*/LC_MESSAGES/popt.mo === removed file 'debian/libpopt0.links' --- debian/libpopt0.links 2003-11-20 19:50:10 +0000 +++ debian/libpopt0.links 1970-01-01 00:00:00 +0000 @@ -1 +0,0 @@ -lib/libpopt.so.0.0.0 lib/libpopt.so.0 === added file 'debian/libpopt0.links.in' --- debian/libpopt0.links.in 1970-01-01 00:00:00 +0000 +++ debian/libpopt0.links.in 2011-11-08 23:19:53 +0000 @@ -0,0 +1 @@ +lib/DEB_HOST_MULTIARCH/libpopt.so.0.0.0 lib/DEB_HOST_MULTIARCH/libpopt.so.0 === added file 'debian/preprocess' --- debian/preprocess 1970-01-01 00:00:00 +0000 +++ debian/preprocess 2011-11-08 23:19:53 +0000 @@ -0,0 +1,9 @@ +#!/bin/sh + +DEB_HOST_MULTIARCH=`dpkg-architecture -qDEB_HOST_MULTIARCH` + +for file in debian/*.in; +do + target=`echo $file|sed -e 's/...$//'` + sed -e s/DEB_HOST_MULTIARCH/$DEB_HOST_MULTIARCH/g $file > $target +done === modified file 'debian/rules' --- debian/rules 2010-05-13 05:14:50 +0000 +++ debian/rules 2011-11-08 23:19:53 +0000 @@ -7,6 +7,8 @@ DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) else @@ -50,7 +52,7 @@ mkdir $(objdir) # Add here commands to configure the package. cd $(objdir) && \ - ../configure --prefix=/usr --mandir=/usr/share/man --enable-shared $(CROSS) + ../configure --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) --prefix=/usr --mandir=/usr/share/man --enable-shared $(CROSS) touch $@ configure-udeb-stamp: @@ -124,6 +126,7 @@ dh_testdir dh_testroot + sh debian/preprocess dh_install --list-missing # dh_installdebconf dh_installdocs
