diff -Nru d-shlibs-0.41/d-devlibdeps d-shlibs-0.44ubuntu1/d-devlibdeps --- d-shlibs-0.41/d-devlibdeps 2009-09-29 10:23:18.000000000 -0400 +++ d-shlibs-0.44ubuntu1/d-devlibdeps 2010-05-12 03:25:33.000000000 -0400 @@ -42,73 +42,76 @@ function overridedevlibdeps () { # overrides necessary until the scheme is adopted. sed \ - -e 's/libX11-6-dev/libx11-dev | xlibs-dev (<< 4.3.0)/' \ - -e 's/libXext6-dev/libxext-dev | xlibs-dev (<< 4.3.0)/' \ - -e 's/libXi6-dev/libxi-dev | xlibs-dev (<< 4.3.0)/' \ - -e 's/libXpm4-dev/libxpm-dev | xlibs-dev (<< 4.3.0)/' \ - -e 's/libICE6-dev/libice-dev | xlibs-dev (<< 4.3.0)/' \ - -e 's/libSM6-dev/libsm-dev | xlibs-dev (<< 4.3.0)/' \ - -e 's/libGL1-dev/xlibmesa-gl-dev | xlibs-dev (<< 4.3.0)/' \ - -e 's/libGLU1-dev/xlibmesa-glu-dev | xlibs-dev (<< 4.3.0)/' \ - -e 's/libcrypt1-dev//' \ + "${OVERRIDE[@]/#/-e}" \ + -e 's/ld-linux3-dev-dev//' \ + -e 's/libatk-1\.0-0-dev/libatk1.0-dev/' \ + -e 's/libcomerr2//' \ + -e 's/libcom_err2-dev/comerr-dev/' \ + -e 's/libcrack2-dev/cracklib2-dev/' \ -e 's/libcrypt1\.1-dev//' \ + -e 's/libcrypt1-dev//' \ + -e 's/libcrypto.*-dev/libssl-dev/' \ + -e 's/libdl2\.1-dev//' \ -e 's/libdl2-dev//' \ - -e 's/libdl2.1-dev//' \ - -e 's/libm6-dev//' \ - -e 's/libm6.1-dev//' \ + -e 's/libgcc_s.*-dev//' \ + -e 's/libgd2-dev/libgd-dev/' \ + -e 's/libgdk-1\.2-0-dev/libgtk1.2-dev/' \ + -e 's/libgdk_pixbuf-2\.0-0-dev/libgtk2.0-dev/' \ + -e 's/libgdk-x11-2\.0-0-dev/libgtk2.0-dev/' \ + -e 's/libgio-2\.0-0-dev/libglib2.0-dev/' \ + -e 's/libGL1-dev/xlibmesa-gl-dev | xlibs-dev (<< 4.3.0)/' \ + -e 's/libglib-1\.2-0-dev/libglib1.2-dev/' \ + -e 's/libglib-2\.0-0-dev/libglib2.0-dev/' \ + -e 's/libGLU1-dev/xlibmesa-glu-dev | xlibs-dev (<< 4.3.0)/' \ + -e 's/libgmodule-1\.2-0-dev/libglib1.2-dev/' \ + -e 's/libgmodule-2\.0-0-dev/libglib2.0-dev/' \ + -e 's/libgobject-2\.0-0-dev/libglib2.0-dev/' \ + -e 's/libgssapi_krb5-2-dev/libkrb5-dev/' \ + -e 's/libgthread-1\.2-0-dev/libglib1.2-dev/' \ + -e 's/libgthread-2\.0-0-dev/libglib2.0-dev/' \ + -e 's/libgtk-1\.2-0-dev/libgtk1.2-dev/' \ + -e 's/libgtk-x11-2\.0-0-dev/libgtk2.0-dev/' \ + -e 's/libICE6-dev/libice-dev | xlibs-dev (<< 4.3.0)/' \ + -e 's/libk5crypto3-dev/libkrb5-dev/' \ + -e 's/libkrb1-dev/kerberos4kth-dev/' \ + -e 's/libkrb5-3-dev/libkrb5-dev/' \ -e 's/libm1-dev//' \ - -e 's/libnsl1-dev//' \ + -e 's/libm6\.1-dev//' \ + -e 's/libm6-dev//' \ -e 's/libnsl1\.1-dev//' \ - -e 's/libpthread0-dev//' \ - -e 's/libpthread-stubs0-dev//' \ + -e 's/libnsl1-dev//' \ + -e 's/libogg0-dev/libogg-dev/' \ + -e 's/libpam0-dev/libpam0g-dev/' \ + -e 's/libpango-1\.0-0-dev/libpango1.0-dev/' \ + -e 's/libpangocairo-1\.0-0-dev/libpango1.0-dev/' \ + -e 's/libpangoft2-1\.0-0-dev/libpango1.0-dev/' \ + -e 's/libpangox-1\.0-0-dev/libpango1.0-dev/' \ + -e 's/libpangoxft-1\.0-0-dev/libpango1.0-dev/' \ + -e 's/libparted-1\.6-0-dev/libparted1.6-dev/' \ -e 's/libpthread0\.3-dev//' \ + -e 's/libpthread0-dev//' \ -e 's/libpthread.*-dev/libpthread-dev/' \ + -e 's/libpthread-stubs0-dev//' \ -e 's/libresolv2-dev//' \ - -e 's/libglib-1.2-0-dev/libglib1.2-dev/' \ - -e 's/libgthread-1.2-0-dev/libglib1.2-dev/' \ - -e 's/libgmodule-1.2-0-dev/libglib1.2-dev/' \ - -e 's/libgtk-1.2-0-dev/libgtk1.2-dev/' \ - -e 's/libpam0-dev/libpam0g-dev/' \ - -e 's/libgdk-1.2-0-dev/libgtk1.2-dev/' \ - -e 's/libz1-dev/zlib1g-dev/' \ - -e 's/libgcc_s.*-dev//' \ - -e 's/libcrypto.*-dev/libssl-dev/' \ + -e 's/librt1-dev//' \ + -e 's/libSDL-1\.2-0-dev/libsdl1.2-dev/' \ + -e 's/libSM6-dev/libsm-dev | xlibs-dev (<< 4.3.0)/' \ + -e 's/libspeex1-dev/libspeex-dev/' \ -e 's/libssl.*-dev/libssl-dev/' \ - -e 's/libcomerr2//' \ - -e 's/libcom_err2-dev/comerr-dev/' \ - -e 's/libgssapi_krb5-2-dev/libkrb5-dev/' \ - -e 's/libk5crypto3-dev/libkrb5-dev/' \ - -e 's/libkrb5-3-dev/libkrb5-dev/' \ - -e 's/libparted-1.6-0-dev/libparted1.6-dev/' \ - -e 's/libSDL-1.2-0-dev/libsdl1.2-dev/' \ - -e 's/libvorbis0-dev/libvorbis-dev/' \ - -e 's/libcrack2-dev/cracklib2-dev/' \ - -e 's/libkrb1-dev/kerberos4kth-dev/' \ + -e 's/libstdc++6-dev//' \ -e 's/libtheora0-dev/libtheora-dev/' \ + -e 's/libvorbis0-dev/libvorbis-dev/' \ -e 's/libvorbisenc2-dev/libvorbis-dev/' \ - -e 's/libogg0-dev/libogg-dev/' \ - -e 's/librt1-dev//' \ - -e 's/libspeex1-dev/libspeex-dev/' \ -e 's/libX\(.*\)[0-9]-dev/libx\1-dev/' \ - -e 's/libgdk-x11-2.0-0-dev/libgtk2.0-dev/' \ - -e 's/libgdk-x11-2.0-0-dev/libgtk2.0-dev/' \ - -e 's/libgtk-x11-2.0-0-dev/libgtk2.0-dev/' \ - -e 's/libgdk_pixbuf-2.0-0-dev/libgtk2.0-dev/' \ - -e 's/libgd2-dev/libgd-dev/' \ - -e 's/libgmodule-2.0-0-dev/libglib2.0-dev/' \ - -e 's/libgobject-2.0-0-dev/libglib2.0-dev/' \ - -e 's/libglib-2.0-0-dev/libglib2.0-dev/' \ - -e 's/libgio-2.0-0-dev/libglib2.0-dev/' \ - -e 's/libpango-1.0-0-dev/libpango1.0-dev/' \ - -e 's/libpangocairo-1.0-0-dev/libpango1.0-dev/' \ - -e 's/libpangoxft-1.0-0-dev/libpango1.0-dev/' \ - -e 's/libpangoft2-1.0-0-dev/libpango1.0-dev/' \ - -e 's/libpangox-1.0-0-dev/libpango1.0-dev/' \ - -e 's/libatk-1.0-0-dev/libatk1.0-dev/' \ + -e 's/libX11-6-dev/libx11-dev | xlibs-dev (<< 4.3.0)/' \ + -e 's/libXext6-dev/libxext-dev | xlibs-dev (<< 4.3.0)/' \ + -e 's/libXi6-dev/libxi-dev | xlibs-dev (<< 4.3.0)/' \ -e 's/libxml2-2-dev/libxml2-dev/' \ -e 's/libgthread-2.0-0-dev/libglib2.0-dev/' \ -e 's/libstdc++6-dev/libstdc++6-4.1-dev/' \ - -e 's/ld-linux3-dev-dev//' \ + -e 's/ld-linux3-dev//' \ + -e 's/libXpm4-dev/libxpm-dev | xlibs-dev (<< 4.3.0)/' \ + -e 's/libz1-dev/zlib1g-dev/' \ "${OVERRIDE[@]/#/-e}" \ diff -Nru d-shlibs-0.41/debian/changelog d-shlibs-0.44ubuntu1/debian/changelog --- d-shlibs-0.41/debian/changelog 2009-09-29 10:26:36.000000000 -0400 +++ d-shlibs-0.44ubuntu1/debian/changelog 2010-05-12 03:33:00.000000000 -0400 @@ -1,3 +1,56 @@ +d-shlibs (0.44ubuntu1) maverick; urgency=low + + * Merge from debian unstable. Remaining changes: + - Correct a typo on the glibc-2.10 armel dynamic loader so d-devlibdeps + works on armel properly (LP: #504365) + * Fix debian/rules to have a valid DESTDIR so it doesn't try to install to / + + -- Michael Casadevall Wed, 12 May 2010 03:25:55 -0400 + +d-shlibs (0.44) unstable; urgency=low + + * Apply overrides before hardcoded quirks (in addition to afterwards + for backwards compatibility). + Thanks to Nobuhiro Iwamatsu (see bug#374049). + * Fix libstdc++6-dev quirk: Silence (not expand). Default is build- + essential, and non-default variants are pulled in by related g++-*. + Closes: bug#374049, thanks especially to Junichi. + * Sort quirks, strip duplicate gdk-x11-2.0-0-dev, and escape dots. + * Use dpkg source format 3.0 (native). + + -- Jonas Smedegaard Sun, 25 Apr 2010 17:20:39 +0200 + +d-shlibs (0.43) unstable; urgency=low + + * Implement option --devunversioned. Closes: bug#530368. + * Implement option --ignorelibdep. Closes: bug#530367. + * Support control file fields spanning multiple lines. Closes: + bug#573396. + * Maintained using Git: Add Vcs-* stanzas. + * Repackage using CDBS. Build-depend on cdbs. + * Set debhelper compat level to 6. Build-depend tightened to that + version. + * Stop depending on debianutils or apt: essential and required version + of debianutils satisfied in oldstable. + * Bump Standards-Version to 3.8.4. + * Rewrite copyright file to draft DEP5 rev. 135. + + -- Jonas Smedegaard Thu, 11 Mar 2010 05:46:08 +0100 + +d-shlibs (0.42) unstable; urgency=low + + * Friendly takeover. Closes: bug#566358, thanks for inventing this + cool little tool, Junichi! + + -- Jonas Smedegaard Thu, 11 Mar 2010 04:43:38 +0100 + +d-shlibs (0.41ubuntu1) lucid; urgency=low + + * Correct a typo on the glibc-2.10 armel dynamic loader so d-devlibdeps + works on armel properly (LP: #504365) + + -- Michael Casadevall Thu, 07 Jan 2010 11:48:20 -0500 + d-shlibs (0.41) unstable; urgency=low * glibc-2.10 on armel introduces new dynamic linker and breaks diff -Nru d-shlibs-0.41/debian/compat d-shlibs-0.44ubuntu1/debian/compat --- d-shlibs-0.41/debian/compat 1969-12-31 19:00:00.000000000 -0500 +++ d-shlibs-0.44ubuntu1/debian/compat 2010-03-09 15:05:41.000000000 -0500 @@ -0,0 +1 @@ +6 diff -Nru d-shlibs-0.41/debian/control d-shlibs-0.44ubuntu1/debian/control --- d-shlibs-0.41/debian/control 2008-07-23 01:25:01.000000000 -0400 +++ d-shlibs-0.44ubuntu1/debian/control 2010-05-12 03:34:35.000000000 -0400 @@ -1,13 +1,16 @@ Source: d-shlibs Section: utils Priority: optional -Maintainer: Junichi Uekawa -Build-Depends-Indep: debhelper (>> 4.0.0) -Standards-Version: 3.7.2 +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Jonas Smedegaard +Build-Depends: cdbs, debhelper (>= 6) +Vcs-Git: git://git.debian.org/git/collab-maint/d-shlibs +Vcs-Browser: http://git.debian.org/?p=collab-maint/d-shlibs.git;a=summary +Standards-Version: 3.8.4 Package: d-shlibs Architecture: all -Depends: binutils, debianutils (>= 1.6), apt +Depends: ${misc:Depends}, binutils Description: Debian shared library package building helper scripts Shared library packages in Debian need some special catering to do with regards to which files go where. This package contains diff -Nru d-shlibs-0.41/debian/control.in d-shlibs-0.44ubuntu1/debian/control.in --- d-shlibs-0.41/debian/control.in 1969-12-31 19:00:00.000000000 -0500 +++ d-shlibs-0.44ubuntu1/debian/control.in 2010-05-12 03:24:47.000000000 -0400 @@ -0,0 +1,25 @@ +Source: d-shlibs +Section: utils +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Jonas Smedegaard +Build-Depends: @cdbs@ +Vcs-Git: git://git.debian.org/git/collab-maint/d-shlibs +Vcs-Browser: http://git.debian.org/?p=collab-maint/d-shlibs.git;a=summary +Standards-Version: 3.8.4 + +Package: d-shlibs +Architecture: all +Depends: ${misc:Depends}, binutils +Description: Debian shared library package building helper scripts + Shared library packages in Debian need some special catering to do + with regards to which files go where. This package contains + programs which try to help automate the process and catch simple + errors + . + "d-shlibmove" moves the shared library binary around from temporary + installation directory to the destination package directory + . + "d-devlibdeps" tries to list the development library dependencies + required for using the -dev package. + diff -Nru d-shlibs-0.41/debian/copyright d-shlibs-0.44ubuntu1/debian/copyright --- d-shlibs-0.41/debian/copyright 2008-07-23 01:25:01.000000000 -0400 +++ d-shlibs-0.44ubuntu1/debian/copyright 2010-05-04 20:52:25.000000000 -0400 @@ -1,10 +1,28 @@ -This package was debianized by Junichi Uekawa on -Wed, 1 May 2002 18:19:06 +0900. +Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=135 +Name: d-shlibs +Maintainer: Jonas Smedegaard +Source: http://packages.qa.debian.org/d/d-shlibs.html -It was downloaded from http://www.netfort.gr.jp/~dancer/software +Copyright: 2002-2005, Junichi Uekawa +License: GPL-2+ -Upstream Author: Junichi Uekawa +Files: ./debian/* +Copyright: 2010, Jonas Smedegaard +License: GPL-2+ -Copyright: - -GPL, full text can be found in /usr/share/common-licenses/GPL +License: GPL-2+ + This file is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + . + On Debian systems, the complete text of the GNU General Public License + (GPL) version 2 can be found an 2/usr/share/common-licenses/GPL-2". + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . diff -Nru d-shlibs-0.41/debian/copyright_hints d-shlibs-0.44ubuntu1/debian/copyright_hints --- d-shlibs-0.41/debian/copyright_hints 1969-12-31 19:00:00.000000000 -0500 +++ d-shlibs-0.44ubuntu1/debian/copyright_hints 2010-03-10 23:39:44.000000000 -0500 @@ -0,0 +1,55 @@ +Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=135 +X-Draft: Autogenerated by CDBS snippet copyright-check.mk + +Files: ./Makefile, + ./README, + ./d-devlibdeps.1, + ./d-shlibmove.1, + ./debian/README.Debian, + ./debian/compat, + ./debian/control, + ./debian/control.in, + ./debian/pbuilder-test/01_ncurses, + ./debian/pbuilder-test/01_ncurses.d/debian/control, + ./debian/pbuilder-test/02_uppercase, + ./debian/pbuilder-test/02_uppercase.d/debian/control, + ./debian/pbuilder-test/02_uppercase.d/libUppercase.c, + ./debian/pbuilder-test/03_make_test, + ./example.control, + ./tests.log +Copyright: *No copyright* +License: UNKNOWN + FIXME + +Files: ./d-devlibdeps, + ./d-shlibmove +Copyright: 2002, 2005 Junichi Uekawa + 2002-2005, Junichi Uekawa +License: GPL-2+ + FIXME + +Files: ./debian/rules +Copyright: 2010, Jonas Smedegaard +License: GPL + FIXME + +Files: ./COPYING +Copyright: 1989, 1991 Free Software Foundation, Inc + + HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR + HOLDERS AND/OR OTHER PARTIES + disclaimer" for the program, if + holder saying it may be distributed + holder who places the Program under this License + interest in the program + law: + the software, and + year name of author +License: GPL-2+ + FIXME + +Files: ./ChangeLog +Copyright: fix text so that it looks more sane +License: UNKNOWN + FIXME + diff -Nru d-shlibs-0.41/debian/dirs d-shlibs-0.44ubuntu1/debian/dirs --- d-shlibs-0.41/debian/dirs 2008-07-23 01:25:01.000000000 -0400 +++ d-shlibs-0.44ubuntu1/debian/dirs 1969-12-31 19:00:00.000000000 -0500 @@ -1,2 +0,0 @@ -usr/bin -usr/sbin diff -Nru d-shlibs-0.41/debian/docs d-shlibs-0.44ubuntu1/debian/docs --- d-shlibs-0.41/debian/docs 2008-07-23 01:25:01.000000000 -0400 +++ d-shlibs-0.44ubuntu1/debian/docs 1969-12-31 19:00:00.000000000 -0500 @@ -1,2 +0,0 @@ -README -ChangeLog \ No newline at end of file diff -Nru d-shlibs-0.41/debian/gbp.conf d-shlibs-0.44ubuntu1/debian/gbp.conf --- d-shlibs-0.41/debian/gbp.conf 1969-12-31 19:00:00.000000000 -0500 +++ d-shlibs-0.44ubuntu1/debian/gbp.conf 2010-03-09 11:58:41.000000000 -0500 @@ -0,0 +1,5 @@ +# Configuration file for git-buildpackage and friends + +[DEFAULT] +pristine-tar = True +sign-tags = True diff -Nru d-shlibs-0.41/debian/rules d-shlibs-0.44ubuntu1/debian/rules --- d-shlibs-0.41/debian/rules 2008-07-23 01:25:01.000000000 -0400 +++ d-shlibs-0.44ubuntu1/debian/rules 2010-05-12 03:32:39.000000000 -0400 @@ -1,74 +1,26 @@ #!/usr/bin/make -f -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2010 Jonas Smedegaard +# Description: Main Debian packaging script for d-shlibs +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +include /usr/share/cdbs/1/class/makefile.mk +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/utils.mk -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +DEB_MAKE_CHECK_TARGET = check +DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/d-shlibs -# This is the debhelper compatibility version to use. -export DH_COMPAT=4 - - - -ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) - CFLAGS += -g -endif -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s -endif - -configure: configure-stamp -configure-stamp: - dh_testdir - touch configure-stamp - -build: build-stamp - -build-stamp: configure-stamp - dh_testdir - $(MAKE) - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - -$(MAKE) clean - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - $(MAKE) install DESTDIR=$(CURDIR)/debian/d-shlibs - - -# Build architecture-independent files here. -binary-indep: build install - dh_testdir - dh_testroot - dh_installdocs - dh_installexamples - dh_installmenu - dh_installcron - dh_installman d-shlibmove.1 d-devlibdeps.1 - dh_installinfo - dh_installchangelogs - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -# Build architecture-dependent files here. -binary-arch: build install - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure +DEB_INSTALL_MANPAGES_d-shlibs = d-shlibmove.1 d-devlibdeps.1 diff -Nru d-shlibs-0.41/debian/source/format d-shlibs-0.44ubuntu1/debian/source/format --- d-shlibs-0.41/debian/source/format 1969-12-31 19:00:00.000000000 -0500 +++ d-shlibs-0.44ubuntu1/debian/source/format 2010-05-12 04:57:31.838309394 -0400 @@ -0,0 +1 @@ +3.0 (native) diff -Nru d-shlibs-0.41/d-shlibmove d-shlibs-0.44ubuntu1/d-shlibmove --- d-shlibs-0.41/d-shlibmove 2008-07-23 01:25:01.000000000 -0400 +++ d-shlibs-0.44ubuntu1/d-shlibmove 2010-05-04 20:52:25.000000000 -0400 @@ -68,6 +68,7 @@ local ENTRYLINE="$2" if ! awk '/^Package:.*'"$PKGNAME"'/,/^$/{print}' "$CONTROL" | \ + perl -0 -pe 's/\n[ \t]+/ /g' | \ grep "$ENTRYLINE" > /dev/null; then echo "E: line [$ENTRYLINE] not found in $CONTROL section for $PKGNAME" # set this error signifier to true @@ -93,6 +94,8 @@ TRANSITIONSUFFIX= DOIT=no +DEVUNVERSIONED=no +IGNORELIBDEP=no while [ -n "$1" ]; do case $1 in --moveshl) @@ -137,6 +140,12 @@ DEVSUFFIX="$1"; shift; ;; + --devunversioned) + DEVUNVERSIONED=yes + shift;; + --ignorelibdep) + IGNORELIBDEP=yes + shift;; --c102) TRANSITIONSUFFIX="c102" shift;; @@ -162,7 +171,11 @@ DEVLIB_TO_CHECK="${DEVLIB_TO_CHECK} $1" readlibnameinfo "$1" -PKGDEV="${SONAMEPKGNAME}${DEVSUFFIX}-dev" +if [ "${DEVUNVERSIONED}" = "yes" ]; then + PKGDEV="${PK_LOWER}${DEVSUFFIX}-dev" +else + PKGDEV="${SONAMEPKGNAME}${DEVSUFFIX}-dev" +fi PKGSHL="${SONAMEPKGNAME}${SUFFIX}${TRANSITIONSUFFIX}" INSTALLDIR="install -d -m 755 " @@ -199,8 +212,10 @@ # check the syntax of the control file. CHECK_ERROR=false -check_line "${PKGDEV}" "Provides:.*${PK_LOWER}-dev" -check_line "${PKGDEV}" "Conflicts:.*${PK_LOWER}-dev" +if ! [ "${DEVUNVERSIONED}" = "yes" ]; then + check_line "${PKGDEV}" "Provides:.*${PK_LOWER}-dev" + check_line "${PKGDEV}" "Conflicts:.*${PK_LOWER}-dev" +fi check_line "${PKGSHL}" "Section: libs" if [ -n "${SUFFIX}" ]; then check_line "${PKGSHL}" "Conflicts: ${SONAMEPKGNAME}" @@ -209,7 +224,9 @@ check_line "${PKGSHL}" "Conflicts: ${SONAMEPKGNAME}${SUFFIX}" fi check_line "${PKGDEV}" "Section: \(devel\|libdevel\)" -check_line "${PKGDEV}" "Depends:.*${PKGSHL}" +if ! [ "${IGNORELIBDEP}" = "yes" ]; then + check_line "${PKGDEV}" "Depends:.*${PKGSHL}" +fi check_line "${PKGSHL}" "Depends:.*[$]{shlibs:Depends}" if [ "${CHECK_ERROR}" = "true" ]; then diff -Nru d-shlibs-0.41/d-shlibmove.1 d-shlibs-0.44ubuntu1/d-shlibmove.1 --- d-shlibs-0.41/d-shlibmove.1 2008-07-23 01:25:01.000000000 -0400 +++ d-shlibs-0.44ubuntu1/d-shlibmove.1 2010-05-04 20:52:25.000000000 -0400 @@ -79,6 +79,21 @@ Added in version 0.3 .TP +.B "--devunversioned" + +Install into unversioned development package. + +Added in version 0.42 + +.TP +.B "--ignorelibdep" + +Suppress shlib dependency. Useful when dynamically resolved e.g. using +CDBS. + +Added in version 0.42 + +.TP .B "--c102" Add c102 suffix to package names, for C++ ABI transition.