[Pkg-kde-commits] rev 1468 - in kde-extras/digikam/trunk/debian: . patches

Achim Bohnet ach-guest at costa.debian.org
Wed Aug 17 21:06:57 UTC 2005 

Author: ach-guest
Date: 2005-08-17 21:06:56 +0000 (Wed, 17 Aug 2005)
New Revision: 1468

Added:
   kde-extras/digikam/trunk/debian/patches/
   kde-extras/digikam/trunk/debian/patches/00_showfoto_enable-final-fix.diff
Modified:
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/control
Log:
o Merge my local kubuntu fixes.
o add patches/00_showfoto_enable-final-fix.diff
  to svn



Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2005-08-16 23:00:53 UTC (rev 1467)
+++ kde-extras/digikam/trunk/debian/changelog	2005-08-17 21:06:56 UTC (rev 1468)
@@ -1,9 +1,8 @@
 digikam (0.7.4-0) UNRELEASED; urgency=low
 
-  [ Achim Bohnet ]
   * NOT RELEASED YET
-    (!!!!!!!!! check if final tarballs contains my fix or not !!!!!!!)
 
+  [ Achim Bohnet ]
   * new upstream release.
   * Upstream split code and docs into two tarballs.
     Handbooks and their translations are now in it's own package
@@ -11,17 +10,17 @@
     Handbooks are now available in the new digikam-doc package.
   * control: conflict with digikamimageplugins << 0.7.2.9999
   * remove backport patch patches/01_fix-two-or-fourfold_menu_entries.diff.
