diff -u libgtkdatabox-0.9.0.1/debian/changelog libgtkdatabox-0.9.0.1/debian/changelog --- libgtkdatabox-0.9.0.1/debian/changelog +++ libgtkdatabox-0.9.0.1/debian/changelog @@ -1,3 +1,10 @@ +libgtkdatabox (1:0.9.0.1-2ubuntu1) karmic; urgency=low + + * Merge from debian unstable (LP: #383570), remaining changes: + - debian/rules: Add gio and pangoft overrides for FTBFS + + -- Michael Terry Thu, 04 Jun 2009 09:20:20 -0400 + libgtkdatabox (1:0.9.0.1-2) unstable; urgency=low * Glade support (thanks to Norbert BÉRCI ) @@ -15,6 +22,14 @@ -- Andreas Tille Fri, 08 May 2009 09:18:48 +0200 +libgtkdatabox (1:0.9.0.1-1ubuntu1) jaunty; urgency=low + + * Add overrides for libgio and libpangoft for d-devlibdeps to allow + the package to build. If Ubuntu bugs #300895 and #300896 are fixed + then it should be safe to drop these changes. + + -- James Westby Sat, 22 Nov 2008 04:46:43 +0000 + libgtkdatabox (1:0.9.0.1-1) unstable; urgency=low * New upstream version diff -u libgtkdatabox-0.9.0.1/debian/control libgtkdatabox-0.9.0.1/debian/control --- libgtkdatabox-0.9.0.1/debian/control +++ libgtkdatabox-0.9.0.1/debian/control @@ -1,7 +1,8 @@ Source: libgtkdatabox Section: libs Priority: extra -Maintainer: Debian Science Maintainers +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian Science Maintainers DM-Upload-Allowed: yes Uploaders: Ramakrishnan Muthukrishnan , Andreas Tille diff -u libgtkdatabox-0.9.0.1/debian/rules libgtkdatabox-0.9.0.1/debian/rules --- libgtkdatabox-0.9.0.1/debian/rules +++ libgtkdatabox-0.9.0.1/debian/rules @@ -19,7 +19,10 @@ common-binary-post-install-arch:: # Call d-shlibmove to comply with library packaging guide - d-devlibdeps debian/$(devpkg).substvars \ + d-devlibdeps \ + --override s/libpangoft2-1.0-0-dev/libpango1.0-dev/ \ + --override s/libgio-2.0-0-dev/libglib2.0-dev/ \ + debian/$(devpkg).substvars \ debian/tmp/usr/lib/$(pkg).so # Do not use debian/$(devpkg).examples as debhelper input because @@ -29,6 +32,8 @@ cp -a debian/Makefile.testdatabox debian/$(devpkg)/usr/share/doc/$(devpkg)/examples/Makefile d-shlibmove --commit \ + --override s/libpangoft2-1.0-0-dev/libpango1.0-dev/ \ + --override s/libgio-2.0-0-dev/libglib2.0-dev/ \ --movedev "debian/tmp/usr/include" usr \ --movedev "debian/tmp/usr/lib/pkgconfig" usr/share \ --movedev "debian/tmp/usr/share/gtk-doc/html/gtkdatabox/*" usr/share/doc/libgtkdatabox-0.9.0-1-dev/html \