[Pkg-mono-svn-commits] rev 2695 - in non-group/tomboy/tags: . 0.3.9+dfsg-2/debian 0.3.9+dfsg-2/debian/patches

Dave Beckett dajobe at costa.debian.org
Sun Sep 3 16:55:55 UTC 2006


Author: dajobe
Date: 2006-09-03 16:55:55 +0000 (Sun, 03 Sep 2006)
New Revision: 2695

Added:
   non-group/tomboy/tags/0.3.9+dfsg-2/
   non-group/tomboy/tags/0.3.9+dfsg-2/debian/changelog
   non-group/tomboy/tags/0.3.9+dfsg-2/debian/patches/01_image_name.patch
   non-group/tomboy/tags/0.3.9+dfsg-2/debian/rules
   non-group/tomboy/tags/0.3.9+dfsg-2/debian/tomboy.postinst
Removed:
   non-group/tomboy/tags/0.3.9+dfsg-2/debian/changelog
   non-group/tomboy/tags/0.3.9+dfsg-2/debian/patches/01_image_name.patch
   non-group/tomboy/tags/0.3.9+dfsg-2/debian/rules
   non-group/tomboy/tags/0.3.9+dfsg-2/debian/tomboy.png.uu
Log:
Tagged tomboy 0.3.9+dfsg-2

Copied: non-group/tomboy/tags/0.3.9+dfsg-2 (from rev 2692, non-group/tomboy/trunk)