-    Included since 0.7.3 upstream
-  * ltdl kde bug is fixed in KDE 3.4:  Remove depend on libimlib2-dev
-    and bump build-dep on KDE >= 3.4.1 (Closes: #288685, #310378)
+    Fixed upstream in 0.7.3
+  * ltdl kde bug is fixed in KDE 3.4:  Remove Depends on libimlib2-dev
+    and build-dep on KDE >= 4:3.4.0 (Closes: #288685, #310378)
+  * remove libltdl3-dev build-dep
   * New homepage URL in long description
-  * --enable-final fix for showfoto/Makefile.am (applied upstream)
+  * add: patches/00_showfoto_enable-final-fix.diff
   * digikam - digikam-doc tarball split
      + Add a note to the manpages that the handbooks are in package
        digikam-doc
      + copyright: remove part about documentation
      + control: update depends, suggests and build-depends
-  * fix broken build-dep: add epoch 4 to kdelibs* version
   * licenses/copyright review
 
   [ Mark Purcell ]

Modified: kde-extras/digikam/trunk/debian/control
===================================================================
--- kde-extras/digikam/trunk/debian/control	2005-08-16 23:00:53 UTC (rev 1467)
+++ kde-extras/digikam/trunk/debian/control	2005-08-17 21:06:56 UTC (rev 1468)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Paul Telford <pxt at debian.org>
 Uploaders: Achim Bohnet <ach at mpe.mpg.de>, Mark Purcell <msp at debian.org>
-Build-Depends: debhelper (>> 4.1), cdbs, kdelibs4-dev (>= 4:3.3), libimlib2-dev, libexif-dev (>> 0.6.9), libtiff4-dev, libgphoto2-2-dev, libltdl3-dev, libgdbm-dev, libkexif1-dev (>= 0.2-1), libkipi0-dev (>= 0.1-1)
+Build-Depends: debhelper (>> 4.1), cdbs, kdelibs4-dev (>= 4:3.4.0), libimlib2-dev, libexif-dev (>> 0.6.9), libtiff4-dev, libgphoto2-2-dev, libgdbm-dev, libkexif1-dev (>= 0.2-1), libkipi0-dev (>= 0.1-1)
 Standards-Version: 3.6.2
 
 Package: digikam

Added: kde-extras/digikam/trunk/debian/patches/00_showfoto_enable-final-fix.diff
===================================================================
--- kde-extras/digikam/trunk/debian/patches/00_showfoto_enable-final-fix.diff	2005-08-16 23:00:53 UTC (rev 1467)
+++ kde-extras/digikam/trunk/debian/patches/00_showfoto_enable-final-fix.diff	2005-08-17 21:06:56 UTC (rev 1468)
@@ -0,0 +1,78 @@
+--- digikam-0.7.4.orig/digikam/showfoto/Makefile.am
++++ digikam-0.7.4/digikam/showfoto/Makefile.am
+@@ -12,14 +12,16 @@
+ 	           setupplugins.cpp imageproperties.cpp imagepropertiesgeneral.cpp \
+ 		   imagepropertiesexif.cpp imagepropertieshistogram.cpp 
+ 
+-showfoto_LDADD   = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) \
+-		   $(LIB_KFILE) $(LIB_KPARTS) $(LIBJPEG) \
+-		   $(top_builddir)/digikam/utilities/imageeditor/libimagecanvas.la \
++showfoto_LDADD   = $(top_builddir)/digikam/utilities/imageeditor/libimagecanvas.la \
+ 		   $(top_builddir)/digikam/utilities/imageeditor/libshowfoto.la \
+ 		   $(top_builddir)/digikam/libs/histogram/libhistogram.la \
+ 		   $(top_builddir)/digikam/libs/widgets/libwidgets.la \
++		   $(top_builddir)/digikam/libs/curves/libcurves.la \
++		   $(top_builddir)/digikam/utilities/imageeditor/libimageeditor.la \
+ 		   $(top_builddir)/digikam/utilities/splashscreen/libsplashscreen.la \
+-		   $(top_builddir)/digikam/libs/thumbbar/libthumbbar.la 
++		   $(top_builddir)/digikam/libs/thumbbar/libthumbbar.la \
++		   $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) \
++		   $(LIB_KFILE) $(LIB_KPARTS) $(LIBJPEG)
+ 
+ showfoto_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+ 
+--- digikam-0.7.4.orig/digikam/showfoto/Makefile.in
++++ digikam-0.7.4/digikam/showfoto/Makefile.in
+@@ -72,15 +72,17 @@
+ @KDE_USE_FINAL_FALSE at showfoto_OBJECTS = $(showfoto_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE at showfoto_OBJECTS = $(showfoto_final_OBJECTS)
+ am__DEPENDENCIES_1 =
+-showfoto_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	$(top_builddir)/digikam/utilities/imageeditor/libimagecanvas.la \
++showfoto_DEPENDENCIES = $(top_builddir)/digikam/utilities/imageeditor/libimagecanvas.la \
+ 	$(top_builddir)/digikam/utilities/imageeditor/libshowfoto.la \
+ 	$(top_builddir)/digikam/libs/histogram/libhistogram.la \
+ 	$(top_builddir)/digikam/libs/widgets/libwidgets.la \
++	$(top_builddir)/digikam/libs/curves/libcurves.la \
++	$(top_builddir)/digikam/utilities/imageeditor/libimageeditor.la \
+ 	$(top_builddir)/digikam/utilities/splashscreen/libsplashscreen.la \
+-	$(top_builddir)/digikam/libs/thumbbar/libthumbbar.la
++	$(top_builddir)/digikam/libs/thumbbar/libthumbbar.la \
++	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+@@ -392,14 +394,16 @@
+ 	           setupplugins.cpp imageproperties.cpp imagepropertiesgeneral.cpp \
+ 		   imagepropertiesexif.cpp imagepropertieshistogram.cpp 
+ 
+-showfoto_LDADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) \
+-		   $(LIB_KFILE) $(LIB_KPARTS) $(LIBJPEG) \
+-		   $(top_builddir)/digikam/utilities/imageeditor/libimagecanvas.la \
++showfoto_LDADD = $(top_builddir)/digikam/utilities/imageeditor/libimagecanvas.la \
+ 		   $(top_builddir)/digikam/utilities/imageeditor/libshowfoto.la \
+ 		   $(top_builddir)/digikam/libs/histogram/libhistogram.la \
+ 		   $(top_builddir)/digikam/libs/widgets/libwidgets.la \
++		   $(top_builddir)/digikam/libs/curves/libcurves.la \
++		   $(top_builddir)/digikam/utilities/imageeditor/libimageeditor.la \
+ 		   $(top_builddir)/digikam/utilities/splashscreen/libsplashscreen.la \
+-		   $(top_builddir)/digikam/libs/thumbbar/libthumbbar.la 
++		   $(top_builddir)/digikam/libs/thumbbar/libthumbbar.la \
++		   $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) \
++		   $(LIB_KFILE) $(LIB_KPARTS) $(LIBJPEG)
+ 
+ showfoto_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+ #>- METASOURCES = AUTO  
+@@ -834,7 +838,7 @@
+ 	-rm -f  imagepropertiesexif.moc imageproperties.moc setup.moc imagepropertiesgeneral.moc setupplugins.moc imagepropertieshistogram.moc showfoto.moc setupeditor.moc
+ 
+ #>+ 2
+-KDE_DIST=imagepropertiesexif.h hi48-app-showfoto.png hi32-app-showfoto.png showfotoui.rc hi64-app-showfoto.png imagepropertieshistogram.h hi128-app-showfoto.png showfoto.kdevelop imagepropertiesgeneral.h setupeditor.h showfoto-splash.png setupplugins.h hi22-app-showfoto.png setup.h Makefile.in showfoto.h hi16-app-showfoto.png showfoto.desktop Makefile.am imageproperties.h 
++KDE_DIST=imagepropertiesgeneral.h setupeditor.h Makefile.in showfoto-splash.png hi32-app-showfoto.png showfotoui.rc imagepropertiesexif.h setupplugins.h hi22-app-showfoto.png hi64-app-showfoto.png showfoto.h hi48-app-showfoto.png imagepropertieshistogram.h hi16-app-showfoto.png showfoto.desktop hi128-app-showfoto.png showfoto.kdevelop setup.h Makefile.am imageproperties.h 
+ 
+ #>+ 2
+ docs-am:

More information about the Pkg-kde-commits mailing list