[Pkg-kde-commits] rev 1846 - in kde-extras/digikam/trunk/debian: .
patches
Achim Bohnet
ach-guest at costa.debian.org
Thu Sep 22 00:23:45 UTC 2005
Author: ach-guest
Date: 2005-09-22 00:23:45 +0000 (Thu, 22 Sep 2005)
New Revision: 1846
Added:
kde-extras/digikam/trunk/debian/patches/01_fix_keyboardfocus_in_albumview.diff
Removed:
kde-extras/digikam/trunk/debian/patches/00_showfoto_enable-final-fix.diff
kde-extras/digikam/trunk/debian/patches/visibility.diff
Modified:
kde-extras/digikam/trunk/debian/changelog
kde-extras/digikam/trunk/debian/control
kde-extras/digikam/trunk/debian/rules
Log:
digikam 0.8 beta2:
o first go to pkg
o add TODO-before-release items to changelog
Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog 2005-09-21 23:04:23 UTC (rev 1845)
+++ kde-extras/digikam/trunk/debian/changelog 2005-09-22 00:23:45 UTC (rev 1846)
@@ -1,9 +1,41 @@
-digikam (0.7.4-6) UNRELEASED; urgency=low
+digikam (0.8.0-0beta2-1) UNRELEASED; urgency=low
* NOT RELEASED YET
+ * ++++++++++++++ Temp. entries remove before release +++++++++++++
+ * Note:
+ o use branch/0.7.4 for parallel 0.7.4 release
+ o 0.8.0-1 is _not_ greater than 0.8.0-0beta1-1, so in case
+ an upload to unstable version should be changed to 0.8-beta2
+ or 0.7.4+0.8-beta2
+ o Mark: in 0.7.5-5 upload Debian KDE Extras Team was changed to
+ Mark Purcell. I guess your upload script need 'team' adaption ;)
+ * TODO:
+ o check copyright/license of new files, update debian/copyright
+ * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- -- Mark Purcell <msp at debian.org> Sat, 17 Sep 2005 22:31:03 +0100
+ * New upstream release
+ * Merge 0.7.4-5 packaging and changes
+ * build-deps on libkipi and libkexif: remove versioned dependency. No
+ longer necessary
+ * conflict with all digikamimageplugin releases << 0.8
+ * Remove patches:
+ o 00_showfoto_enable-final-fix.diff: was applied upstream
+ o visibility.diff: new admin/* disables automaticly visibility
+ because qt isn't compiled with visibility enabled
+ * New patch 01_fix_keyboardfocus_in_albumview.diff: stolen from
+ upstream svn. Fixes KDE bug #112971.
+ * disable --enable-final, it is broken again.
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> Thu, 22 Sep 2005 01:24:52 +0200
+
+digikam (0.8.0-0beta1-1) experimental; urgency=low
+
+ * New upstream release
+ * Beta package to experimental
+ * Backout Package split: libdigikam-dev & libdigikam0 (See #324592)
+
+ -- Mark Purcell <msp at debian.org> Fri, 2 Sep 2005 22:06:04 +0100
+
digikam (0.7.4-5) unstable; urgency=low
[ Debian KDE Extras Team ]
@@ -30,14 +62,6 @@
-- Mark Purcell <msp at debian.org> Sat, 17 Sep 2005 22:09:19 +0100
-digikam (0.8.0-0beta1-1) experimental; urgency=low
-
- * New upstream release
- * Beta package to experimental
- * Backout Package split: libdigikam-dev & libdigikam0 (See #324592)
-
- -- Mark Purcell <msp at debian.org> Fri, 2 Sep 2005 22:06:04 +0100
-
digikam (0.7.4-4) unstable; urgency=low
* Add Depends: to libdigikam0 package as requested by NEW
Modified: kde-extras/digikam/trunk/debian/control
===================================================================
--- kde-extras/digikam/trunk/debian/control 2005-09-21 23:04:23 UTC (rev 1845)
+++ kde-extras/digikam/trunk/debian/control 2005-09-22 00:23:45 UTC (rev 1846)
@@ -2,7 +2,7 @@
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>, Paul Telford <pxt at debian.org>
-Build-Depends: debhelper (>> 4.1), cdbs, kdelibs4-dev, libimlib2-dev, libexif-dev (>> 0.6.9), libtiff4-dev, libgphoto2-2-dev, libgdbm-dev, libkexif1-dev (>= 0.2-1), libkipi0-dev (>= 0.1-1), automake1.9
+Build-Depends: debhelper (>> 4.1), cdbs, kdelibs4-dev, libimlib2-dev, libexif-dev (>> 0.6.9), libtiff4-dev, libgphoto2-2-dev, libgdbm-dev, libkexif1-dev, libkipi0-dev, automake1.9, libsqlite3-dev
Standards-Version: 3.6.2
Package: digikam
@@ -11,7 +11,7 @@
Depends: ${shlibs:Depends}
Recommends: digikamimageplugins, kipi-plugins, kdeprint, konqueror
Suggests: digikam-doc
-Conflicts: digikamimageplugins (<< 0.7.2.9999), kipi-plugins (<< 0.1+beta2-20), libdigikam0 (<< 0.8), libdigikam-dev (<< 0.8)
+Conflicts: digikamimageplugins (<< 0.8.0), kipi-plugins (<< 0.1+beta2-20), libdigikam0 (<< 0.8), libdigikam-dev (<< 0.8)
Replaces: libdigikam0 (<< 0.8), libdigikam-dev (<< 0.8)
Description: digital photo management application for KDE
Digikam is an easy to use and powerful digital photo management
Deleted: kde-extras/digikam/trunk/debian/patches/00_showfoto_enable-final-fix.diff
Added: kde-extras/digikam/trunk/debian/patches/01_fix_keyboardfocus_in_albumview.diff
===================================================================
--- kde-extras/digikam/trunk/debian/patches/01_fix_keyboardfocus_in_albumview.diff 2005-09-21 23:04:23 UTC (rev 1845)
+++ kde-extras/digikam/trunk/debian/patches/01_fix_keyboardfocus_in_albumview.diff 2005-09-22 00:23:45 UTC (rev 1846)
@@ -0,0 +1,29 @@
+Index: digikam/digikam/iconview.cpp
+===================================================================
+--- digikam/digikam/iconview.cpp (revision 462604)
++++ digikam/digikam/iconview.cpp (revision 462605)
+@@ -516,12 +516,19 @@
+
+ delete [] groups;
+
+- // set the currItem to first item
+-
+- d->currItem = 0;
+- if (d->firstGroup)
+- d->currItem = d->firstGroup->firstItem();
++ if (!d->currItem)
++ {
++ // set the currItem to first item
++ if (d->firstGroup)
++ d->currItem = d->firstGroup->firstItem();
++ }
+ d->anchorItem = d->currItem;
++
++ if (d->currItem)
++ {
++ d->currItem->setSelected(true, true);
++ ensureItemVisible(d->currItem);
++ }
+ }
+
+ void IconView::slotUpdate()
Deleted: kde-extras/digikam/trunk/debian/patches/visibility.diff
Modified: kde-extras/digikam/trunk/debian/rules
===================================================================
--- kde-extras/digikam/trunk/debian/rules 2005-09-21 23:04:23 UTC (rev 1845)
+++ kde-extras/digikam/trunk/debian/rules 2005-09-22 00:23:45 UTC (rev 1846)
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
-DEB_CONFIGURE_USER_FLAGS = --disable-debug --enable-final
+DEB_CONFIGURE_USER_FLAGS = --disable-debug
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
More information about the pkg-kde-commits
mailing list