rev 11418 - in kde-extras/digikam/branches/kde4/debian: . patches

[Mark Purcell]

Author: msp
Date: 2008-07-09 11:17:03 +0000 (Wed, 09 Jul 2008)
New Revision: 11418

Added:
   kde-extras/digikam/branches/kde4/debian/patches/
   kde-extras/digikam/branches/kde4/debian/patches/link-pthread.patch
Modified:
   kde-extras/digikam/branches/kde4/debian/changelog
   kde-extras/digikam/branches/kde4/debian/control
   kde-extras/digikam/branches/kde4/debian/digikam.install
   kde-extras/digikam/branches/kde4/debian/digikam.manpages
   kde-extras/digikam/branches/kde4/debian/rules
   kde-extras/digikam/branches/kde4/debian/showfoto.install
Log:
* Force -lpthread with ${CMAKE_THREAD_LIBS_INIT}; link-pthread.patch
* Refresh debian/*.install for KDE4

Modified: kde-extras/digikam/branches/kde4/debian/changelog
===================================================================
--- kde-extras/digikam/branches/kde4/debian/changelog	2008-07-09 10:12:40 UTC (rev 11417)
+++ kde-extras/digikam/branches/kde4/debian/changelog	2008-07-09 11:17:03 UTC (rev 11418)
@@ -3,6 +3,8 @@
   * (NOT RELEASED YET) 
   * New upstream release
   * Update KDE4 build-depends
+  * Force -lpthread with ${CMAKE_THREAD_LIBS_INIT}; link-pthread.patch
+  * Refresh debian/*.install for KDE4
 
  -- Mark Purcell <msp at debian.org>  Sat, 05 Jul 2008 10:31:00 +1000
 

Modified: kde-extras/digikam/branches/kde4/debian/control
===================================================================
--- kde-extras/digikam/branches/kde4/debian/control	2008-07-09 10:12:40 UTC (rev 11417)
+++ kde-extras/digikam/branches/kde4/debian/control	2008-07-09 11:17:03 UTC (rev 11418)
@@ -20,7 +20,7 @@
 
 Package: digikam
 Architecture: any
-Depends: ${shlibs:Depends}, kdebase-kio-plugins
+Depends: ${shlibs:Depends}
 Recommends: kipi-plugins, kdeprint, konqueror
 Suggests: digikam-doc
 Conflicts: digikamimageplugins, kipi-plugins (<= 0.1.3~rc0), libkexiv2-0, libexiv2-0.12

Modified: kde-extras/digikam/branches/kde4/debian/digikam.install
===================================================================
--- kde-extras/digikam/branches/kde4/debian/digikam.install	2008-07-09 10:12:40 UTC (rev 11417)
+++ kde-extras/digikam/branches/kde4/debian/digikam.install	2008-07-09 11:17:03 UTC (rev 11418)
@@ -1,10 +1,6 @@
 usr/bin/digi*
-usr/include/kde
+usr/include
 usr/lib
-usr/share/apps/digikam
-usr/share/apps/konqueror/servicemenus/digikam*.desktop
-usr/share/applications/kde/digikam.desktop
+usr/share/applications/kde4/digikam.desktop
 usr/share/icons/hicolor/*/apps/digikam.png
 usr/share/locale
-usr/share/servicetypes/digikamimageplugin.desktop
-usr/share/services

Modified: kde-extras/digikam/branches/kde4/debian/digikam.manpages
===================================================================
--- kde-extras/digikam/branches/kde4/debian/digikam.manpages	2008-07-09 10:12:40 UTC (rev 11417)
+++ kde-extras/digikam/branches/kde4/debian/digikam.manpages	2008-07-09 11:17:03 UTC (rev 11418)
@@ -1,2 +1,2 @@
 debian/digikam.manpage
-debian/tmp/usr/share/man/man1/digitaglinktree.1
+debian/tmp/usr/share/man/digitaglinktree.1

Added: kde-extras/digikam/branches/kde4/debian/patches/link-pthread.patch
===================================================================
--- kde-extras/digikam/branches/kde4/debian/patches/link-pthread.patch	                        (rev 0)
+++ kde-extras/digikam/branches/kde4/debian/patches/link-pthread.patch	2008-07-09 11:17:03 UTC (rev 11418)
@@ -0,0 +1,11 @@
+diff -Nur -x '*.orig' -x '*~' digikam-0.10.0~beta1/digikam/CMakeLists.txt digikam-0.10.0~beta1.new/digikam/CMakeLists.txt
+--- digikam-0.10.0~beta1/digikam/CMakeLists.txt	2008-07-07 18:05:32.000000000 +1000
++++ digikam-0.10.0~beta1.new/digikam/CMakeLists.txt	2008-07-09 13:17:20.000000000 +1000
+@@ -107,6 +107,7 @@
+                       ${KDE4_KUTILS_LIBS} 
+                       ${KDE4_KDE3SUPPORT_LIBRARY}
+                       ${QT_QT3SUPPORT_LIBRARY}
++                      ${CMAKE_THREAD_LIBS_INIT}
+ 
+                       ${JPEG_LIBRARIES}
+                       ${TIFF_LIBRARIES}

Modified: kde-extras/digikam/branches/kde4/debian/rules
===================================================================
--- kde-extras/digikam/branches/kde4/debian/rules	2008-07-09 10:12:40 UTC (rev 11417)
+++ kde-extras/digikam/branches/kde4/debian/rules	2008-07-09 11:17:03 UTC (rev 11418)
@@ -1,7 +1,8 @@
 #!/usr/bin/make -f
 
+include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 -include /usr/share/gnome-pkg-tools/1/rules/sf-get-source.mk
 
 TARBALL_EXT=tar.bz2

Modified: kde-extras/digikam/branches/kde4/debian/showfoto.install
===================================================================
--- kde-extras/digikam/branches/kde4/debian/showfoto.install	2008-07-09 10:12:40 UTC (rev 11417)
+++ kde-extras/digikam/branches/kde4/debian/showfoto.install	2008-07-09 11:17:03 UTC (rev 11418)
@@ -1,4 +1,3 @@
 usr/bin/showfoto
-usr/share/apps/showfoto
-usr/share/applications/kde/showfoto.desktop
+usr/share/applications/kde4/showfoto.desktop
 usr/share/icons/hicolor/*/apps/showfoto.png