rev 19308 - kde-extras/digikam/trunk/debian

Mark Purcell msp at alioth.debian.org
Thu Sep 27 20:44:06 UTC 2012 

Author: msp
Date: 2012-09-27 20:44:06 +0000 (Thu, 27 Sep 2012)
New Revision: 19308

Modified:
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/control
   kde-extras/digikam/trunk/debian/digikam-data.install
   kde-extras/digikam/trunk/debian/digikam.install
   kde-extras/digikam/trunk/debian/rules
   kde-extras/digikam/trunk/debian/watch
Log:
* New upstream release
* Fix "wrongly conflicts phonon-backend-vlc" dropped (Closes: #688142)
* debian/watch include download.kde.org
* digikam 3.0.0 uses features from unreleased kdegraphics >=4.10 & ships 
a private version of the kdegraphics libs - this is not the Debian way :-(
* Unsatisfactory Conflicts: libkipi8, libkexiv2-10, libkdcraw20, libksane0
* Suspend digikam-dbg >130Mb

Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2012-09-22 05:31:10 UTC (rev 19307)
+++ kde-extras/digikam/trunk/debian/changelog	2012-09-27 20:44:06 UTC (rev 19308)
@@ -1,3 +1,17 @@
+digikam (4:3.0.0~beta1a-1) experimental; urgency=low
+
+  * New upstream release
+
+  * Fix "wrongly conflicts phonon-backend-vlc" dropped (Closes: #688142)
+  * debian/watch include download.kde.org
+
+  * digikam 3.0.0 uses features from unreleased kdegraphics >=4.10 & ships 
+  a private version of the kdegraphics libs - this is not the Debian way :-(
+  * Unsatisfactory Conflicts: libkipi8, libkexiv2-10, libkdcraw20, libksane0
+  * Suspend digikam-dbg >130Mb
+
+ -- Mark Purcell <msp at debian.org>  Thu, 27 Sep 2012 21:41:30 +1000
+
 digikam (4:2.9.0-3) experimental; urgency=low
 
   * Fix "[digikam] digikam not installable, dependent on

Modified: kde-extras/digikam/trunk/debian/control
===================================================================
--- kde-extras/digikam/trunk/debian/control	2012-09-22 05:31:10 UTC (rev 19307)
+++ kde-extras/digikam/trunk/debian/control	2012-09-27 20:44:06 UTC (rev 19308)
@@ -7,7 +7,7 @@
  doxygen,
  kdelibs5-dev (>= 4:4.7), kdepimlibs5-dev (>= 4:4.7),
  libmarble-dev (>= 4:4.7),
- libkipi-dev (>= 4:4.7), libkexiv2-dev (>= 4:4.7), libkdcraw-dev (>= 4:4.7), libksane-dev (>= 4:4.7),
+# libkipi-dev (>= 4:4.7), libkexiv2-dev (>= 4:4.7), libkdcraw-dev (>= 4:4.7), libksane-dev (>= 4:4.7),
  libqt4-dev, libqt4-opengl-dev, libgl1-mesa-dev, libglu1-mesa-dev,
  libqtwebkit-dev,
  libgphoto2-2-dev,
@@ -37,9 +37,9 @@
 Package: digikam
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-sql-sqlite, digikam-data (= ${source:Version})
-Conflicts: phonon-backend-vlc
 Recommends: www-browser, kipi-plugins, mplayerthumbs
 Suggests: digikam-doc
+Conflicts: libkipi8, libkipi-data, libkipi-dev, libkexiv2-10, libkexiv2-data, libkdcraw20, libkdcraw-data, libksane0, libksane-dev
 Description: digital photo management application for KDE
  Digital photo management program designed to import, organize, enhance, search
  and export your digital images to and from your computer.
@@ -103,17 +103,17 @@
  It runs without digiKam images database support, but provides all Image Editor
  functions.
 
-Package: digikam-dbg
-Architecture: any
-Section: debug
-Depends: ${shlibs:Depends}, ${misc:Depends}, digikam (= ${binary:Version}), showfoto (= ${binary:Version}), kdelibs5-dbg
-Priority: extra
-Description: debugging symbols for digiKam
- The debugging symbols associated with digiKam and showFoto. They will
- automatically be used by GDB for debugging digiKam-related issues.
- .
- This package should be installed if you wish to obtain a backtrace with 
- symbols.
+#Package: digikam-dbg
+#Architecture: any
+#Section: debug
+#Depends: ${shlibs:Depends}, ${misc:Depends}, digikam (= ${binary:Version}), showfoto (= ${binary:Version}), kdelibs5-dbg
+#Priority: extra
+#Description: debugging symbols for digiKam
+# The debugging symbols associated with digiKam and showFoto. They will
+## automatically be used by GDB for debugging digiKam-related issues.
+## .
+# This package should be installed if you wish to obtain a backtrace with 
+# symbols.
 
 Package: digikam-data
 Architecture: all

Modified: kde-extras/digikam/trunk/debian/digikam-data.install
===================================================================
--- kde-extras/digikam/trunk/debian/digikam-data.install	2012-09-22 05:31:10 UTC (rev 19307)
+++ kde-extras/digikam/trunk/debian/digikam-data.install	2012-09-27 20:44:06 UTC (rev 19308)
@@ -4,3 +4,4 @@
 usr/share/kde4/servicetypes
 usr/share/locale/*/LC_MESSAGES/digikam.mo
 usr/share/locale/*/LC_MESSAGES/libkgeomap.mo
+usr/share/locale/*/LC_MESSAGES/libkipi.mo

Modified: kde-extras/digikam/trunk/debian/digikam.install
===================================================================
--- kde-extras/digikam/trunk/debian/digikam.install	2012-09-22 05:31:10 UTC (rev 19307)
+++ kde-extras/digikam/trunk/debian/digikam.install	2012-09-27 20:44:06 UTC (rev 19308)
@@ -20,3 +20,8 @@
 usr/share/man/man1/cleanup_digikamdb.1
 usr/share/man/man1/digitaglinktree.1
 usr/share/kde4/apps/kconf_update/
+usr/lib/libksane*
+usr/lib/libkexiv2*
+usr/lib/libHUpnp*
+usr/lib/libkdc*
+usr/lib/libQt*

Modified: kde-extras/digikam/trunk/debian/rules
===================================================================
--- kde-extras/digikam/trunk/debian/rules	2012-09-22 05:31:10 UTC (rev 19307)
+++ kde-extras/digikam/trunk/debian/rules	2012-09-27 20:44:06 UTC (rev 19308)
@@ -3,9 +3,13 @@
 %:
 	dh $@ --with kde --parallel 
 
+# : Force to use local libkipi, libkexiv2, and libkdcraw implementation
+
 override_dh_auto_configure:
-	LDFLAGS="$(LDFLAGS) -Wl,--as-needed" dh_auto_configure --buildsystem=kde -- -DDIGIKAMSC_COMPILE_DOC=on -DDIGIKAMSC_COMPILE_PO=on
+	LDFLAGS="$(LDFLAGS) -Wl,--as-needed" dh_auto_configure --buildsystem=kde \
+                -- -DDIGIKAMSC_COMPILE_DOC=on -DDIGIKAMSC_COMPILE_PO=on -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=on
 
+
 override_dh_installchangelogs:
 	dh_installchangelogs core/ChangeLog 
 
@@ -13,5 +17,5 @@
 override_dh_install:
 	dh_install -Xmultithread -Xoxygen -XREADME.MACOSX --fail-missing
 
-override_dh_strip:
-	dh_strip -a --dbg-package=digikam-dbg
+#override_dh_strip:
+#	dh_strip -a --dbg-package=digikam-dbg

Modified: kde-extras/digikam/trunk/debian/watch
===================================================================
--- kde-extras/digikam/trunk/debian/watch	2012-09-22 05:31:10 UTC (rev 19307)
+++ kde-extras/digikam/trunk/debian/watch	2012-09-27 20:44:06 UTC (rev 19308)
@@ -2,3 +2,6 @@
 
 opts=uversionmangle=s/-/~/  \
  http://sf.net/digikam/digikam-(\d+.*)\.tar\.bz2 debian svn-upgrade
+
+opts=uversionmangle=s/-/~/  \
+ http://download.kde.org/unstable/digikam/digikam-(.*).tar.bz2 debian svn-upgrade

More information about the pkg-kde-commits mailing list