Deleted: non-group/tomboy/tags/0.3.9+dfsg-2/debian/changelog
===================================================================
--- non-group/tomboy/trunk/debian/changelog	2006-09-03 11:49:06 UTC (rev 2692)
+++ non-group/tomboy/tags/0.3.9+dfsg-2/debian/changelog	2006-09-03 16:55:55 UTC (rev 2695)
@@ -1,238 +0,0 @@
-tomboy (0.3.9-1) unstable; urgency=medium
-
-  * New upstream release
-    - Builds against GTK 2.0, removed patch 02_gtk-sharp2.patch
-    - Builds against dbus directly rather than using dbus-sharp.  Change 
-      from Build-Depends on libdbus-cil-1 to libdbus-glib-1-2
-    - Preference dialog modality fixed (Closes: #313295)
-    - Italic pasting fixed (Closes: #329476)
-    - Added StickyNoteImport plugin
-    - Uses gnome document tools. Add Build-Depends on gnome-doc-utils and
-      scrollkeeper
-  * Upstream application icon changed "due to legal restrictions"
-    - Remove the replacement third-party images we were using.
-    - Continue to remove one use of the old icon from the source tarball.
-    - Updated patch 01_image_name to remove the last use of the old icon
-    - Added XPM versions of the new icons
-  * Standards version 3.7.2 (no changes)
-  * Updated to latest Debian Mono Policy.  Build-Depend on cli-common-dev
-  * Build depend on libgmime2.2-cil replacing libgmime2.1-cil which was
-    removed from Debian yesterday fixing FTBFS on arm (Closes: #382653)
-  * Urgency medium due to FTBFS fix.
-
- -- Dave Beckett <dajobe at debian.org>  Sat, 12 Aug 2006 09:43:31 -0700
-
-tomboy (0.3.5-2) unstable; urgency=low
-
-  * Add dependencies to native library (Closes: #364778)
-  * Enable Evolution plugin (Closes: #364779)
-
- -- Dave Beckett <dajobe at debian.org>  Tue, 25 Apr 2006 20:59:25 -0700
-
-tomboy (0.3.5-1) unstable; urgency=low
-
-  * New upstream release (Closes: #352531)
-  * Require dbus 0.61-3 to get a non-broken assembly version (see bug #354798)
-  * Packaging updates from Ubuntu 0.3.5-0ubuntu1 thanks to Sebastian Dröge
-  * 02_Trie.cs_mcs119.patch deleted as merged into upstream.
-
- -- Dave Beckett <dajobe at debian.org>  Sat, 18 Mar 2006 19:47:02 -0800
-
-tomboy (0.3.5-0ubuntu1) dapper; urgency=low
-
-  * New upstream release
-  * 01_image_name.patch:
-    + Updated for new upstream version
-  * 02_gtk-sharp2.patch:
-    + Use Gtk#2 instead of Gtk#
-  * Tightened and adjusted Build-Depends
-  * Added ${misc:Depends} to Depends
-  * Updated debhelper compat version to 5
-
- -- Sebastian Dröge <slomo at ubuntu.com>  Fri, 24 Feb 2006 17:01:15 +0100
-
-tomboy (0.3.3-3) unstable; urgency=low
-
-  * Build against libdbus-1-cil (Closes: #338495)
-
- -- Dave Beckett <dajobe at debian.org>  Thu, 12 Jan 2006 19:41:41 -0800
-
-tomboy (0.3.3-2) unstable; urgency=low
-
-  * Added patch from CVS to fix Mono 1.1.9.x build (Closes: 337356)
-    -  02_Trie.cs_mcs119.patch from CVS
-
- -- Dave Beckett <dajobe at debian.org>  Thu,  3 Nov 2005 19:59:02 -0800
-
-tomboy (0.3.3-1) unstable; urgency=low
-
-  * New upstream release
-  * New ExportToHTML plugin
-  * Updated image name fixing patch 01_image_name.patch
-  * Removed Mono 1.1.8.x build patches merged upstream:
-    - 02_mono118_Trie.patch
-    - 03_mono118_AppletFactory.patch
-
- -- Dave Beckett <dajobe at debian.org>  Wed, 10 Aug 2005 19:33:28 +0100
-
-tomboy (0.3.2-9) unstable; urgency=low
-
-  * Removed obsolete Build-Depend: on mono-jit and mono-utils
-  * Updated debian/watch file to new location.
-  * Added 24x24 icon from same author as the other icons, cleaned up by
-    Gordon Ingram to help the toolbar icon look better (Closes: 316765)
-  * Rebuild for mono 1.1.8.1
-  * Applied patches from CVS to fix 1.1.8.x builds:
-    02_mono118_Trie.patch and 03_mono118_AppletFactory.patch
-  * Add MONO_SHARED_DIR to stop monodis core dumping when called
-    inside dh_clideps
-
- -- Dave Beckett <dajobe at debian.org>  Mon, 11 Jul 2005 17:13:26 +0100
-
-tomboy (0.3.2-8) unstable; urgency=low
-
-  * Added 16x16 and 32x32 pixmap xpm icons
-  * Added menu and tomboy.desktop linked to the icons
-
- -- Dave Beckett <dajobe at debian.org>  Tue, 14 Jun 2005 23:07:01 +0100
-
-tomboy (0.3.2-7) unstable; urgency=low
-
-  * Upload to unstable
-  * Depend on libdbus-cil 0.23.4-3 built with mono in unstable
-  * Remove dependency on mono-mint (Closes: 311956)
-
- -- Dave Beckett <dajobe at debian.org>  Fri, 10 Jun 2005 16:22:59 +0100
-
-tomboy (0.3.2-6) experimental; urgency=low
-
-  * Merge with ubuntu up to 0.3.2-4ubuntu5:
-    - changed the uudecode line from update-config to post-patches in 
-      debian/rules
-    - not applying Tomboy/Trie.cs patch
-
- -- Dave Beckett <dajobe at debian.org>  Wed,  1 Jun 2005 20:13:48 +0100
-
-tomboy (0.3.2-5) experimental; urgency=low
-
-  * Rebuild package with source inside changes
-
- -- Dave Beckett <dajobe at debian.org>  Fri, 27 May 2005 13:20:41 +0100
-
-tomboy (0.3.2-4) experimental; urgency=low
-
-  * Upload of tomboy to experimental (Closes: 272264)
-  * Require mono 1.1.6+
-  * Build-Depends on sharutils for uudecode
-
- -- Dave Beckett <dajobe at debian.org>  Fri, 27 May 2005 13:09:47 +0100
-
-tomboy (0.3.2-3) experimental; urgency=low
-
-  * Standards-Version 3.6.1.0 and depend on newer debhelper for cdbs
-
- -- Dave Beckett <dajobe at debian.org>  Fri, 15 Apr 2005 22:21:52 +0100
-
-tomboy (0.3.2-2) experimental; urgency=low
-
-  * Rebuild against mono 1.1 packages.
-  * Require cli-common
-
- -- Dave Beckett <dajobe at debian.org>  Fri, 15 Apr 2005 22:04:15 +0100
-
-tomboy (0.3.2-1) experimental; urgency=low
-
-  * New upstream release
-
- -- Dave Beckett <dajobe at debian.org>  Sun, 10 Apr 2005 15:48:23 +0100
-
-tomboy (0.3.1-1) experimental; urgency=low
-
-  * Port of the packaging from Ubuntu to Debian
-  * Removed non-distributable image from orig.tar.gz and
-    added debian/README.Debian-source to explain this
-  * Added replacement image debian/tomboy.png.uu from Jacub Steiner
-  * Added patches/01_image_name.patch to rename mentions to the image
-
- -- Dave Beckett <dajobe at debian.org>  Sun, 10 Apr 2005 15:29:35 +0100
-
-tomboy (0.3.1-0ubuntu6) hoary; urgency=low
-
-  * Rebuilt against new libdbus-cil.
-
- -- Daniel Holbach <dh at mailempfang.de>  Wed, 16 Mar 2005 21:11:11 +0100
-
-tomboy (0.3.1-0ubuntu5) hoary; urgency=low
-
-  * Rebuild with current libs.
-
- -- Sebastien Bacher <seb128 at canonical.com>  Sat, 19 Feb 2005 14:57:09 +0100
-
-tomboy (0.3.1-0ubuntu4) hoary; urgency=low
-
-  * Er, libpanel-applet2-dev
-
- -- Matt Zimmerman <mdz at ubuntu.com>  Wed,  2 Feb 2005 20:49:44 -0800
-
-tomboy (0.3.1-0ubuntu3) hoary; urgency=low
-
-  * Build-Depend on libpanel-applet-dev, not libpanel-applet2-0
-
- -- Matt Zimmerman <mdz at ubuntu.com>  Wed,  2 Feb 2005 11:01:26 -0800
-
-tomboy (0.3.1-0ubuntu2) hoary; urgency=low
-
-  * debian/control
-    build-dep on libpanel-applet2-0 to fix FTBFS.
-
- -- Brandon Hale <brandon at smarterits.com>  Mon, 31 Jan 2005 23:52:04 -0500
-
-tomboy (0.3.1-0ubuntu1) hoary; urgency=low
-
-  * New upstream release
-    - Made the move to Gnome Panel applet. (TrayIcon mode is still supported).
-    - New plugin system, so anyone can customize their Tomboy notes.
-    - A Note printing plugin
-    - A new preferences dialog
-  * debian/control
-    - Add libdbus-cil to build-deps
-
- -- Brandon Hale <brandon at smarterits.com>  Thu, 27 Jan 2005 18:35:41 -0500
-
-tomboy (0.2.2-1ubuntu1) hoary; urgency=low
-
-  * Update Build-Dep and fix FTBFS.
-
- -- Fabio M. Di Nitto <fabbione at fabbione.net>  Mon, 22 Nov 2004 13:10:03 +0100
-
-tomboy (0.2.2-1) hoary; urgency=low
-
-  * New upstream release
-
- -- Brandon Hale <brandon at localhost.localdomain>  Sun, 21 Nov 2004 15:35:03 -0500
-
-tomboy (0.2.0-1) unstable; urgency=low
-
-  * New upstream release
-
- -- Brandon Hale <brandon at smarterits.com>  Mon, 11 Oct 2004 09:31:35 -0400
-
-tomboy (0.1.2-2) unstable; urgency=low
-
-  * Fix up build-depends in debian/control, use ${net:Depends} and dh_netdeps
-  as well.
-
- -- Brandon Hale <brandon at smarterits.com>  Thu,  7 Oct 2004 11:14:29 -0400
-
-tomboy (0.1.2-1) unstable; urgency=low
-
-  * New upstream release
-
- -- Brandon Hale <brandon.hale at gmail.com>  Sat, 25 Sep 2004 08:59:36 -0400
-
-tomboy (0.1.1-1) unstable; urgency=low
-
-  * Initial Release.
-
- -- Brandon Hale <brandon.hale at gmail.com>  Mon, 20 Sep 2004 20:08:46 -0400
-

Copied: non-group/tomboy/tags/0.3.9+dfsg-2/debian/changelog (from rev 2694, non-group/tomboy/trunk/debian/changelog)
===================================================================
--- non-group/tomboy/tags/0.3.9+dfsg-2/debian/changelog	                        (rev 0)
+++ non-group/tomboy/tags/0.3.9+dfsg-2/debian/changelog	2006-09-03 16:55:55 UTC (rev 2695)
@@ -0,0 +1,253 @@
+tomboy (0.3.9+dfsg-2) unstable; urgency=medium
+
+  * Added postint to rebuild broken scrollkeeper database using
+    patch to fix it from Loïc Minier - Thanks (Closes: #383201)
+  * Fixes RC bug, thus urgency medium.
+
+ -- Dave Beckett <dajobe at debian.org>  Sun,  3 Sep 2006 09:48:52 -0700
+
+tomboy (0.3.9+dfsg-1) unstable; urgency=medium
+
+  * Provide DFSG version of sources
+  * Disable scrollkeeper from installing into /var (Closes: #382800)
+  
+ -- Dave Beckett <dajobe at debian.org>  Sun, 13 Aug 2006 12:36:00 -0700
+
+tomboy (0.3.9-1) unstable; urgency=medium
+
+  * New upstream release
+    - Builds against GTK 2.0, removed patch 02_gtk-sharp2.patch
+    - Builds against dbus directly rather than using dbus-sharp.  Change 
+      from Build-Depends on libdbus-cil-1 to libdbus-glib-1-2
+    - Preference dialog modality fixed (Closes: #313295)
+    - Italic pasting fixed (Closes: #329476)
+    - Added StickyNoteImport plugin
+    - Uses gnome document tools. Add Build-Depends on gnome-doc-utils and
+      scrollkeeper
+  * Upstream application icon changed "due to legal restrictions"
+    - Remove the replacement third-party images we were using.
+    - Continue to remove one use of the old icon from the source tarball.
+    - Updated patch 01_image_name to remove the last use of the old icon
+    - Added XPM versions of the new icons
+  * Standards version 3.7.2 (no changes)
+  * Updated to latest Debian Mono Policy.  Build-Depend on cli-common-dev
+  * Build depend on libgmime2.2-cil replacing libgmime2.1-cil which was
+    removed from Debian yesterday fixing FTBFS on arm (Closes: #382653)
+  * Urgency medium due to FTBFS fix.
+
+ -- Dave Beckett <dajobe at debian.org>  Sat, 12 Aug 2006 09:43:31 -0700
+
+tomboy (0.3.5-2) unstable; urgency=low
+
+  * Add dependencies to native library (Closes: #364778)
+  * Enable Evolution plugin (Closes: #364779)
+
+ -- Dave Beckett <dajobe at debian.org>  Tue, 25 Apr 2006 20:59:25 -0700
+
+tomboy (0.3.5-1) unstable; urgency=low
+
+  * New upstream release (Closes: #352531)
+  * Require dbus 0.61-3 to get a non-broken assembly version (see bug #354798)
+  * Packaging updates from Ubuntu 0.3.5-0ubuntu1 thanks to Sebastian Dröge
+  * 02_Trie.cs_mcs119.patch deleted as merged into upstream.
+
+ -- Dave Beckett <dajobe at debian.org>  Sat, 18 Mar 2006 19:47:02 -0800
+
+tomboy (0.3.5-0ubuntu1) dapper; urgency=low
+
+  * New upstream release
+  * 01_image_name.patch:
+    + Updated for new upstream version
+  * 02_gtk-sharp2.patch:
+    + Use Gtk#2 instead of Gtk#
+  * Tightened and adjusted Build-Depends
+  * Added ${misc:Depends} to Depends
+  * Updated debhelper compat version to 5
+
+ -- Sebastian Dröge <slomo at ubuntu.com>  Fri, 24 Feb 2006 17:01:15 +0100
+
+tomboy (0.3.3-3) unstable; urgency=low
+
+  * Build against libdbus-1-cil (Closes: #338495)
+
+ -- Dave Beckett <dajobe at debian.org>  Thu, 12 Jan 2006 19:41:41 -0800
+
+tomboy (0.3.3-2) unstable; urgency=low
+
+  * Added patch from CVS to fix Mono 1.1.9.x build (Closes: 337356)
+    -  02_Trie.cs_mcs119.patch from CVS
+
+ -- Dave Beckett <dajobe at debian.org>  Thu,  3 Nov 2005 19:59:02 -0800
+
+tomboy (0.3.3-1) unstable; urgency=low
+
+  * New upstream release
+  * New ExportToHTML plugin
+  * Updated image name fixing patch 01_image_name.patch
+  * Removed Mono 1.1.8.x build patches merged upstream:
+    - 02_mono118_Trie.patch
+    - 03_mono118_AppletFactory.patch
+
+ -- Dave Beckett <dajobe at debian.org>  Wed, 10 Aug 2005 19:33:28 +0100
+
+tomboy (0.3.2-9) unstable; urgency=low
+
+  * Removed obsolete Build-Depend: on mono-jit and mono-utils
+  * Updated debian/watch file to new location.
+  * Added 24x24 icon from same author as the other icons, cleaned up by
+    Gordon Ingram to help the toolbar icon look better (Closes: 316765)
+  * Rebuild for mono 1.1.8.1
+  * Applied patches from CVS to fix 1.1.8.x builds:
+    02_mono118_Trie.patch and 03_mono118_AppletFactory.patch
+  * Add MONO_SHARED_DIR to stop monodis core dumping when called
+    inside dh_clideps
+
+ -- Dave Beckett <dajobe at debian.org>  Mon, 11 Jul 2005 17:13:26 +0100
+
+tomboy (0.3.2-8) unstable; urgency=low
+
+  * Added 16x16 and 32x32 pixmap xpm icons
+  * Added menu and tomboy.desktop linked to the icons
+
+ -- Dave Beckett <dajobe at debian.org>  Tue, 14 Jun 2005 23:07:01 +0100
+
+tomboy (0.3.2-7) unstable; urgency=low
+
+  * Upload to unstable
+  * Depend on libdbus-cil 0.23.4-3 built with mono in unstable
+  * Remove dependency on mono-mint (Closes: 311956)
+
+ -- Dave Beckett <dajobe at debian.org>  Fri, 10 Jun 2005 16:22:59 +0100
+
+tomboy (0.3.2-6) experimental; urgency=low
+
+  * Merge with ubuntu up to 0.3.2-4ubuntu5:
+    - changed the uudecode line from update-config to post-patches in 
+      debian/rules
+    - not applying Tomboy/Trie.cs patch
+
+ -- Dave Beckett <dajobe at debian.org>  Wed,  1 Jun 2005 20:13:48 +0100
+
+tomboy (0.3.2-5) experimental; urgency=low
+
+  * Rebuild package with source inside changes
+
+ -- Dave Beckett <dajobe at debian.org>  Fri, 27 May 2005 13:20:41 +0100
+
+tomboy (0.3.2-4) experimental; urgency=low
+
+  * Upload of tomboy to experimental (Closes: 272264)
+  * Require mono 1.1.6+
+  * Build-Depends on sharutils for uudecode
+
+ -- Dave Beckett <dajobe at debian.org>  Fri, 27 May 2005 13:09:47 +0100
+
+tomboy (0.3.2-3) experimental; urgency=low
+
+  * Standards-Version 3.6.1.0 and depend on newer debhelper for cdbs
+
+ -- Dave Beckett <dajobe at debian.org>  Fri, 15 Apr 2005 22:21:52 +0100
+
+tomboy (0.3.2-2) experimental; urgency=low
+
+  * Rebuild against mono 1.1 packages.
+  * Require cli-common
+
+ -- Dave Beckett <dajobe at debian.org>  Fri, 15 Apr 2005 22:04:15 +0100
+
+tomboy (0.3.2-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Dave Beckett <dajobe at debian.org>  Sun, 10 Apr 2005 15:48:23 +0100
+
+tomboy (0.3.1-1) experimental; urgency=low
+
+  * Port of the packaging from Ubuntu to Debian
+  * Removed non-distributable image from orig.tar.gz and
+    added debian/README.Debian-source to explain this
+  * Added replacement image debian/tomboy.png.uu from Jacub Steiner
+  * Added patches/01_image_name.patch to rename mentions to the image
+
+ -- Dave Beckett <dajobe at debian.org>  Sun, 10 Apr 2005 15:29:35 +0100
+
+tomboy (0.3.1-0ubuntu6) hoary; urgency=low
+
+  * Rebuilt against new libdbus-cil.
+
+ -- Daniel Holbach <dh at mailempfang.de>  Wed, 16 Mar 2005 21:11:11 +0100
+
+tomboy (0.3.1-0ubuntu5) hoary; urgency=low
+
+  * Rebuild with current libs.
+
+ -- Sebastien Bacher <seb128 at canonical.com>  Sat, 19 Feb 2005 14:57:09 +0100
+
+tomboy (0.3.1-0ubuntu4) hoary; urgency=low
+
+  * Er, libpanel-applet2-dev
+
+ -- Matt Zimmerman <mdz at ubuntu.com>  Wed,  2 Feb 2005 20:49:44 -0800
+
+tomboy (0.3.1-0ubuntu3) hoary; urgency=low
+
+  * Build-Depend on libpanel-applet-dev, not libpanel-applet2-0
+
+ -- Matt Zimmerman <mdz at ubuntu.com>  Wed,  2 Feb 2005 11:01:26 -0800
+
+tomboy (0.3.1-0ubuntu2) hoary; urgency=low
+
+  * debian/control
+    build-dep on libpanel-applet2-0 to fix FTBFS.
+
+ -- Brandon Hale <brandon at smarterits.com>  Mon, 31 Jan 2005 23:52:04 -0500
+
+tomboy (0.3.1-0ubuntu1) hoary; urgency=low
+
+  * New upstream release
+    - Made the move to Gnome Panel applet. (TrayIcon mode is still supported).
+    - New plugin system, so anyone can customize their Tomboy notes.
+    - A Note printing plugin
+    - A new preferences dialog
+  * debian/control
+    - Add libdbus-cil to build-deps
+
+ -- Brandon Hale <brandon at smarterits.com>  Thu, 27 Jan 2005 18:35:41 -0500
+
+tomboy (0.2.2-1ubuntu1) hoary; urgency=low
+
+  * Update Build-Dep and fix FTBFS.
+
+ -- Fabio M. Di Nitto <fabbione at fabbione.net>  Mon, 22 Nov 2004 13:10:03 +0100
+
+tomboy (0.2.2-1) hoary; urgency=low
+
+  * New upstream release
+
+ -- Brandon Hale <brandon at localhost.localdomain>  Sun, 21 Nov 2004 15:35:03 -0500
+
+tomboy (0.2.0-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Brandon Hale <brandon at smarterits.com>  Mon, 11 Oct 2004 09:31:35 -0400
+
+tomboy (0.1.2-2) unstable; urgency=low
+
+  * Fix up build-depends in debian/control, use ${net:Depends} and dh_netdeps
+  as well.
+
+ -- Brandon Hale <brandon at smarterits.com>  Thu,  7 Oct 2004 11:14:29 -0400
+
+tomboy (0.1.2-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Brandon Hale <brandon.hale at gmail.com>  Sat, 25 Sep 2004 08:59:36 -0400
+
+tomboy (0.1.1-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Brandon Hale <brandon.hale at gmail.com>  Mon, 20 Sep 2004 20:08:46 -0400
+

Deleted: non-group/tomboy/tags/0.3.9+dfsg-2/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/tags/0.3.9+dfsg-2/debian/patches/01_image_name.patch	2006-09-03 16:55:55 UTC (rev 2695)
@@ -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

Copied: non-group/tomboy/tags/0.3.9+dfsg-2/debian/patches/01_image_name.patch (from rev 2694, non-group/tomboy/trunk/debian/patches/01_image_name.patch)
===================================================================
--- non-group/tomboy/tags/0.3.9+dfsg-2/debian/patches/01_image_name.patch	                        (rev 0)
+++ non-group/tomboy/tags/0.3.9+dfsg-2/debian/patches/01_image_name.patch	2006-09-03 16:55:55 UTC (rev 2695)
@@ -0,0 +1,86 @@
+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

Deleted: non-group/tomboy/tags/0.3.9+dfsg-2/debian/rules
===================================================================
--- non-group/tomboy/trunk/debian/rules	2006-09-03 11:49:06 UTC (rev 2692)
+++ non-group/tomboy/tags/0.3.9+dfsg-2/debian/rules	2006-09-03 16:55:55 UTC (rev 2695)
@@ -1,40 +0,0 @@
-#!/usr/bin/make -f
-
-export MONO_SHARED_DIR=$(CURDIR)
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/class/gnome.mk
-
-DEB_CONFIGURE_SCRIPT_ENV := LDFLAGS="-Wl,-O1"
-DEB_INSTALL_DOCS_ALL := README NEWS
-
-# Add Depend: libgalago-cil to get Galago plugin
-#   However it currently fails to work so don't do that!
-
-common-configure-indep::
-	mkdir -p $(MONO_SHARED_DIR)/.wapi
-
-install/tomboy::
-	uudecode debian/tomboy-16.xpm.uu && mv tomboy-16.xpm debian/tomboy/usr/share/pixmaps
-	uudecode debian/tomboy-32.xpm.uu && mv tomboy-32.xpm debian/tomboy/usr/share/pixmaps
-
-	mkdir -p debian/tomboy/usr/share/applications
-	cp debian/tomboy.desktop debian/tomboy/usr/share/applications
-	rm -f debian/tomboy/usr/lib/tomboy/Plugins/GalagoPresence.dll
-
-common-binary-predeb-arch::
-	dh_clideps -d
-
-clean::
-	rm -rf $(MONO_SHARED_DIR)/.wapi
-
-	rm -f Tomboy/Plugins/*.dll*
-
-# cdbs leaves junk around after patching
-	if test -r config.guess.cdbs-orig ; then \
-	  mv -f config.guess.cdbs-orig config.guess; \
-	fi
-	if test -r config.sub.cdbs-orig ; then \
-	  mv -f config.sub.cdbs-orig config.sub; \
-	fi

Copied: non-group/tomboy/tags/0.3.9+dfsg-2/debian/rules (from rev 2694, non-group/tomboy/trunk/debian/rules)
===================================================================
--- non-group/tomboy/tags/0.3.9+dfsg-2/debian/rules	                        (rev 0)
+++ non-group/tomboy/tags/0.3.9+dfsg-2/debian/rules	2006-09-03 16:55:55 UTC (rev 2695)
@@ -0,0 +1,41 @@
+#!/usr/bin/make -f
+
+export MONO_SHARED_DIR=$(CURDIR)
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/class/gnome.mk
+
+DEB_CONFIGURE_SCRIPT_ENV := LDFLAGS="-Wl,-O1"
+DEB_CONFIGURE_EXTRA_FLAGS := --disable-scrollkeeper
+DEB_INSTALL_DOCS_ALL := README NEWS
+
+# Add Depend: libgalago-cil to get Galago plugin
+#   However it currently fails to work so don't do that!
+
+common-configure-indep::
+	mkdir -p $(MONO_SHARED_DIR)/.wapi
+
+install/tomboy::
+	uudecode debian/tomboy-16.xpm.uu && mv tomboy-16.xpm debian/tomboy/usr/share/pixmaps
+	uudecode debian/tomboy-32.xpm.uu && mv tomboy-32.xpm debian/tomboy/usr/share/pixmaps
+
+	mkdir -p debian/tomboy/usr/share/applications
+	cp debian/tomboy.desktop debian/tomboy/usr/share/applications
+	rm -f debian/tomboy/usr/lib/tomboy/Plugins/GalagoPresence.dll
+
+common-binary-predeb-arch::
+	dh_clideps -d
+
+clean::
+	rm -rf $(MONO_SHARED_DIR)/.wapi
+
+	rm -f Tomboy/Plugins/*.dll*
+
+# cdbs leaves junk around after patching
+	if test -r config.guess.cdbs-orig ; then \
+	  mv -f config.guess.cdbs-orig config.guess; \
+	fi
+	if test -r config.sub.cdbs-orig ; then \
+	  mv -f config.sub.cdbs-orig config.sub; \
+	fi

Deleted: non-group/tomboy/tags/0.3.9+dfsg-2/debian/tomboy.png.uu
===================================================================
--- non-group/tomboy/trunk/debian/tomboy.png.uu	2006-09-03 11:49:06 UTC (rev 2692)
+++ non-group/tomboy/tags/0.3.9+dfsg-2/debian/tomboy.png.uu	2006-09-03 16:55:55 UTC (rev 2695)
@@ -1,37 +0,0 @@
-begin 644 tomboy.png
-MB5!.1PT*&@H````-24A$4@```#`````P"`8```!7`OF'````!F)+1T0`T0"4
-M``R^>K&1````"7!(67,```L3```+$P$`FIP8````!W1)344'U`L"#3<5;:#:
-MCP```#5T15AT0V]M;65N=``H8RD@,C`P-"!*86MU8B!3=&5I;F5R"@I#<F5A
-M=&5D('=I=&@@5&AE($=)35"0V8MO```%'$E$051XVNV976P4513'?S.SN_TD
-M1<I&(0+VA0")%)"D%A'!1"%%P6#B=]#$E%8?X,$GHR&FT(382&(DL1)`H@]$
-MB5I*4XTF:BAT01`H/@"Q@!1+D=7MNEV[GW/'!V:W^SG,[LZNDO0D-]UN9N\]
-M=^XYYW?^,S!IDS9I=[1)19I3*G!N+6&4U)I3%L]W;`8J`:64)R`!0JA!-#60
-M]R01_R7*IRT%F`/\"02,3L)F=3AJ:@`1]6<)#*%_N/57T[2$[T7JU=,`/Q`L
-MZ09BF^CN7$%+NYN]6YVL;3W)E9[G"=P\F_F7LHV:NC7,7-Z6^*U##R'#*)&+
-ME0PM[6X&OFSDU38WHQ</9G<>0$09_M65>A*FPKMH&_CH+2?U&USLW>IDN+^=
-M,\-.(JJ<<00B"F=NS,YK'5NQ-K"N]0CK6L$[>)A+/VQGM'8C[_;]K,=8<DC;
-M[0HO/K<>#6TB+_X##BA`5`V/HH;<='>NH.L;#YN?=+#KU&KV='9D3.38_YJ>
-MIR+BHZ*V`>!!X#+@`=22GT!+NYOOME72^(:?,4]':M!G=!Y-)&RPL!#*AZ9)
-MT#FP=2J^?X)\MN/NE#)JX'P>)F>AJ="/+9K#"`$HCKMX]O$%U-HC[/ME-4V;
-M^HOF?*83D(#=A=#4<^$`0\=VL/V3ZQPY?XC>W?TT-1\UYWQFH.6\@8)H>NUH
-M&WU7[N,KUQ"_?[^<^@TN1IJ+UWS9<J'IZ,6#N$]_@%"#:;VC4`/4U*TA%`HQ
-M=]E&X'B<`^;OOL4<B-&T?H.+&RV"Z\?:D(AFO=X[V$/?T`(VO[P4@)%KY],<
-M-';>NBJ41E.`<R.US'>Z"41MV)6)A2*JS'C8QA]C52Q<]5I"A^!/K_MI89=<
-M5D74EZ@)<@99$HSB%\EV`'9]N)_C)TXSI;J*8#`47Z>\O(SJZDKFS)K)ZZTO
-M)<(H7]L)?`H,`5ZCS)9N1]-X#K2X#.]<%IJN`<:!2`I7)`,EAEZ21P%WBAY(
-M4VJF<V!DDY8/3<>!&\!ZH,."HK,%V*-O4,TY!_(`4D07)1T6*;7W@:Y$I68S
-MTU$BW;ILZ.HX`^?\6:^OK)18M+"<J5/2PZ)82LUT#C0U'^5PSTU#":%I&I(T
-MT3$+(<9E61:^,6_U(ROGH47]G.U]+(DM5W_S,S#P=^;F2H'::78:&J8@(KZ8
-M5FX`KL2Z5/,YT`P_G>KA@<5-:%EJ=30:X<S`MPP.GJ"KYT>`OJ>?>L7I]?ZU
-M9&K-FVB:P%_S,?LZ[835"KH/#>L')&693\,W- at Y:55:EED,."%:MG,N>?=M1
-M%"6A2$]\*G/8>>&9)]CV]CHJIC\$\,X77?MG`9_?.[L:30TQ=/%K7.>"+)GG
-MX)ZZ1VEL6$_=G/N1)#D^ER3):)I`"!6WVP,X<^.`B/J)!JYGC=7;T51$?%0X
-M'XZ)DJO`B!%;CO6?1%&4N%(+A<.4.1R4E=E97+\@E2U)0B?C!H*>4_'$3<:[
-M>9I6S5B;<0,6L"5I`[8,(-FBEZM";6=BO;:0+8:]D*:#HDLO5XX\=;,&A/6[
-M%+28+;<5]0I0!I2;>39I8*KN?!0(I>9`/$1-.B\B/BJF-Z:%D)QEX8#>1'D*
-M&%Y]GJ00ZNY<P8Q9\^G=O<S\G3=0:K)!",1T<;Y#9&J)$Y_866%%>S)GEBV%
-M*C6I!#X7 at RV73;425EK8=Z%@MN2BU*PT67_C8L6;F_>`17J)ETL50A)0`4RW
-MD"UQ/2"5Z!2L9DN<\%()0^F.?GLY:9/V?[5_`=W8JP!$K6=S`````$E%3D2N
-#0F""
-`
-end

Copied: non-group/tomboy/tags/0.3.9+dfsg-2/debian/tomboy.postinst (from rev 2693, non-group/tomboy/trunk/debian/tomboy.postinst)
===================================================================
--- non-group/tomboy/tags/0.3.9+dfsg-2/debian/tomboy.postinst	                        (rev 0)
+++ non-group/tomboy/tags/0.3.9+dfsg-2/debian/tomboy.postinst	2006-09-03 16:55:55 UTC (rev 2695)
@@ -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#




More information about the Pkg-mono-svn-commits mailing list