[pkg-kde-commits] rev 2831 - in kde-extras/digikam/trunk/debian: . patches

[Achim Bohnet]

Author: ach-guest
Date: 2006-01-12 02:39:12 +0000 (Thu, 12 Jan 2006)
New Revision: 2831

Removed:
   kde-extras/digikam/trunk/debian/patches/10_kdesvn_r485500_efficient_printing.diff
   kde-extras/digikam/trunk/debian/patches/11_kdesvn_r492446_properly_restore_albumtree.diff
Modified:
   kde-extras/digikam/trunk/debian/TODO
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/copyright
   kde-extras/digikam/trunk/debian/digikam.manpage
   kde-extras/digikam/trunk/debian/rules
Log:
digikam: prepare final 0.8.1 pkging with the rc1 tarball
   o merge patch from Tom with slight modifications.
   o added changelog entries (Tom rework them as you like)

	[ Tom Albers ]
	* New upstream release
	* digikam.manpage: add new option --download-from
	* copyright: update upstream authors, add yours truely to
	  debian packagers
	* rules: enable enable-final build again

   o remove patches included now rc1 tarball (were never in a released pkg):

	   debian/patches/11_kdesvn_r492446_properly_restore_albumtree.diff
	   debian/patches/10_kdesvn_r485500_efficient_printing.diff


Modified: kde-extras/digikam/trunk/debian/TODO
===================================================================
--- kde-extras/digikam/trunk/debian/TODO	2006-01-11 22:08:57 UTC (rev 2830)
+++ kde-extras/digikam/trunk/debian/TODO	2006-01-12 02:39:12 UTC (rev 2831)
@@ -9,11 +9,6 @@
 	+ Is abose worth  Depends or Recomends or Suggests
   	  for non KDE Desktop installations?
 
-o 0.8.0 did not build with --enable-final. Upstream fixed it, 
-  check it, and enable it again. 
-
-o Upstream added a --download-from parameter, adjust man page
-
 Nice to have
 ------------
 

Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2006-01-11 22:08:57 UTC (rev 2830)
+++ kde-extras/digikam/trunk/debian/changelog	2006-01-12 02:39:12 UTC (rev 2831)
@@ -1,10 +1,11 @@
-digikam (0.8.0-1-2) UNRELEASED; urgency=low
+digikam (0.8.1~rc1-1) UNRELEASED; urgency=low
 
-  [ Achim Bohnet ]
-  * patches/10_kdesvn_r485500_efficient_printing.diff
-    grab Anders Lunds patch to speed up printing from stable branch
-  * patches/11_kdesvn_r492446_properly_restore_albumtree.diff (fixes
-    upstream bug 117401)
+  [ Tom Albers ]
+  * New upstream release 
+  * digikam.manpage: add new option --download-from
+  * copyright: update upstream authors, add yours truely to
+    debian packagers
+  * rules: enable enable-final build again
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Fri, 30 Dec 2005 23:48:53 +0100
 

Modified: kde-extras/digikam/trunk/debian/copyright
===================================================================
--- kde-extras/digikam/trunk/debian/copyright	2006-01-11 22:08:57 UTC (rev 2830)
+++ kde-extras/digikam/trunk/debian/copyright	2006-01-12 02:39:12 UTC (rev 2831)
@@ -5,12 +5,15 @@
 Debian packagers:
   Copyright 2002 Renchi Raju Renchi Raju <renchi at pooh.tam.uiuc.edu>
   Copyright 2003,2004 Paul Telford <pxt at debian.org>
-  Copyright 2003,2004,2005 Achim Bohnet <ach at mpe.mpg.de>
+  Copyright 2003,2004,2005,2006 Achim Bohnet <ach at mpe.mpg.de>
+  Copyright 2006 Tom Albers <tomalbers at kde.nl>
 
 
-Primary upstream author is:
+Primary upstream authors are:
 
-  Renchi Raju <renchi at pooh.tam.uiuc.edu>
+  Gilles Caulier <caulier dot gilles at free.fr>
+  Jörn Ahrens <kde at jokele.de>
+  Tom Albers <tomalbers at kde.nl> 
   
 for details on authorship see the /usr/share/doc/digikam/AUTHORS file.
 

Modified: kde-extras/digikam/trunk/debian/digikam.manpage
===================================================================
--- kde-extras/digikam/trunk/debian/digikam.manpage	2006-01-11 22:08:57 UTC (rev 2830)
+++ kde-extras/digikam/trunk/debian/digikam.manpage	2006-01-12 02:39:12 UTC (rev 2831)
@@ -28,6 +28,9 @@
 Automatically detect and open picture download dialog. Note:
 autodetection does not work with cameras that claim to be
 USB mass storage devices.
+.TP
+\fB\-\-download\-from  <path>\fR
+Open camera dialog at <path>
 .SS "Generic options:"
 .TP
 \fB\-\-help\fR

Deleted: kde-extras/digikam/trunk/debian/patches/10_kdesvn_r485500_efficient_printing.diff

Deleted: kde-extras/digikam/trunk/debian/patches/11_kdesvn_r492446_properly_restore_albumtree.diff

Modified: kde-extras/digikam/trunk/debian/rules
===================================================================
--- kde-extras/digikam/trunk/debian/rules	2006-01-11 22:08:57 UTC (rev 2830)
+++ kde-extras/digikam/trunk/debian/rules	2006-01-12 02:39:12 UTC (rev 2831)
@@ -3,9 +3,11 @@
 DEB_CONFIGURE_USER_FLAGS = --disable-debug
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+#include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/kde.mk
 
+DEB_KDE_ENABLE_FINAL = yes
+
 DEB_INSTALL_MANPAGES_digikam = debian/digikam.manpage debian/showfoto.manpage
 
 install/digikam::