rev 14602 - kde-extras/kphotoalbum/trunk/debian

Fathi Boudra fabo at alioth.debian.org
Tue May 12 10:07:12 UTC 2009 

Author: fabo
Date: 2009-05-12 10:07:11 +0000 (Tue, 12 May 2009)
New Revision: 14602

Removed:
   kde-extras/kphotoalbum/trunk/debian/README.Debian
   kde-extras/kphotoalbum/trunk/debian/patches/
Modified:
   kde-extras/kphotoalbum/trunk/debian/changelog
   kde-extras/kphotoalbum/trunk/debian/compat
   kde-extras/kphotoalbum/trunk/debian/control
   kde-extras/kphotoalbum/trunk/debian/copyright
   kde-extras/kphotoalbum/trunk/debian/rules
Log:
Upload to kphotoalbum to Sid.

  * New upstream release:
    - dialog layout code rewrite (Closes: #451330).
    - Initial KDE 4 version (Closes: #507235).

  * Remove patches (not needed).
  * Bump compat to 7.
  * Update debian/control:
    - Switch from kde section to graphics.
    - Remove quilt and libkexif1-dev build dependencies.
    - Bump debhelper to 7.
    - Add cmake and pkg-kde-tools build dependencies.
    - Bump libexiv2 buil dependency to 0.18.
    - Replace libkdcraw-dev build dependency by libkdcraw7-dev.
    - Replace libkipi0-dev build dependency by libkipi6-dev.
    - Add libjpeg62-dev, libmarble-dev and x11proto-core-dev build
      dependencies.
    - Bump Standards-Version from 3.7.3 to 3.8.1 (no changes needed).
    - Replace libqt3-mt-sqlitea nd sqlite dependencies by libqt4-sql-sqlite.
    - Remove deprecated kimdaba conflicts/replaces/provides.
    - Add mplayerthumbs suggests.
  * Update debian/copyright:
    - Remove Dave Coffin.
    - Add Henner Zeller.
    - Update GPL version and years.
  * Update debian/rules:
    - Use pkg-kde-tools kde.mk.
    - Remove patchsys-quilt.pk (not used).


Modified: kde-extras/kphotoalbum/trunk/debian/changelog
===================================================================
--- kde-extras/kphotoalbum/trunk/debian/changelog	2009-05-12 09:50:24 UTC (rev 14601)
+++ kde-extras/kphotoalbum/trunk/debian/changelog	2009-05-12 10:07:11 UTC (rev 14602)
@@ -1,11 +1,38 @@
 kphotoalbum (4.0-1) unstable; urgency=low
 
-  * New upstream release.
+  * New upstream release
+    - dialog layout code rewrite (Closes: #451330).
+    - Initial KDE 4 version (Closes: #507235).
 
+  [ Fathi Boudra ]
+  * Remove patches (not needed).
+  * Bump compat to 7.
+  * Update debian/control:
+    - Switch from kde section to graphics.
+    - Remove quilt and libkexif1-dev build dependencies.
+    - Bump debhelper to 7.
+    - Add cmake and pkg-kde-tools build dependencies.
+    - Bump libexiv2 buil dependency to 0.18.
+    - Replace libkdcraw-dev build dependency by libkdcraw7-dev.
+    - Replace libkipi0-dev build dependency by libkipi6-dev.
+    - Add libjpeg62-dev, libmarble-dev and x11proto-core-dev build
+      dependencies.
+    - Bump Standards-Version from 3.7.3 to 3.8.1 (no changes needed).
+    - Replace libqt3-mt-sqlitea nd sqlite dependencies by libqt4-sql-sqlite.
+    - Remove deprecated kimdaba conflicts/replaces/provides.
+    - Add mplayerthumbs suggests.
+  * Update debian/copyright:
+    - Remove Dave Coffin.
+    - Add Henner Zeller.
+    - Update GPL version and years.
+  * Update debian/rules:
+    - Use pkg-kde-tools kde.mk.
+    - Remove patchsys-quilt.pk (not used).
+
   [ Mark Purcell ]
   * Refresh debian/watch
 
- -- Fathi Boudra <fabo at debian.org>  Tue, 12 May 2009 10:29:47 +0200
+ -- Fathi Boudra <fabo at debian.org>  Tue, 12 May 2009 10:15:39 +0200
 
 kphotoalbum (3.1.1-2) unstable; urgency=low
 
@@ -148,4 +175,3 @@
   * Missing manpage added.
 
  -- David L. Moreno <david.lopez.moreno at hispalinux.es>  Sun,  9 May 2004 18:00:54 +0200
-

Modified: kde-extras/kphotoalbum/trunk/debian/compat
===================================================================
--- kde-extras/kphotoalbum/trunk/debian/compat	2009-05-12 09:50:24 UTC (rev 14601)
+++ kde-extras/kphotoalbum/trunk/debian/compat	2009-05-12 10:07:11 UTC (rev 14602)
@@ -1 +1 @@
-5
+7

Modified: kde-extras/kphotoalbum/trunk/debian/control
===================================================================
--- kde-extras/kphotoalbum/trunk/debian/control	2009-05-12 09:50:24 UTC (rev 14601)
+++ kde-extras/kphotoalbum/trunk/debian/control	2009-05-12 10:07:11 UTC (rev 14602)
@@ -1,22 +1,22 @@
 Source: kphotoalbum
-Section: kde
+Section: graphics
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fabo at debian.org>, Mark Purcell <msp at debian.org>
-Build-Depends: cdbs, debhelper (>= 5), quilt, docbook-to-man,
- libexiv2-dev (>= 0.16), libkdcraw-dev (>= 0.1.4), libkexif1-dev (>= 0.1.6), libkipi0-dev
-Standards-Version: 3.7.3
+Build-Depends: cdbs, debhelper (>= 7), cmake, pkg-kde-tools, docbook-to-man,
+ libexiv2-dev (>= 0.18), libjpeg62-dev, libkdcraw7-dev, libkipi6-dev,
+ libmarble-dev, x11proto-core-dev
+Standards-Version: 3.8.1
 Homepage: http://kphotoalbum.org
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/kphotoalbum/trunk/?op=log
 Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/kphotoalbum/trunk/
 
 Package: kphotoalbum
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libqt3-mt-sqlite, sqlite
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ libqt4-sql-sqlite
 Recommends: kipi-plugins, khelpcenter
-Conflicts: kimdaba (<< 2.2)
-Replaces: kimdaba (<< 2.2)
-Provides: kimdaba
+Suggests: mplayerthumbs
 Description: tool for indexing, searching and viewing images by keywords for KDE
  KPhotoAlbum lets you index, search, group and view images by keywords, date,
  locations and persons. It provides a quick and elegant way to lookup groups of

Modified: kde-extras/kphotoalbum/trunk/debian/copyright
===================================================================
--- kde-extras/kphotoalbum/trunk/debian/copyright	2009-05-12 09:50:24 UTC (rev 14601)
+++ kde-extras/kphotoalbum/trunk/debian/copyright	2009-05-12 10:07:11 UTC (rev 14602)
@@ -1,45 +1,60 @@
-This package was debianized by 
-David L. Moreno <david.lopez.moreno at hispalinux.es> on 
-Sun, 18 Jul 2004 18:00:54 +0200.
+This package was debianized by:
 
-It was downloaded from http://kphotoalbum.org
+    David L. Moreno <david.lopez.moreno at hispalinux.es> on
+	Sun, 18 Jul 2004 18:00:54 +0200.
 
-Upstream Author: Jesper K. Pedersen <blackie at kde.org>
+It was downloaded from:
 
-Copyright: (C) 2003-2007 Jesper K. Pedersen <blackie at kde.org>
+     http://kphotoalbum.org
 
-Copyright for Raw Photo Parser:
-   (C) 2004 Dave Coffin <dcoffin at cybercom.net>
-   Hacked for thumbnail extraction in KDE Steffen Hansen <hansen at kde.org>
+Upstream Author:
 
-Copyright for SQLDB:
-   (C) 2006 Tuomas Suutari <thsuut at utu.fi>
+    Jesper K. Pedersen <blackie at kde.org>
 
+Copyright:
+
+    © 2003-2009 Jesper K. Pedersen <blackie at kde.org>
+
+Copyright for SQLDB and some code in Utilities:
+
+    © 2006-2009 Tuomas Suutari <thsuut at utu.fi>
+
 Copyright for python scripts:
-   (C) 2006 Tuomas Suutari <thsuut at utu.fi>
 
+    © 2006-2009 Tuomas Suutari <thsuut at utu.fi>
+
+Copyright for thumbnail implementation:
+
+    © 2008 Henner Zeller <h.zeller at acm.org>
+
 The kphotoalbum manpage is:
-   (C) 2004 David L. Moreno <david.lopez.moreno at hispalinux.es>
-   and is licensed under the GPL, see below.
 
+    © 2004 David L. Moreno <david.lopez.moreno at hispalinux.es>
+    and is licensed under the GPL, see below.
+
 License:
 
-   This package is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+    This package is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
 
-   This package is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+    This package is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with this package; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+    You should have received a copy of the GNU General Public License
+    along with this package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'
+and the GPL version 3 can be found in `/usr/share/common-licenses/GPL-3'.
 
-The Debian packaging is (C) 2006, Fathi Boudra <fboudra at free.fr> and
-is licensed under the GPL, see above.
+The Debian packaging is:
+
+    Copyright © 2006-2009 Fathi Boudra <fabo at debian.org>
+
+and is licensed under the GPL version 2 or any later version, 
+see `/usr/share/common-licenses/GPL-2' and `/usr/share/common-licenses/GPL-3'.

Modified: kde-extras/kphotoalbum/trunk/debian/rules
===================================================================
--- kde-extras/kphotoalbum/trunk/debian/rules	2009-05-12 09:50:24 UTC (rev 14601)
+++ kde-extras/kphotoalbum/trunk/debian/rules	2009-05-12 10:07:11 UTC (rev 14602)
@@ -1,11 +1,11 @@
 #!/usr/bin/make -f
 
+DEB_KDE_LINK_WITH_AS_NEEDED := yes
+
+include /usr/share/pkg-kde-tools/makefiles/1/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/kde.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed"
 DEB_INSTALL_MANPAGES_kphotoalbum := kphotoalbum.1
 
 build/kphotoalbum::
@@ -18,4 +18,3 @@
 	 @@dh_testdir
 	 @@[ -d ../tarballs/. ]
 	 @@dpatch-get-origtargz ../tarballs
-

More information about the pkg-kde-commits mailing list