[Pkg-cli-apps-commits] r3660 - in /packages/f-spot/trunk/debian: changelog control patches/00list patches/detect_and_upgrade_sqlite2_database.dpatch patches/detect_sqlite2_databases.dpatch patches/unlink_nunit.dpatch rules

meebey at users.alioth.debian.org meebey at users.alioth.debian.org
Wed Jan 2 18:50:37 UTC 2008 

Author: meebey
Date: Wed Jan  2 18:50:36 2008
New Revision: 3660

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=3660
Log:
f-spot 0.4.1-2 release with _a lot_ of love in the auto upgrade patch


Added:
    packages/f-spot/trunk/debian/patches/detect_and_upgrade_sqlite2_database.dpatch
      - copied, changed from r3658, packages/f-spot/trunk/debian/patches/detect_sqlite2_databases.dpatch
    packages/f-spot/trunk/debian/patches/unlink_nunit.dpatch   (with props)
Removed:
    packages/f-spot/trunk/debian/patches/detect_sqlite2_databases.dpatch
Modified:
    packages/f-spot/trunk/debian/changelog
    packages/f-spot/trunk/debian/control
    packages/f-spot/trunk/debian/patches/00list
    packages/f-spot/trunk/debian/rules

Modified: packages/f-spot/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/changelog?rev=3660&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/changelog (original)
+++ packages/f-spot/trunk/debian/changelog Wed Jan  2 18:50:36 2008
@@ -1,14 +1,33 @@
-f-spot (0.4.1-2~pre1) UNRELEASED; urgency=low
+f-spot (0.4.1-2) unstable; urgency=low
 
   [ Mirco Bauer ]
+  * The "Happy New Year!" release
   * debian/patches/02_autoreconf.dpatch:
     + Dropped
