diff -u digikam-1.0.0~beta1/debian/control digikam-1.0.0~beta1/debian/control --- digikam-1.0.0~beta1/debian/control +++ digikam-1.0.0~beta1/debian/control @@ -1,7 +1,8 @@ Source: digikam Section: graphics Priority: optional -Maintainer: Debian KDE Extras Team +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Debian KDE Extras Team Uploaders: Achim Bohnet , Mark Purcell , Fathi Boudra Build-Depends: cdbs, debhelper (>= 7), pkg-kde-tools, cmake (>= 2.6.2), libqt4-dev (>= 4.4), kdelibs5-dev, diff -u digikam-1.0.0~beta1/debian/digikam.install digikam-1.0.0~beta1/debian/digikam.install --- digikam-1.0.0~beta1/debian/digikam.install +++ digikam-1.0.0~beta1/debian/digikam.install @@ -1,4 +1,5 @@ usr/bin/digi* +usr/bin/cleanup_digikamdb usr/include usr/lib usr/share/applications/kde4/digikam.desktop diff -u digikam-1.0.0~beta1/debian/changelog digikam-1.0.0~beta1/debian/changelog --- digikam-1.0.0~beta1/debian/changelog +++ digikam-1.0.0~beta1/debian/changelog @@ -1,3 +1,11 @@ +digikam (2:1.0.0~beta1-1ubuntu1) karmic; urgency=low + + * Merge with debian unstable, remaining changes: + - export .pot name and copy to plugins in debian/rules + - digikam.install: add /usr/bin/cleanup_digikamdb + + -- Alessandro Ghersi Fri, 19 Jun 2009 19:56:52 +0200 + digikam (2:1.0.0~beta1-1) unstable; urgency=low * New upstream release @@ -10,6 +18,15 @@ -- Mark Purcell Wed, 10 Jun 2009 22:17:30 +1000 +digikam (2:0.10.0-2ubuntu1) karmic; urgency=low + + * Merge with Debian, remaining changes: + - export .pot name and copy to plugins in debian/rules + - Move showfoto data directory to showfoto package. (edit showfoto.install and digikam.install) + Conflicts/Replaces added to take care of transition. + + -- Jonathan Riddell Fri, 05 Jun 2009 16:16:01 +0100 + digikam (2:0.10.0-2) unstable; urgency=low [ Luka Renko ] @@ -23,6 +40,35 @@ -- Mark Purcell Tue, 07 Apr 2009 19:35:12 +1000 +digikam (2:0.10.0-1ubuntu3) jaunty; urgency=low + + * In debian/rules add KUBUNTU_DESKTOP_POT and common-install-prehook-impl + to copy desktop translations template file to imageplugins too + + -- Jonathan Riddell Wed, 08 Apr 2009 14:40:55 +0100 + +digikam (2:0.10.0-1ubuntu2) jaunty; urgency=low + + * Fix installation path for application icons (digikam/showfoto) + Install app icons in /usr/share/icons/hicolor (KDE bug 187748). + This fixes missing icons in non-KDE desktops (GNOME, XFCE). + Added debian/patches/01-fix-apps-icons-path.patch + * Move showfoto data directory to showfoto package. + Conflicts/Replaces added to take care of transition. + + -- Luka Renko Sun, 22 Mar 2009 20:33:46 +0100 + +digikam (2:0.10.0-1ubuntu1) jaunty; urgency=low + + * Remaining changes to Debian (committed to Debian SVN): + - Depends: kde-icons-oxygen dropped (included through kdelibs) + - Recommends: kipi-plugins added (provides major functionality) + - debian/digikamthemedesigner.manpage: add missing manpage + * Remaning change to Debian: + - Section: devel for -dbg package (no debug in Jaunty) + + -- Luka Renko Tue, 17 Mar 2009 23:07:56 +0100 + digikam (2:0.10.0-1) experimental; urgency=low * New upstream release @@ -36,13 +82,6 @@ -- Mark Purcell Tue, 17 Mar 2009 22:17:58 +1100 -digikam (2:0.9.5-1) unstable; urgency=low - - * New upstream release - * digikam-dbg Section: debug - - -- Mark Purcell Tue, 17 Mar 2009 21:44:03 +1100 - digikam (2:0.10.0~rc2-1) experimental; urgency=low * New upstream release @@ -89,18 +128,6 @@ -- Mark Purcell Tue, 19 Aug 2008 20:05:43 +1000 -digikam (2:0.9.5~beta3-1) unstable; urgency=low - - * New upstream release - - Fixes "please package 0.9.5-beta2 for lenny/unstable" (Closes: #512156) - - Upload target squeeze (KDE3) - * Build-Depends: libkdcraw-dev (>= 0.1.6) - * Update debian/watch to correctly handle -beta/-rc versions - * Add ${misc:Depends} & debhelper (>= 7) - * debian/control Update shofoto description - - -- Mark Purcell Sat, 31 Jan 2009 11:21:20 +1100 - digikam (2:0.9.4-1) unstable; urgency=low * New upstream release diff -u digikam-1.0.0~beta1/debian/rules digikam-1.0.0~beta1/debian/rules --- digikam-1.0.0~beta1/debian/rules +++ digikam-1.0.0~beta1/debian/rules @@ -5,6 +5,8 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk -include /usr/share/gnome-pkg-tools/1/rules/sf-get-source.mk +export KUBUNTU_DESKTOP_POT=extragear-graphics_digikam + TARBALL_EXT=tar.bz2 DEB_CONFIGURE_EXTRA_FLAGS := --without-included-sqlite3 @@ -30,0 +33,3 @@ + +common-install-prehook-impl:: + cp po/desktop_extragear-graphics_digikam.pot po/desktop_extragear-graphics_digikamimageplugins.pot