rev 14360 - in kde-extras/digikam: branches trunk/debian
Mark Purcell
msp at alioth.debian.org
Sat Apr 11 01:36:25 UTC 2009
Author: msp
Date: 2009-04-11 01:36:25 +0000 (Sat, 11 Apr 2009)
New Revision: 14360
Added:
kde-extras/digikam/trunk/debian/digikamthemedesigner.manpage
kde-extras/digikam/trunk/debian/patches/
Removed:
kde-extras/digikam/branches/kde4/
Modified:
kde-extras/digikam/trunk/debian/NEWS
kde-extras/digikam/trunk/debian/changelog
kde-extras/digikam/trunk/debian/control
kde-extras/digikam/trunk/debian/digikam.install
kde-extras/digikam/trunk/debian/digikam.manpages
kde-extras/digikam/trunk/debian/rules
kde-extras/digikam/trunk/debian/showfoto.install
kde-extras/digikam/trunk/debian/showfoto.manpage
kde-extras/digikam/trunk/debian/watch
Log:
Merge branches/kde4 changes r11315:14359 into trunk
Modified: kde-extras/digikam/trunk/debian/NEWS
===================================================================
--- kde-extras/digikam/trunk/debian/NEWS 2009-04-11 01:22:36 UTC (rev 14359)
+++ kde-extras/digikam/trunk/debian/NEWS 2009-04-11 01:36:25 UTC (rev 14360)
@@ -1,6 +1,19 @@
+digikam (2:0.10.0~beta1-1) experimental; urgency=low
+
+ To quote upstream:
+
+ Take care, it's a BETA code with many of new bugs not yet fixed...
+ To resume:
+
+ DO NOT USE YET IN PRODUCTION ...
+
+ for production, use KDE3 with 0.9.4, which is still mantained
+
+ -- Mark Purcell <msp at debian.org> Thu, 17 Jul 2008 22:58:21 +1000
+
digikam (2:0.9.2~beta1-2) unstable; urgency=low
- * Upstream have merged the digikamimageplugins with digikam
+ Upstream have merged the digikamimageplugins with digikam
and all are provided in the one application package, digikam.
Don't be concerned that this version of digikam Conflicts:/
Replaces: digikamimageplugins
Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog 2009-04-11 01:22:36 UTC (rev 14359)
+++ kde-extras/digikam/trunk/debian/changelog 2009-04-11 01:36:25 UTC (rev 14360)
@@ -1,3 +1,35 @@
+digikam (2:0.10.0-3) UNRELEASED; urgency=low
+
+ * NOT RELEASED YET
+
+ -- Mark Purcell <msp at debian.org> Tue, 07 Apr 2009 21:17:12 +1000
+
+digikam (2:0.10.0-2) unstable; urgency=low
+
+ [ Luka Renko ]
+ * Merge all remaining changes from Ubuntu:
+ - Depends: kde-icons-oxygen dropped (included through kdelibs)
+ - Recommends: kipi-plugins added (provides major functionality)
+ - debian/digikamthemedesigner.manpage: add missing manpage
+
+ [ Mark Purcell ]
+ * Upload to unstable - KDE4 is here ;-)
+
+ -- Mark Purcell <msp at debian.org> Tue, 07 Apr 2009 19:35:12 +1000
+
+digikam (2:0.10.0-1) experimental; urgency=low
+
+ * New upstream release
+ - Fixes "digiKam 0.10.0 Release Plan (KDE4)" (Closes: #494270)
+ - Fixes "missing 0.10.0~rc2 binary for amd64" (Closes: #517455)
+ * Recommends: dolphin (Open FileManager), www-browser (ReportBug, About)
+ * digikam uses marble plugins provided by libmarble4 now
+ - Fixes "Digikam (experimental) doesn't work at all" (Closes: #491458)
+ * digikam-dbg Section: debug
+ * Build-Depends: liblensfun-dev
+
+ -- Mark Purcell <msp at debian.org> Tue, 17 Mar 2009 22:17:58 +1100
+
digikam (2:0.9.5-1) unstable; urgency=low
* New upstream release
@@ -5,6 +37,52 @@
-- Mark Purcell <msp at debian.org> Tue, 17 Mar 2009 21:44:03 +1100
+digikam (2:0.10.0~rc2-1) experimental; urgency=low
+
+ * New upstream release
+ - Upload rc to experimental
+ * Remove Depends: marble-data (provided by libmarble4)
+ * Update debian/watch to handle ~rc/~beta versions
+
+ -- Mark Purcell <msp at debian.org> Tue, 17 Feb 2009 00:11:37 +1100
+
+digikam (2:0.10.0~rc1-1) experimental; urgency=low
+
+ * New upstream release
+ - Fixes "please give a refresh do kde4 version" (Closes: #504490)
+ - Fixes "Fails to update digikam3 database to digikam4 (db format 4 to
+ 5)" (Closes: #506564)
+ - Fixes "is build against libkipi5 but libkipi6 is actual in
+ experimental" (Closes: #513395)
+ * Rework debian/*.install
+ * Do not ship oxygen icons - Depend kde-icons-oxygen
+ * Update Vcs for KDE4
+ * Build-Depends: pkg-kde-tools
+ * Build without lensfuns support while we await NEW
+ * Update Description to KDE4 standard
+ * Depends: marble-data (>= 4:4.1.85)
+ - digikam -- missing dependency on marble-data (Closes: #496579)
+ * Update Build-Depends for KDE 4.2
+ * Add {misc:Depends} fixes debhelper-but-no-misc-depends
+ * Update to Standards 3.8.0 - no changes
+ * Fix hyphen-used-as-minus-sign usr/share/man/man1/showfoto.1.gz:92
+ * Add Build-Depends: liblensfun-dev
+
+ -- Mark Purcell <msp at debian.org> Thu, 29 Jan 2009 19:53:33 +1100
+
+digikam (2:0.10.0~beta2-1) experimental; urgency=low
+
+ * New Upstream Release
+ * Included upstream: debian/patches/link-pthread.patch
+ * Include usr/share/kde4 in digikam.install
+ - Digikam (experimental) doesn't work at all (Closes: #491458)
+ * Cleanup Depends:/ Recommends:/ COnflicts:
+ - please remove the recommand line that mostly recommaneds kde3
+ pakcakge (Closes: #491741)
+ * Build with libmarble-dev again
+
+ -- Mark Purcell <msp at debian.org> Tue, 19 Aug 2008 20:05:43 +1000
+
digikam (2:0.9.5~beta3-1) unstable; urgency=low
* New upstream release
@@ -34,6 +112,30 @@
-- Mark Purcell <msp at debian.org> Tue, 08 Jul 2008 13:01:17 +1000
+digikam (2:0.10.0~beta1-1) experimental; urgency=low
+
+ * New upstream release
+ * Fixed upstream by KDE4 release:
+ - does not understand ACLs (Closes: #405546)
+ - Calendar view icons are question mark icons (Closes: #487573)
+ - cannot delete or move photos to trash or another folder (file
+ permisions are ok) (Closes: #440250)
+ - installing kde4 will remove digikam because of dependencies on
+ libkipi0 and kipi-plugins (Closes: #489349)
+ - Digikam hangs trying to generate a thumbnail for *.MOV movies within
+ the camera [ basic USB access ] (Closes: #332224)
+ - jpeg image with attached audio - possible to support? (Closes:
+ #337901)
+ * Update KDE4 build-depends
+ * Force -lpthread with ${CMAKE_THREAD_LIBS_INIT}; link-pthread.patch
+ * Refresh debian/*.install for KDE4
+ * Build-Conflicts: libmarble-dev
+ (Debian version crashes digikam -
+ http://mail.kde.org/pipermail/digikam-devel/2008-July/019748.html)
+ * Depends: libqt4-sql-sqlite: TODO change to system QT4 sqlite
+
+ -- Mark Purcell <msp at debian.org> Sat, 05 Jul 2008 10:31:00 +1000
+
digikam (2:0.9.4~rc1-1) experimental; urgency=low
* New upstream release
Modified: kde-extras/digikam/trunk/debian/control
===================================================================
--- kde-extras/digikam/trunk/debian/control 2009-04-11 01:22:36 UTC (rev 14359)
+++ kde-extras/digikam/trunk/debian/control 2009-04-11 01:36:25 UTC (rev 14360)
@@ -3,49 +3,61 @@
Priority: optional
Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
Uploaders: Achim Bohnet <ach at mpe.mpg.de>, Mark Purcell <msp at debian.org>, Fathi Boudra <fabo at debian.org>
-Build-Depends: cdbs, debhelper (>= 7), kdelibs4-dev,
- libtiff4-dev, libgphoto2-2-dev, libkipi0-dev,
- libsqlite3-dev, liblcms1-dev, libltdl3-dev, libkexiv2-dev (>= 0.1.6),
- libjasper-dev, libpng12-dev | libpng-dev, libexiv2-dev (>= 0.16),
- libkdcraw-dev (>= 0.1.6)
+Build-Depends: cdbs, debhelper (>= 7), pkg-kde-tools, cmake (>= 2.6.2),
+ libqt4-dev (>= 4.4), kdelibs5-dev,
+ libgphoto2-2-dev (>= 2.4),
+ libkipi6-dev, libkexiv2-7-dev, libkdcraw7-dev,
+ liblcms1-dev, libtiff4-dev, libpng12-dev,
+ libjasper-dev,
+ kdepimlibs5-dev,
+ liblensfun-dev,
+ libmarble-dev,
+ libsqlite3-dev,
+ libltdl3-dev
Standards-Version: 3.8.0
-Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/digikam/trunk/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/digikam/?op=log
+Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/digikam/branches/kde4
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/digikam/branches/kde4?op=log
Homepage: http://www.digikam.org
Package: digikam
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, kdebase-kio-plugins
-Recommends: kipi-plugins, kdeprint, konqueror
+Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-sql-sqlite
+Recommends: dolphin, www-browser, kipi-plugins
Suggests: digikam-doc
-Conflicts: digikamimageplugins, kipi-plugins (<= 0.1.3~rc0), libkexiv2-0, libexiv2-0.12
-Replaces: digikamimageplugins
Description: digital photo management application for KDE
- An easy to use and powerful digital photo management
- application, which makes importing, organizing and manipulating
- digital photos a "snap". An interface is provided to connect to
- your digital camera, preview the images and download and/or
- delete them.
+ Digital photo management program designed to import, organize, enhance, search
+ and export your digital images to and from your computer.
.
- The digiKam built-in image editor makes the common photo correction
- a simple task. The image editor is extensible via plugins and,
- the digikamimageplugins project has been merged to digiKam core
- since release 0.9.2, all useful image editor plugins are available
- in the base installation.
+ Some of the new features in this release of digiKam include (compared to
+ digiKam 0.9.4):
+ Designed from the ground-up for KDE4, using KDE4 technology:
+ Hardware handling with KDE4's Solid interface
+ More comprehensive multimedia file handling using KDE4's Phonon interface
+ Easy Geolocation with KDE4's Marble interface
+ XMP metadata support
+ TIFF/EP RAW metadata editing
+ Customizable file storage for the digiKam database, supporting remote albums
+ Support of multiple root album paths (no more importing into one giant album)
+ Thumbnail-bar integration for easy navigation and editing
+ Supports the latest camera RAW files
.
+ New/revamped tools:
+ Revamped camera import wizard
+ LensFun integration: auto-correction of lens distortion
+ Fuzzy searches based on hand-drawn sketches
+ Advanced searches using image meta-information, like keywords and dates
+ Map searching that gives you the power to search for global photo locations
+ Advanced searches for duplicate and similar images
+ .
digiKam can also make use of the KIPI image handling plugins to
extend its capabilities even further for photo manipulations,
import and export, etc. The kipi-plugins package contains many
very useful extentions.
- .
- digiKam is based in part on the work of the Independent JPEG Group.
Package: showfoto
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, digikam (= ${binary:Version})
-Recommends: kipi-plugins, kdeprint, konqueror
-Replaces: digikam (<= 2:0.9.0-1)
-Conflicts: digikam (<= 2:0.9.0-1), digikamimageplugins (<< 2:0.9.0~rc2)
+Recommends: dolphin, kipi-plugins
Description: image viewer/editor for KDE
Showphoto is the standalone image editor of the digiKam project.
.
@@ -55,7 +67,7 @@
Package: digikam-dbg
Architecture: any
Section: debug
-Depends: ${shlibs:Depends}, ${misc:Depends}, digikam (= ${binary:Version}), showfoto (= ${binary:Version}), kdelibs-dbg
+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
Modified: kde-extras/digikam/trunk/debian/digikam.install
===================================================================
--- kde-extras/digikam/trunk/debian/digikam.install 2009-04-11 01:22:36 UTC (rev 14359)
+++ kde-extras/digikam/trunk/debian/digikam.install 2009-04-11 01:36:25 UTC (rev 14360)
@@ -1,12 +1,13 @@
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/icons/hicolor/*/apps/digikam.png
+usr/share/applications/kde4/digikam.desktop
+
+# Oxygen Icons allready in kde-icons-oxygen
+#usr/share/icons/oxygen/*/actions
+#usr/share/icons/oxygen/*/apps/digikam.*
+
usr/share/locale
-usr/share/servicetypes/digikamimageplugin.desktop
-usr/share/services
+usr/share/kde4
debian/xpm.d/digikam.xpm usr/share/pixmaps/
debian/xpm.d/digikam-16.xpm usr/share/pixmaps/
Modified: kde-extras/digikam/trunk/debian/digikam.manpages
===================================================================
--- kde-extras/digikam/trunk/debian/digikam.manpages 2009-04-11 01:22:36 UTC (rev 14359)
+++ kde-extras/digikam/trunk/debian/digikam.manpages 2009-04-11 01:36:25 UTC (rev 14360)
@@ -1,2 +1,3 @@
debian/digikam.manpage
-debian/tmp/usr/share/man/man1/digitaglinktree.1
+debian/digikamthemedesigner.manpage
+debian/tmp/usr/share/man/man1/*
Copied: kde-extras/digikam/trunk/debian/digikamthemedesigner.manpage (from rev 14356, kde-extras/digikam/branches/kde4/debian/digikamthemedesigner.manpage)
===================================================================
--- kde-extras/digikam/trunk/debian/digikamthemedesigner.manpage (rev 0)
+++ kde-extras/digikam/trunk/debian/digikamthemedesigner.manpage 2009-04-11 01:36:25 UTC (rev 14360)
@@ -0,0 +1,61 @@
+.TH digikam "1" "Jan 2009" "digikam 0.10.0" "User Commands"
+.SH NAME
+digikamthemedesigner \- theme designer for Digikam
+.SH SYNOPSIS
+.B digikamthemedesigner
+[\fIQt\-options\fR] [\fIKDE\-options\fR] [URL]
+.SH DESCRIPTION
+Digikam is an easy to use and powerful digital photo management
+application, which makes importing, organizing and editing
+digital photos a "snap". An easy to use interface is provided
+to connect to your digital camera, preview the images and download
+and/or delete them.
+.PP
+Digikam theme designer can be used to create new Digikam themes.
+Now you can change colors of all Digikam elements.
+.PP
+.SS "Options:"
+.TP
+\fBURL\fR
+Theme color scheme file to open.
+.TP
+.SS "Generic options:"
+.TP
+\fB\-\-help\fR
+Show help about options
+.TP
+\fB\-\-help\-qt\fR
+Show Qt specific options
+.TP
+\fB\-\-help\-kde\fR
+Show KDE specific options
+.TP
+\fB\-\-help\-all\fR
+Show all options
+.TP
+\fB\-\-author\fR
+Show author information
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Show version information
+.TP
+\fB\-\-license\fR
+Show license information
+.TP
+\fB\-\-\fR
+End of options
+.SH "SEE ALSO"
+The full documentation for
+.B digikam
+is maintained as a html manual in the package digikam-doc. The command
+.IP
+.B khelpcenter help:/digikam
+.PP
+gives you access to the complete manual.
+.SH AUTHOR
+.B digikamthemedesigner
+was written by Renchi Raju and many others (see
+/usr/share/doc/digikam/AUTHORS for details).
+.PP
+This manual page was prepared by Luka Renko <lure at kubuntu.org> for the Debian
+GNU/Linux system (but may be used by others).
Modified: kde-extras/digikam/trunk/debian/rules
===================================================================
--- kde-extras/digikam/trunk/debian/rules 2009-04-11 01:22:36 UTC (rev 14359)
+++ kde-extras/digikam/trunk/debian/rules 2009-04-11 01:36:25 UTC (rev 14360)
@@ -1,14 +1,13 @@
#!/usr/bin/make -f
+include /usr/share/pkg-kde-tools/makefiles/1/cdbs/kde.mk
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/cdbs/1/class/kde.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
DEB_CONFIGURE_EXTRA_FLAGS := --without-included-sqlite3
-
DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed"
DEB_KDE_ENABLE_FINAL := yes
Modified: kde-extras/digikam/trunk/debian/showfoto.install
===================================================================
--- kde-extras/digikam/trunk/debian/showfoto.install 2009-04-11 01:22:36 UTC (rev 14359)
+++ kde-extras/digikam/trunk/debian/showfoto.install 2009-04-11 01:36:25 UTC (rev 14360)
@@ -1,6 +1,7 @@
usr/bin/showfoto
-usr/share/apps/showfoto
-usr/share/applications/kde/showfoto.desktop
-usr/share/icons/hicolor/*/apps/showfoto.png
+usr/share/applications/kde4/showfoto.desktop
+
+# Oxygen allready in KDE
+#usr/share/icons/oxygen/*/apps/showfoto.*
debian/xpm.d/showfoto.xpm usr/share/pixmaps/
debian/xpm.d/showfoto-16.xpm usr/share/pixmaps/
Modified: kde-extras/digikam/trunk/debian/showfoto.manpage
===================================================================
--- kde-extras/digikam/trunk/debian/showfoto.manpage 2009-04-11 01:22:36 UTC (rev 14359)
+++ kde-extras/digikam/trunk/debian/showfoto.manpage 2009-04-11 01:36:25 UTC (rev 14360)
@@ -89,7 +89,7 @@
.TP
.B \-\-dograb
running under a debugger can cause an implicit
--nograb, use -dograb to override
+\-nograb, use \-dograb to override
.TP
.B \-\-sync
switches to synchronous mode for debugging
Modified: kde-extras/digikam/trunk/debian/watch
===================================================================
--- kde-extras/digikam/trunk/debian/watch 2009-04-11 01:22:36 UTC (rev 14359)
+++ kde-extras/digikam/trunk/debian/watch 2009-04-11 01:36:25 UTC (rev 14360)
@@ -1,7 +1,5 @@
# See uscan(1) for format
-
-# Compulsory line, this is a version 3 file
version=3
-opts=uversionmangle=s/-/~/ \
- http://sf.net/digikam/digikam-(0.9.*)\.tar\.bz2 debian svn-upgrade
+opts=uversionmangle=s/-/~/ \
+ http://sf.net/digikam/digikam-(\d+.*)\.tar\.bz2 debian svn-upgrade
More information about the pkg-kde-commits
mailing list