diff -Nru d-shlibs-0.44/d-devlibdeps d-shlibs-0.44ubuntu1/d-devlibdeps --- d-shlibs-0.44/d-devlibdeps 2010-04-25 11:13:29.000000000 -0400 +++ d-shlibs-0.44ubuntu1/d-devlibdeps 2010-05-12 03:25:33.000000000 -0400 @@ -107,6 +107,9 @@ -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//' \ -e 's/libXpm4-dev/libxpm-dev | xlibs-dev (<< 4.3.0)/' \ -e 's/libz1-dev/zlib1g-dev/' \ "${OVERRIDE[@]/#/-e}" \ diff -Nru d-shlibs-0.44/debian/changelog d-shlibs-0.44ubuntu1/debian/changelog --- d-shlibs-0.44/debian/changelog 2010-04-25 11:27:32.000000000 -0400 +++ d-shlibs-0.44ubuntu1/debian/changelog 2010-05-12 03:33:00.000000000 -0400 @@ -1,3 +1,12 @@ +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 @@ -35,6 +44,13 @@ -- 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.44/debian/control d-shlibs-0.44ubuntu1/debian/control --- d-shlibs-0.44/debian/control 2010-03-10 23:45:56.000000000 -0500 +++ d-shlibs-0.44ubuntu1/debian/control 2010-05-12 03:34:35.000000000 -0400 @@ -1,7 +1,8 @@ Source: d-shlibs Section: utils Priority: optional -Maintainer: Jonas Smedegaard +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 diff -Nru d-shlibs-0.44/debian/control.in d-shlibs-0.44ubuntu1/debian/control.in --- d-shlibs-0.44/debian/control.in 2010-03-10 23:45:29.000000000 -0500 +++ d-shlibs-0.44ubuntu1/debian/control.in 2010-05-12 03:24:47.000000000 -0400 @@ -1,7 +1,8 @@ Source: d-shlibs Section: utils Priority: optional -Maintainer: Jonas Smedegaard +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 diff -Nru d-shlibs-0.44/debian/rules d-shlibs-0.44ubuntu1/debian/rules --- d-shlibs-0.44/debian/rules 2010-03-10 23:39:41.000000000 -0500 +++ d-shlibs-0.44ubuntu1/debian/rules 2010-05-12 03:32:39.000000000 -0400 @@ -21,6 +21,6 @@ include /usr/share/cdbs/1/rules/utils.mk DEB_MAKE_CHECK_TARGET = check -DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(cdbs_make_curdestdir) +DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/d-shlibs DEB_INSTALL_MANPAGES_d-shlibs = d-shlibmove.1 d-devlibdeps.1