+  * debian/patches/unlink_nunit.dpatch:
+    + Don't link with nunit, the users don't want/can't use the test-cases,
+      but causes unnecesary dependency and produces different build results
+      depending if nunit was installed or not.
+  * debian/patches/detect_sqlite2_databases.dpatch
+    debian/patches/detect_and_upgrade_sqlite2_database.dpatch: (Closes: #456308)
+    + Renamed detect_sqlite2_databases.dpatch to
+      detect_and_upgrade_sqlite2_database.dpatch.
+    + Made error message less developerish.
+    + Implemented automatic and silent upgrade of the sqlite database, only
+      bail out if there was an error.
+    + Enhanced or rather implemented error handling in the
+      f-spot-sqlite-upgrade script.
+  * debian/control:
+    + Made sqlite and sqlite3 recommends for a while, till all older f-spot
+      users are migrated to sqlite3.
+    + Added build dependencies on all libraries the configure script explicitly
+      checks for, fixes FTBFS. (Closes: #458672)
 
   [ Tim Retout ]
   * debian/patches/no_dup_apps_icons.dpatch: Adjust Makefiles so as not to
     install application icons in two different locations. (Closes: #441326)
 
- -- Tim Retout <tim at retout.co.uk>  Tue, 25 Dec 2007 14:54:28 +0000
+ -- Mirco Bauer <meebey at debian.org>  Tue, 01 Jan 2008 17:47:16 +0100
 
 f-spot (0.4.1-1) unstable; urgency=low
 

Modified: packages/f-spot/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/control?rev=3660&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/control (original)
+++ packages/f-spot/trunk/debian/control Wed Jan  2 18:50:36 2008
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
 Uploaders: Tim Retout <tim at retout.co.uk>, Mirco Bauer <meebey at debian.org>
-Build-Depends: debhelper (>= 5.0.0), cdbs, dpatch, mono-gmcs (>= 1.1.17) | c-sharp-2.0-compiler, cli-common-dev (>= 0.4.4), libgnome2.0-cil (>= 2.7.90), libxml-parser-perl, libmono-dev (>= 1.1.2), libgnomeui-dev, libexif-dev (>= 0.6.12), libsqlite3-dev, libgphoto2-2-dev (>= 2.1.4), liblcms1-dev, libmono-sqlite2.0-cil, libmono-system-runtime2.0-cil, libmono-cairo2.0-cil, libusb-dev, gnome-doc-utils (>= 0.3.2), libgl1-mesa-dev | libgl-dev, libndesk-dbus1.0-cil, libndesk-dbus-glib1.0-cil, libgconf2.0-cil, libglade2.0-cil, libflickrnet2.1.5-cil, libmono-addins0.2-cil, libmono-addins-gui0.2-cil, beagle-dev, gnome-screensaver, docbook-xml
+Build-Depends: debhelper (>= 5.0.0), cli-common-dev (>= 0.4.4), cdbs, dpatch, mono-gmcs (>= 1.1.17) | c-sharp-2.0-compiler, libgtk2.0-cil (>= 2.8), libgtkhtml2.0-cil (>= 2.8), libgtk2.0-dev (>= 2.6), libgnome2.0-cil (>= 2.8), libgnome2-dev (>= 2.2), libxml-parser-perl, libmono-dev (>= 1.1.7), libgnomeui-dev (>= 2.2), libexif-dev (>= 0.5.7), libsqlite3-dev, libgphoto2-2-dev (>= 2.1.4), liblcms1-dev, libmono-sqlite2.0-cil, libmono-system-runtime2.0-cil, libmono-cairo2.0-cil, libusb-dev, gnome-doc-utils (>= 0.3.2), libgl1-mesa-dev | libgl-dev, libndesk-dbus1.0-cil (>= 0.4.2), libndesk-dbus-glib1.0-cil (>= 0.3.0), libgconf2.0-cil, libglade2.0-cil, libgnome-vfs2.0-cil, libflickrnet2.1.5-cil, libmono-addins0.2-cil, libmono-addins-gui0.2-cil, beagle-dev, gnome-screensaver, docbook-xml
 Standards-Version: 3.7.3
 Homepage: http://www.f-spot.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-cli-apps/packages/f-spot/trunk/
@@ -12,8 +12,7 @@
 Package: f-spot
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, dbus
-Recommends: dcraw
-Suggests: sqlite, sqlite3
+Recommends: dcraw, sqlite, sqlite3
 Description: personal photo management application
  F-Spot is meant to be an easy-to-use photo management
  application.  It allows for importing of your existing

Modified: packages/f-spot/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/00list?rev=3660&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/00list (original)
+++ packages/f-spot/trunk/debian/patches/00list Wed Jan  2 18:50:36 2008
@@ -5,6 +5,7 @@
 fix_libfspotjpegtran_linkage
 link_system_libs
 forward_port_to_flickrnet_2.1.5
-detect_sqlite2_databases
+detect_and_upgrade_sqlite2_database
 no_dup_apps_icons
+unlink_nunit
 99_ltmain_as-needed

Copied: packages/f-spot/trunk/debian/patches/detect_and_upgrade_sqlite2_database.dpatch (from r3658, packages/f-spot/trunk/debian/patches/detect_sqlite2_databases.dpatch)
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/detect_and_upgrade_sqlite2_database.dpatch?rev=3660&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/detect_sqlite2_databases.dpatch (original)
+++ packages/f-spot/trunk/debian/patches/detect_and_upgrade_sqlite2_database.dpatch Wed Jan  2 18:50:36 2008
@@ -6,8 +6,20 @@
 
 @DPATCH@
 diff -urNad f-spot-0.4.1~/src/Db.cs f-spot-0.4.1/src/Db.cs
---- f-spot-0.4.1~/src/Db.cs	2007-12-04 13:19:18.000000000 +0100
-+++ f-spot-0.4.1/src/Db.cs	2007-12-13 22:10:06.000000000 +0100
+--- f-spot-0.4.1~/src/Db.cs	2008-01-02 19:47:36.000000000 +0100
++++ f-spot-0.4.1/src/Db.cs	2008-01-02 19:49:36.000000000 +0100
+@@ -1,10 +1,10 @@
+ using System.Threading;
+ using System.Collections;
++using System.Diagnostics;
+ using System.IO;
+ using System;
+ using Banshee.Database;
+ 
+-
+ // All kinds of database items subclass from this.
+ public class DbItem {
+ 	uint id;
 @@ -43,6 +43,12 @@
  public delegate void ItemsRemovedHandler (object sender, DbItemEventArgs args);
  public delegate void ItemsChangedHandler (object sender, DbItemEventArgs args);
@@ -21,23 +33,51 @@
  public abstract class DbStore {
  	// DbItem cache.
  
-@@ -235,7 +241,12 @@
+@@ -235,7 +241,40 @@
  		if (new_db && ! create_if_missing)
  			throw new Exception (path + ": File not found");
  
 -		database = new QueuedSqliteDatabase(path);	
 +		database = new QueuedSqliteDatabase(path);
 +		if (database.GetFileVersion(path) == 2) {
-+			throw new DbException("sqlite2 database detected, bailing out!\n" +
-+				"You need to upgrade your f-spot sqlite2 database to sqlite3 by using the f-spot-sqlite-upgrade script.\n" +
-+				"On Debian systems you need to install sqlite and sqlite3 packages using APT before you run the upgrade script.");
++			// close the old database first
++			database.Dispose();
++
++			string error = null;
++			if (!File.Exists("/usr/bin/sqlite")) {
++				error = "The required program /usr/bin/sqlite is missing on this system, please install sqlite.";
++			}
++			if (!File.Exists("/usr/bin/sqlite3")) {
++				error = "The required program /usr/bin/sqlite3 is missing on this system, please install sqlite3.";
++			}
++
++			if (error == null) {
++				Console.WriteLine("Running f-spot-sqlite-upgrade script...");
++				ProcessStartInfo updaterInfo = new ProcessStartInfo("/usr/bin/f-spot-sqlite-upgrade");
++				updaterInfo.UseShellExecute = false;
++				updaterInfo.RedirectStandardError = true;
++				Process updater = Process.Start(updaterInfo);
++				string stdError = updater.StandardError.ReadToEnd();
++				updater.WaitForExit();
++				if (updater.ExitCode != 0) {
++					error = "/usr/bin/f-spot-sqlite-upgrade returned:\n" + stdError;
++				}
++			}
++			
++			if (error != null) {
++				string msg = "Failed to upgrade the f-spot sqlite2 database to sqlite3!\n" + error;
++				throw new DbException(msg);
++ 			}
++
++			// reopen the new converted database
++			database = new QueuedSqliteDatabase(path);
 +		}
  
  		// Load or create the meta table
   		meta_store = new MetaStore (Database, new_db);
 diff -urNad f-spot-0.4.1~/src/QueuedSqliteDatabase.cs f-spot-0.4.1/src/QueuedSqliteDatabase.cs
---- f-spot-0.4.1~/src/QueuedSqliteDatabase.cs	2007-12-04 13:19:18.000000000 +0100
-+++ f-spot-0.4.1/src/QueuedSqliteDatabase.cs	2007-12-13 22:10:06.000000000 +0100
+--- f-spot-0.4.1~/src/QueuedSqliteDatabase.cs	2008-01-02 19:47:36.000000000 +0100
++++ f-spot-0.4.1/src/QueuedSqliteDatabase.cs	2008-01-02 19:48:58.000000000 +0100
 @@ -266,7 +266,7 @@
              connection.Close();
          }
@@ -48,8 +88,8 @@
              if (!File.Exists(path)) {
                  return 3;
 diff -urNad f-spot-0.4.1~/src/main.cs f-spot-0.4.1/src/main.cs
---- f-spot-0.4.1~/src/main.cs	2007-12-04 13:19:18.000000000 +0100
-+++ f-spot-0.4.1/src/main.cs	2007-12-13 22:10:28.000000000 +0100
+--- f-spot-0.4.1~/src/main.cs	2008-01-02 19:47:36.000000000 +0100
++++ f-spot-0.4.1/src/main.cs	2008-01-02 19:48:58.000000000 +0100
 @@ -176,6 +176,11 @@
  
  					if (core != null)
@@ -62,3 +102,50 @@
  				}
  				if (control == null)
  					System.Console.WriteLine ("Can't get a connection to the dbus. Trying again...");
+diff -urNad f-spot-0.4.1~/tools/f-spot-sqlite-upgrade f-spot-0.4.1/tools/f-spot-sqlite-upgrade
+--- f-spot-0.4.1~/tools/f-spot-sqlite-upgrade	2008-01-02 19:47:36.000000000 +0100
++++ f-spot-0.4.1/tools/f-spot-sqlite-upgrade	2008-01-02 19:48:58.000000000 +0100
+@@ -1,8 +1,12 @@
+ #!/bin/sh
++set -e
++
+ # This only upgrades the default database location
+ # if you have specified a different location 
+ DB_LOCATION=~/.gnome2/f-spot/photos.db
+ BACKUP_LOCATION=$DB_LOCATION.backup
++DUMP_LOCATION=$DB_LOCATION.dump
++NEW_DB_LOCATION=$DB_LOCATION.new
+ 
+ if ! which sqlite >& /dev/null ; then
+ 	echo "Could not find sqlite binary. Update aborted."
+@@ -12,10 +16,28 @@
+ 	exit 1
+ fi
+ 
++if [ ! -f $DB_LOCATION ]; then
++	echo "Could not find $DB_LOCATION, nothing to update. Update aborted."
++	exit 1
++fi
++
++# make sure nothing gets in the way
++rm -f $BACKUP_LOCATION
++rm -f $DUMP_LOCATION
++rm -f $NEW_DB_LOCATION
++
+ if grep "^...This file contains an SQLite 2.1 database" $DB_LOCATION &> /dev/null; then
+ 	echo "Upgrading from SQLite 2.1 to SQLite3"
+-	mv $DB_LOCATION $BACKUP_LOCATION
+-	sqlite $BACKUP_LOCATION .dump | sqlite3 $DB_LOCATION
++	cp $DB_LOCATION $BACKUP_LOCATION
++	if sqlite $DB_LOCATION .dump > $DUMP_LOCATION &&
++	   sqlite3 $NEW_DB_LOCATION < $DUMP_LOCATION; then
++		cp $NEW_DB_LOCATION $DB_LOCATION
++		echo "Upgrade was successful."
++	else
++		echo "Upgrade failed, putting old database back."
++		cp $BACKUP_LOCATION $DB_LOCATION
++		exit 1
++	fi
+ else
+ 	echo "Database is already upgraded"
+ fi

Added: packages/f-spot/trunk/debian/patches/unlink_nunit.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/unlink_nunit.dpatch?rev=3660&op=file
==============================================================================
--- packages/f-spot/trunk/debian/patches/unlink_nunit.dpatch (added)
+++ packages/f-spot/trunk/debian/patches/unlink_nunit.dpatch Wed Jan  2 18:50:36 2008
@@ -1,0 +1,45 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## unlink_nunit.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad f-spot-0.4.1~/src/Makefile.am f-spot-0.4.1/src/Makefile.am
+--- f-spot-0.4.1~/src/Makefile.am	2007-12-04 13:19:18.000000000 +0100
++++ f-spot-0.4.1/src/Makefile.am	2008-01-01 17:38:29.000000000 +0100
+@@ -1,5 +1,5 @@
+ include $(top_srcdir)/Makefile.include
+-EXTRAFLAGS = -unsafe -nowarn:0169 -nowarn:0612 -nowarn:0414 -d:TEST_METADATA -d:BROKEN_RSVG $(NUNIT_DEFINES) $(BEAGLE_DEFINES) $(CSC_DEFINES)
++EXTRAFLAGS = -unsafe -nowarn:0169 -nowarn:0612 -nowarn:0414 -d:TEST_METADATA -d:BROKEN_RSVG $(BEAGLE_DEFINES) $(CSC_DEFINES)
+ 
+ F_SPOT_CSDISTFILES =				\
+ 	$(srcdir)/Cairo/Antialias.cs		\
+@@ -254,7 +254,6 @@
+ 	-r:Mono.Posix				\
+ 	-r:Mono.Security			\
+ 	-r:ICSharpCode.SharpZipLib		\
+-	$(NUNIT_PKG)				\
+ 	-pkg:gtkhtml-sharp-2.0			\
+ 	-pkg:glade-sharp-2.0			\
+ 	-pkg:gnome-vfs-sharp-2.0		\
+diff -urNad f-spot-0.4.1~/src/Makefile.in f-spot-0.4.1/src/Makefile.in
+--- f-spot-0.4.1~/src/Makefile.in	2008-01-01 16:29:16.000000000 +0100
++++ f-spot-0.4.1/src/Makefile.in	2008-01-01 17:38:54.000000000 +0100
+@@ -307,7 +307,7 @@
+ CSC_LIB = $(CSC) -target:library
+ MONO_DEBUGFLAGS = --debug
+ RUNTIME = mono $(MONO_DEBUGFLAGS)
+-EXTRAFLAGS = -unsafe -nowarn:0169 -nowarn:0612 -nowarn:0414 -d:TEST_METADATA -d:BROKEN_RSVG $(NUNIT_DEFINES) $(BEAGLE_DEFINES) $(CSC_DEFINES)
++EXTRAFLAGS = -unsafe -nowarn:0169 -nowarn:0612 -nowarn:0414 -d:TEST_METADATA -d:BROKEN_RSVG $(BEAGLE_DEFINES) $(CSC_DEFINES)
+ F_SPOT_CSDISTFILES = \
+ 	$(srcdir)/Cairo/Antialias.cs		\
+ 	$(srcdir)/Cairo/Cairo.cs		\
+@@ -561,7 +561,6 @@
+ 	-r:Mono.Posix				\
+ 	-r:Mono.Security			\
+ 	-r:ICSharpCode.SharpZipLib		\
+-	$(NUNIT_PKG)				\
+ 	-pkg:gtkhtml-sharp-2.0			\
+ 	-pkg:glade-sharp-2.0			\
+ 	-pkg:gnome-vfs-sharp-2.0		\

Propchange: packages/f-spot/trunk/debian/patches/unlink_nunit.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: packages/f-spot/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/rules?rev=3660&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/rules (original)
+++ packages/f-spot/trunk/debian/rules Wed Jan  2 18:50:36 2008
@@ -23,7 +23,9 @@
 	dh_clideps -d 
 
 binary-install/f-spot::
-	rm $(CURDIR)/debian/f-spot/usr/lib/f-spot/*.a $(CURDIR)/debian/f-spot/usr/lib/f-spot/*.la $(CURDIR)/debian/f-spot/usr/lib/f-spot/*.so
+	rm $(CURDIR)/debian/f-spot/usr/lib/f-spot/*.a \
+	   $(CURDIR)/debian/f-spot/usr/lib/f-spot/*.la \
+	   $(CURDIR)/debian/f-spot/usr/lib/f-spot/*.so
 
 clean::
 	rm -rf $(MONO_SHARED_DIR)/.wapi

More information about the Pkg-cli-apps-commits mailing list