[Pkg-mono-svn-commits] rev 2693 - in non-group/tomboy/trunk/debian: . patches

[Dave Beckett]

Author: dajobe
Date: 2006-09-03 16:53:10 +0000 (Sun, 03 Sep 2006)
New Revision: 2693

Added:
   non-group/tomboy/trunk/debian/tomboy.postinst
Removed:
   non-group/tomboy/trunk/debian/patches/01_image_name.patch
Log:
Import tomboy 0.3.9+dfsg-2 packaging

Deleted: non-group/tomboy/trunk/debian/patches/01_image_name.patch
===================================================================
--- non-group/tomboy/trunk/debian/patches/01_image_name.patch	2006-09-03 11:49:06 UTC (rev 2692)
+++ non-group/tomboy/trunk/debian/patches/01_image_name.patch	2006-09-03 16:53:10 UTC (rev 2693)
@@ -1,86 +0,0 @@
-diff -urN tomboy-0.3.9.orig/Tomboy/Makefile.am tomboy-0.3.9/Tomboy/Makefile.am
---- tomboy-0.3.9.orig/Tomboy/Makefile.am	2006-08-06 15:56:12.000000000 -0700
-+++ tomboy-0.3.9/Tomboy/Makefile.am	2006-08-12 08:40:45.000000000 -0700
-@@ -58,7 +58,6 @@
- 	-resource:$(top_srcdir)/data/GNOME_TomboyApplet.xml,GNOME_TomboyApplet.xml	\
- 	-resource:$(top_builddir)/data/DefaultPlugins.desktop,DefaultPlugins.desktop	\
- 	-resource:$(top_srcdir)/data/images/tomboy.png,tomboy.png			\
--	-resource:$(top_srcdir)/data/images/tintin.png,tintin.png			\
- 	-resource:$(top_srcdir)/data/images/gnome-searchtool.png,gnome-searchtool.png
- 
- $(TARGET): $(CSFILES) Defines.cs
-diff -urN tomboy-0.3.9.orig/Tomboy/Makefile.in tomboy-0.3.9/Tomboy/Makefile.in
---- tomboy-0.3.9.orig/Tomboy/Makefile.in	2006-08-07 17:23:09.000000000 -0700
-+++ tomboy-0.3.9/Tomboy/Makefile.in	2006-08-12 08:40:56.000000000 -0700
-@@ -306,7 +306,6 @@
- 	-resource:$(top_srcdir)/data/GNOME_TomboyApplet.xml,GNOME_TomboyApplet.xml	\
- 	-resource:$(top_builddir)/data/DefaultPlugins.desktop,DefaultPlugins.desktop	\
- 	-resource:$(top_srcdir)/data/images/tomboy.png,tomboy.png			\
--	-resource:$(top_srcdir)/data/images/tintin.png,tintin.png			\
- 	-resource:$(top_srcdir)/data/images/gnome-searchtool.png,gnome-searchtool.png
- 
- tomboylibdir = $(pkglibdir)
-diff -urN tomboy-0.3.9.orig/Tomboy/Tray.cs tomboy-0.3.9/Tomboy/Tray.cs
---- tomboy-0.3.9.orig/Tomboy/Tray.cs	2006-08-07 02:40:13.000000000 -0700
-+++ tomboy-0.3.9/Tomboy/Tray.cs	2006-08-12 08:35:22.000000000 -0700
-@@ -398,27 +398,27 @@
- 			manager.NoteDeleted += OnNoteDeletedUpdateIcon;
- 			manager.NoteAdded += OnNoteAddedUpdateIcon;
- 			manager.NoteRenamed += OnNoteRenamedUpdateIcon;
--			if (manager.Find ("Tintin") != null)
--				image.Pixbuf = GuiUtils.GetIcon ("tintin", 22);
-+			if (manager.Find ("Tomboy") != null)
-+				image.Pixbuf = GuiUtils.GetIcon ("tomboy", 22);
- 		}
- 
- 		void OnNoteDeletedUpdateIcon (object sender, Note changed)
- 		{
--			if (changed.Title == "Tintin")
-+			if (changed.Title == "Tomboy")
- 				image.Pixbuf = tray_icon;
- 		}
- 
- 		void OnNoteAddedUpdateIcon (object sender, Note changed)
- 		{
--			if (changed.Title == "Tintin")
--				image.Pixbuf = GuiUtils.GetIcon ("tintin", 22);
-+			if (changed.Title == "Tomboy")
-+				image.Pixbuf = GuiUtils.GetIcon ("tomboy", 22);
- 		}
- 
- 		void OnNoteRenamedUpdateIcon (Note note, string old_title)
- 		{
--			if (note.Title == "Tintin")
--				image.Pixbuf = GuiUtils.GetIcon ("tintin", 22);
--			else if (old_title == "Tintin")
-+			if (note.Title == "Tomboy")
-+				image.Pixbuf = GuiUtils.GetIcon ("tomboy", 22);
-+			else if (old_title == "Tomboy")
- 				image.Pixbuf = tray_icon;
- 		}
- 		// GO ABOUT YOUR BUSINESS
-diff -urN tomboy-0.3.9.orig/data/images/Makefile.am tomboy-0.3.9/data/images/Makefile.am
---- tomboy-0.3.9.orig/data/images/Makefile.am	2006-08-07 16:35:46.000000000 -0700
-+++ tomboy-0.3.9/data/images/Makefile.am	2006-08-12 08:52:19.000000000 -0700
-@@ -40,7 +40,6 @@
- 
- noinst_DATA = 			\
- 	gnome-searchtool.png	\
--	stock_mail.png		\
--	tintin.png
-+	stock_mail.png
- 
- EXTRA_DIST = $(noinst_DATA) $(pixmap_DATA) $(tango_icons)
-diff -urN tomboy-0.3.9.orig/data/images/Makefile.in tomboy-0.3.9/data/images/Makefile.in
---- tomboy-0.3.9.orig/data/images/Makefile.in	2006-08-07 17:23:11.000000000 -0700
-+++ tomboy-0.3.9/data/images/Makefile.in	2006-08-12 08:52:26.000000000 -0700
-@@ -255,8 +255,7 @@
- gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
- noinst_DATA = \
- 	gnome-searchtool.png	\
--	stock_mail.png		\
--	tintin.png
-+	stock_mail.png
- 
- EXTRA_DIST = $(noinst_DATA) $(pixmap_DATA) $(tango_icons)
- all: all-am

Added: non-group/tomboy/trunk/debian/tomboy.postinst
===================================================================
--- non-group/tomboy/trunk/debian/tomboy.postinst	                        (rev 0)
+++ non-group/tomboy/trunk/debian/tomboy.postinst	2006-09-03 16:53:10 UTC (rev 2693)
@@ -0,0 +1,13 @@
+#!/bin/sh
+set -e
+
+# version 0.3.9-1 started shipping /var/lib/scrollkeeper erroneously, hence
+# the database was overwritten and needs a full rebuild
+#
+# this fix was added in version 0.3.9+dfsg-2
+if [ "$1" = "configure" ] && dpkg --compare-versions "$2" ge "0.3.9-1" && dpkg --compare-versions "$2" lt "0.3.9+dfsg-2" && which scrollkeeper-rebuilddb >/dev/null 2>&1; then
+    echo "Upgrade from broken Tomboy version detected, running scrollkeeper-rebuilddb..."
+    scrollkeeper-rebuilddb -q
+fi
+
+#DEBHELPER#