rev 5234 - in kde-extras/kphotoalbum/trunk/debian: . patches

[Fathi Boudra]

Author: fboudra-guest
Date: 2007-01-03 12:28:43 +0100 (Wed, 03 Jan 2007)
New Revision: 5234

Removed:
   kde-extras/kphotoalbum/trunk/debian/patches/10_fix_autoconf2.60.diff.patch
Modified:
   kde-extras/kphotoalbum/trunk/debian/changelog
   kde-extras/kphotoalbum/trunk/debian/control
   kde-extras/kphotoalbum/trunk/debian/copyright
   kde-extras/kphotoalbum/trunk/debian/patches/02_autotools_update.diff
   kde-extras/kphotoalbum/trunk/debian/patches/03_libtool_update.diff
   kde-extras/kphotoalbum/trunk/debian/rules
Log:
prepare kphotoalbum-3.0

Modified: kde-extras/kphotoalbum/trunk/debian/changelog
===================================================================
--- kde-extras/kphotoalbum/trunk/debian/changelog	2007-01-03 10:28:51 UTC (rev 5233)
+++ kde-extras/kphotoalbum/trunk/debian/changelog	2007-01-03 11:28:43 UTC (rev 5234)
@@ -1,3 +1,12 @@
+kphotoalbum (3.0-1) experimental; urgency=low
+
+  * New upstream release
+  * Remove autoconf 2.60 support patch, merged upstream
+  * control: add libqt3-mt-sqlite and sqlite to depends
+  * copyright: updated
+
+ -- Fathi Boudra <fboudra at free.fr>  Wed,  3 Jan 2007 08:37:00 +0100
+
 kphotoalbum (2.2-2) unstable; urgency=low
 
   * Add version to libexiv2 dependency (Closes: #386855) 

Modified: kde-extras/kphotoalbum/trunk/debian/control
===================================================================
--- kde-extras/kphotoalbum/trunk/debian/control	2007-01-03 10:28:51 UTC (rev 5233)
+++ kde-extras/kphotoalbum/trunk/debian/control	2007-01-03 11:28:43 UTC (rev 5234)
@@ -9,7 +9,7 @@
 
 Package: kphotoalbum
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, libqt3-mt-sqlite, sqlite
 Recommends: kipi-plugins
 Conflicts: kimdaba (<< 2.2)
 Replaces: kimdaba (<< 2.2)

Modified: kde-extras/kphotoalbum/trunk/debian/copyright
===================================================================
--- kde-extras/kphotoalbum/trunk/debian/copyright	2007-01-03 10:28:51 UTC (rev 5233)
+++ kde-extras/kphotoalbum/trunk/debian/copyright	2007-01-03 11:28:43 UTC (rev 5234)
@@ -6,12 +6,18 @@
 
 Upstream Author: Jesper K. Pedersen <blackie at kde.org>
 
-Copyright: (C) 2003-2005 Jesper K. Pedersen <blackie at kde.org>
+Copyright: (C) 2003-2007 Jesper K. Pedersen <blackie at kde.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>
 
+Copyright for SQLDB:
+   (C) 2006 Tuomas Suutari <thsuut at utu.fi>
+
+Copyright for python scripts:
+   (C) 2006 Tuomas Suutari <thsuut at utu.fi>
+
 The kphotoalbum manpage is:
    (C) 2004 David L. Moreno <david.lopez.moreno at hispalinux.es>
    and is licensed under the GPL, see below.

Modified: kde-extras/kphotoalbum/trunk/debian/patches/02_autotools_update.diff
===================================================================
--- kde-extras/kphotoalbum/trunk/debian/patches/02_autotools_update.diff	2007-01-03 10:28:51 UTC (rev 5233)
+++ kde-extras/kphotoalbum/trunk/debian/patches/02_autotools_update.diff	2007-01-03 11:28:43 UTC (rev 5234)
@@ -1,6 +1,6 @@
 diff -Nrua a/admin/install-sh b/admin/install-sh
---- a/admin/install-sh	2006-04-18 03:18:14.000000000 +0200
-+++ b/admin/install-sh	2006-08-30 17:56:13.000000000 +0200
+--- a/admin/install-sh	2006-12-31 12:47:16.000000000 +0100
++++ b/admin/install-sh	2007-01-03 08:35:50.000000000 +0100
 @@ -1,7 +1,7 @@
  #!/bin/sh
  # install - install a program, script, or datafile
@@ -291,8 +291,8 @@
  # eval: (add-hook 'write-file-hooks 'time-stamp)
  # time-stamp-start: "scriptversion="
 diff -Nrua a/admin/missing b/admin/missing
---- a/admin/missing	2006-04-18 03:18:14.000000000 +0200
-+++ b/admin/missing	2006-08-30 17:56:13.000000000 +0200
+--- a/admin/missing	2006-12-31 12:47:16.000000000 +0100
++++ b/admin/missing	2007-01-03 08:35:50.000000000 +0100
 @@ -1,9 +1,9 @@
  #! /bin/sh
  # Common stub for a few missing GNU programs while installing.

Modified: kde-extras/kphotoalbum/trunk/debian/patches/03_libtool_update.diff
===================================================================
--- kde-extras/kphotoalbum/trunk/debian/patches/03_libtool_update.diff	2007-01-03 10:28:51 UTC (rev 5233)
+++ kde-extras/kphotoalbum/trunk/debian/patches/03_libtool_update.diff	2007-01-03 11:28:43 UTC (rev 5234)
@@ -1,6 +1,6 @@
 diff -Nrua a/admin/libtool.m4.in b/admin/libtool.m4.in
---- a/admin/libtool.m4.in	2006-04-18 03:18:14.000000000 +0200
-+++ b/admin/libtool.m4.in	2006-08-30 17:56:13.000000000 +0200
+--- a/admin/libtool.m4.in	2006-12-31 12:47:16.000000000 +0100
++++ b/admin/libtool.m4.in	2007-01-03 08:35:50.000000000 +0100
 @@ -1,28 +1,13 @@
  # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 -## Copyright 1996, 1997, 1998, 1999, 2000, 2001
@@ -3795,8 +3795,8 @@
    lt_ac_count=0
    echo $ECHO_N "0123456789$ECHO_C" >conftest.in
 diff -Nrua a/admin/ltmain.sh b/admin/ltmain.sh
---- a/admin/ltmain.sh	2006-04-18 03:18:14.000000000 +0200
-+++ b/admin/ltmain.sh	2006-08-30 17:56:13.000000000 +0200
+--- a/admin/ltmain.sh	2006-12-31 12:47:16.000000000 +0100
++++ b/admin/ltmain.sh	2007-01-03 08:35:50.000000000 +0100
 @@ -1,7 +1,7 @@
  # ltmain.sh - Provide generalized library-building support services.
  # NOTE: Changing this file will not affect anything until you rerun configure.

Deleted: kde-extras/kphotoalbum/trunk/debian/patches/10_fix_autoconf2.60.diff.patch

Modified: kde-extras/kphotoalbum/trunk/debian/rules
===================================================================
--- kde-extras/kphotoalbum/trunk/debian/rules	2007-01-03 10:28:51 UTC (rev 5233)
+++ kde-extras/kphotoalbum/trunk/debian/rules	2007-01-03 11:28:43 UTC (rev 5234)
@@ -3,6 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_INSTALL_MANPAGES_kphotoalbum := kphotoalbum.1
 
@@ -12,7 +13,6 @@
 clean::
 	rm -f kphotoalbum.1
 
-
 get-orig-source:
 	 @@dh_testdir
 	 @@[ -d ../tarballs/. ]