[Pkg-kde-commits] rev 913 - kde-extras/digikam/trunk/debian

[Mark Purcell]

Author: msp
Date: 2005-03-24 15:12:56 +0000 (Thu, 24 Mar 2005)
New Revision: 913

Modified:
   kde-extras/digikam/trunk/debian/TODO
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/control
   kde-extras/digikam/trunk/debian/digikam.manpage
Log:
Checkin digikam-0.7.2-2

Modified: kde-extras/digikam/trunk/debian/TODO
===================================================================
--- kde-extras/digikam/trunk/debian/TODO	2005-03-24 14:59:00 UTC (rev 912)
+++ kde-extras/digikam/trunk/debian/TODO	2005-03-24 15:12:56 UTC (rev 913)
@@ -1,20 +1,8 @@
-o check control before upload so _no_ version with ~ is left
-
-o (!) debian/control: add/fix versioned kipi-plugins conflict
-	<< first uploaded kipi-plugins version that links
-	against libkexif1
-
-o DONE add debian menu file for showfoto
-
-o DONE add GFDL copy to debian/copyright
-
-o DONE check for wrong usage of terms copyright/license
-
 Nice to have:
 
 o add .xpm add file for debian menu file.
 
-o digikam.desktop  is no freedesktop file.
+o digikam.desktop  is not freedesktop app desktop file.
 	f.d.o desktop files are converted by pkg menu-xdg to debian menu
 	compatible files: http://bugs.kde.org/show_bug.cgi?id=98466 and
 	#271562
@@ -54,52 +42,3 @@
 	    user and upstream will release digikam{,imageplugins}
 	    together in case of ABI changes.
 
---- outstanding minor issues of license review ------------------------
-
-sing copyright:
-
- digikam/thumbitem.cpp
- digikam/thumbitem.h
- digikam/thumbnailsize.h
- digikam/thumbview.cpp
- digikam/thumbview.h
- digikam/imadigikam-devel@lists.sourceforge.netgedescedit.h
- utilities/cameragui/mtqueue.h
- 
-no copyright year:
-
- digikam/albumfolderview.cpp Gilles
- digikam/albumfolderview.h "
- digikam/albumiconview.h  "
- digikam/albumsettings.cpp "
- digikam/albumsettings.h  "
- digikam/digikamapp.cpp  "
- digikam/digikamapp.h  "
- ... uhm and much more. Gilles please grep your self '//   Gilles...'
-     or ' *    Gilles ...'  ditto imageplugins, kioslave
-
-
- digikam/kipiinterface.cpp Renchi, Ralf Holzer
- kipiinterface.h   Renchi, Ralf Holzer
-
-        Curious: Why has Ralf Holzer a doemain ralfhoelzer?
-
-autor but no copyright
-
- digikam/digikamfirstrun.cpp Gilles
- digikam/digikam/digikamfirstrun.h "
- libs/themeengine/texture.cpp,h qt'ifier: forgot auth&C:  Renchi?
- utilities/setup/setupexif.cpp,.h ralf holzer
- digikam/utilities/setup/setupgeneral.h Gilles
-
-
-# DONE:
-#jpeg stuff (already fixed in CVS):
-#
-# digikam/utilities/cameragui/jinclude.h
-# -> add libjpeg README
-# -> add not to README file as required in license
-#
-#s/ bythe / by the / (already fixed in CVS)
-
-__END__

Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2005-03-24 14:59:00 UTC (rev 912)
+++ kde-extras/digikam/trunk/debian/changelog	2005-03-24 15:12:56 UTC (rev 913)
@@ -1,3 +1,10 @@
+digikam (0.7.2-2) unstable; urgency=low
+
+  * debian/TODO: clean
+  * digikam manpage: better --detect-camera description
+
+ -- Achim Bohnet <ach@mpe.mpg.de>  Thu, 10 Mar 2005 02:39:02 +0100
+
 digikam (0.7.2-1) unstable; urgency=low
 
   * new upstream release

Modified: kde-extras/digikam/trunk/debian/control
===================================================================
--- kde-extras/digikam/trunk/debian/control	2005-03-24 14:59:00 UTC (rev 912)
+++ kde-extras/digikam/trunk/debian/control	2005-03-24 15:12:56 UTC (rev 913)
@@ -10,7 +10,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, libimlib2-dev
 Recommends: digikamimageplugins, kipi-plugins, khelpcenter
-Conflicts: digikamimageplugins (<< 0.7.2), kipi-plugins (<< 0.1.0~beta2-1)
+Conflicts: digikamimageplugins (<< 0.7.2), kipi-plugins (<< 0.1+beta2-20)
 Description: digital photo management application for KDE
  Digikam is an easy to use and powerful digital photo management
  application, which makes importing, organizing and manipulating

Modified: kde-extras/digikam/trunk/debian/digikam.manpage
===================================================================
--- kde-extras/digikam/trunk/debian/digikam.manpage	2005-03-24 14:59:00 UTC (rev 912)
+++ kde-extras/digikam/trunk/debian/digikam.manpage	2005-03-24 15:12:56 UTC (rev 913)
@@ -25,7 +25,7 @@
 .SS "Options:"
 .TP
 \fB\-\-detect\-camera\fR
-Automatically detect and open camera
+Automatically detect and open picture download dialog
 .SS "Generic options:"
 .TP
 \fB\-\-help\fR