[Pkg-mono-svn-commits] rev 2736 - in non-group/tomboy/trunk/debian:
. patches
Dave Beckett
dajobe at costa.debian.org
Sun Sep 24 02:40:57 UTC 2006
Author: dajobe
Date: 2006-09-24 02:40:57 +0000 (Sun, 24 Sep 2006)
New Revision: 2736
Added:
non-group/tomboy/trunk/debian/patches/01-dbus0.9.patch
Removed:
non-group/tomboy/trunk/debian/patches/01_image_name.patch
Modified:
non-group/tomboy/trunk/debian/changelog
non-group/tomboy/trunk/debian/control
Log:
tomboy (0.4.1-1)
Modified: non-group/tomboy/trunk/debian/changelog
===================================================================
--- non-group/tomboy/trunk/debian/changelog 2006-09-23 23:30:41 UTC (rev 2735)
+++ non-group/tomboy/trunk/debian/changelog 2006-09-24 02:40:57 UTC (rev 2736)
@@ -1,3 +1,22 @@
+tomboy (0.4.1-1) unstable; urgency=low
+
+ * New upstream release
+ * Upstream sources now DFSG as last old icon removed.
+ - removed 01_image_name patch
+ * Added D-BUS API change patch 04_dbus0.9.patch. (Closes: #385382)
+ * Acknowledge NMU in 0.3.9+dfsg-2.1 for previous patch.
+ * Depend on libdbus-1-dev (>= 0.90), no longer use libdbus-cil
+ * Packaged new Sticky Notes import plugin
+
+ -- Dave Beckett <dajobe at debian.org> Sat, 23 Sep 2006 19:30:03 -0700
+
+tomboy (0.3.9+dfsg-2.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Add Patch for deprecated dbus functions (Closes: #385382)
+
+ -- Michael Ablassmeier <abi at debian.org> Tue, 19 Sep 2006 09:11:38 +0200
+
tomboy (0.3.9+dfsg-2) unstable; urgency=medium
* Added postint to rebuild broken scrollkeeper database using
Modified: non-group/tomboy/trunk/debian/control
===================================================================
--- non-group/tomboy/trunk/debian/control 2006-09-23 23:30:41 UTC (rev 2735)
+++ non-group/tomboy/trunk/debian/control 2006-09-24 02:40:57 UTC (rev 2736)
@@ -2,7 +2,7 @@
Section: gnome
Priority: optional
Maintainer: Dave Beckett <dajobe at debian.org>
-Build-Depends: cdbs, debhelper (>= 5), mono-mcs (>= 1.1.8.1) | c-sharp-compiler, libgtk2.0-cil, libgnome2.0-cil, libgconf2.0-cil, libgtkspell-dev (>= 2.0.9), libmono-dev (>= 1.1.8.1), intltool, libdbus-glib-1-2 (>= 0.60), libpanel-applet2-dev, cli-common-dev (>= 0.4.0), sharutils, libgnomeprintui2.2-dev, libgtk2.0-dev (>= 2.6), libatk1.0-dev (>= 1.2.4), libgmime2.2-cil, gnome-doc-utils (>= 0.3.2), scrollkeeper
+Build-Depends: cdbs, debhelper (>= 5), mono-mcs (>= 1.1.8.1) | c-sharp-compiler, libgtk2.0-cil, libgnome2.0-cil, libgconf2.0-cil, libgtkspell-dev (>= 2.0.9), libmono-dev (>= 1.1.8.1), intltool, libdbus-1-dev (>=0.90), libdbus-glib-1-2 (>= 0.60), libpanel-applet2-dev, cli-common-dev (>= 0.4.0), sharutils, libgnomeprintui2.2-dev, libgtk2.0-dev (>= 2.6), libatk1.0-dev (>= 1.2.4), libgmime2.2-cil, gnome-doc-utils (>= 0.3.2), scrollkeeper
Standards-Version: 3.7.2
Package: tomboy
Added: non-group/tomboy/trunk/debian/patches/01-dbus0.9.patch
===================================================================
--- non-group/tomboy/trunk/debian/patches/01-dbus0.9.patch (rev 0)
+++ non-group/tomboy/trunk/debian/patches/01-dbus0.9.patch 2006-09-24 02:40:57 UTC (rev 2736)
@@ -0,0 +1,20 @@
+--- Tomboy/dbus-sharp/Connection.cs.old 2006-08-24 17:14:03.056705000 +0200
++++ Tomboy/dbus-sharp/Connection.cs 2006-08-24 17:14:15.061455250 +0200
+@@ -89,7 +89,7 @@
+ {
+ if (disposing && RawConnection != IntPtr.Zero)
+ {
+- dbus_connection_disconnect(rawConnection);
++ dbus_connection_close(rawConnection);
+
+ RawConnection = IntPtr.Zero; // free the native object
+ }
+@@ -314,7 +314,7 @@
+ int slot);
+
+ [DllImport ("dbus-1")]
+- private extern static void dbus_connection_disconnect (IntPtr ptr);
++ private extern static void dbus_connection_close (IntPtr ptr);
+
+ [DllImport ("dbus-1")]
+ private extern static IntPtr dbus_bus_get_unique_name (IntPtr ptr);
Deleted: non-group/tomboy/trunk/debian/patches/01_image_name.patch
===================================================================
--- non-group/tomboy/trunk/debian/patches/01_image_name.patch 2006-09-23 23:30:41 UTC (rev 2735)
+++ non-group/tomboy/trunk/debian/patches/01_image_name.patch 2006-09-24 02:40:57 UTC (rev 2736)
@@ -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
More information about the Pkg-mono-svn-commits
mailing list