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

Dave Beckett dajobe at costa.debian.org
Sun Mar 19 05:24:29 UTC 2006 

Author: dajobe
Date: 2006-03-19 05:24:28 +0000 (Sun, 19 Mar 2006)
New Revision: 2334

Modified:
   non-group/tomboy/trunk/debian/changelog
   non-group/tomboy/trunk/debian/compat
   non-group/tomboy/trunk/debian/control
   non-group/tomboy/trunk/debian/patches/01_image_name.patch
Log:
tomboy 0.3.5-1

Modified: non-group/tomboy/trunk/debian/changelog
===================================================================
--- non-group/tomboy/trunk/debian/changelog	2006-03-14 17:54:10 UTC (rev 2333)
+++ non-group/tomboy/trunk/debian/changelog	2006-03-19 05:24:28 UTC (rev 2334)
@@ -1,3 +1,25 @@
+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)

Modified: non-group/tomboy/trunk/debian/compat
===================================================================
--- non-group/tomboy/trunk/debian/compat	2006-03-14 17:54:10 UTC (rev 2333)
+++ non-group/tomboy/trunk/debian/compat	2006-03-19 05:24:28 UTC (rev 2334)
@@ -1 +1 @@
-4
+5

Modified: non-group/tomboy/trunk/debian/control
===================================================================
--- non-group/tomboy/trunk/debian/control	2006-03-14 17:54:10 UTC (rev 2333)
+++ non-group/tomboy/trunk/debian/control	2006-03-19 05:24:28 UTC (rev 2334)
@@ -2,12 +2,12 @@
 Section: gnome
 Priority: optional
 Maintainer: Dave Beckett <dajobe at debian.org>
-Build-Depends: cdbs, debhelper (>= 4.1.87), mono-mcs (>= 1.1.8.1) | c-sharp-compiler, libgtk-cil (>= 1.0), libgnome-cil (>= 1.0), libgtkspell-dev (>= 2.0.5), libmono-dev (>= 1.1.8.1), intltool, libdbus-1-cil (>= 0.60), libpanel-applet2-dev, cli-common (>= 0.1.3), sharutils, libgnomeprintui2.2-dev
+Build-Depends: cdbs, debhelper (>= 5), mono-mcs (>= 1.1.8.1) | c-sharp-compiler, libgtk2.0-cil, libgnome2.0-cil, libgtkspell-dev (>= 2.0.9), libmono-dev (>= 1.1.8.1), intltool, libdbus-1-cil (>= 0.61-3), libpanel-applet2-dev, cli-common (>= 0.2.0), sharutils, libgnomeprintui2.2-dev, libgtk2.0-dev (>= 2.6), libatk1.0-dev (>= 1.2.4)
 Standards-Version: 3.6.2
 
 Package: tomboy
 Architecture: any
-Depends: ${cli:Depends}
+Depends: ${cli:Depends}, ${misc:Depends}
 Description: desktop note taking program using Wiki style links
  Tomboy is a desktop note-taking application which is simple and easy to
  use. It lets you organise your notes intelligently by allowing you to

Modified: non-group/tomboy/trunk/debian/patches/01_image_name.patch
===================================================================
--- non-group/tomboy/trunk/debian/patches/01_image_name.patch	2006-03-14 17:54:10 UTC (rev 2333)
+++ non-group/tomboy/trunk/debian/patches/01_image_name.patch	2006-03-19 05:24:28 UTC (rev 2334)
@@ -1,29 +1,3 @@
-diff -urN tomboy-0.3.3.orig/Tomboy/Makefile.am tomboy-0.3.3/Tomboy/Makefile.am
---- tomboy-0.3.3.orig/Tomboy/Makefile.am	2005-08-10 08:47:27.000000000 +0100
-+++ tomboy-0.3.3/Tomboy/Makefile.am	2005-08-10 11:15:38.000000000 +0100
-@@ -62,7 +62,8 @@
- 	-resource:$(top_srcdir)/data/GNOME_TomboyApplet.xml,GNOME_TomboyApplet.xml	\
- 	-resource:$(top_srcdir)/data/Start_Here.note,Start_Here.note			\
- 	-resource:$(top_builddir)/data/DefaultPlugins.desktop,DefaultPlugins.desktop	\
--	-resource:$(top_srcdir)/data/images/tintin.png,tintin.png			\
-+	-resource:$(top_srcdir)/data/images/tomboy.png,tomboy.png			\
-+	-resource:$(top_srcdir)/data/images/tomboy-24.png,tomboy-24.png			\
- 	-resource:$(top_srcdir)/data/images/stock_notes.png,stock_notes.png		\
- 	-resource:$(top_srcdir)/data/images/gnome-stock-searchtool.png,gnome-stock-searchtool.png
- 
-diff -urN tomboy-0.3.3.orig/Tomboy/Makefile.in tomboy-0.3.3/Tomboy/Makefile.in
---- tomboy-0.3.3.orig/Tomboy/Makefile.in	2005-08-10 08:53:07.000000000 +0100
-+++ tomboy-0.3.3/Tomboy/Makefile.in	2005-08-10 11:16:06.000000000 +0100
-@@ -278,7 +278,8 @@
- 	-resource:$(top_srcdir)/data/GNOME_TomboyApplet.xml,GNOME_TomboyApplet.xml	\
- 	-resource:$(top_srcdir)/data/Start_Here.note,Start_Here.note			\
- 	-resource:$(top_builddir)/data/DefaultPlugins.desktop,DefaultPlugins.desktop	\
--	-resource:$(top_srcdir)/data/images/tintin.png,tintin.png			\
-+	-resource:$(top_srcdir)/data/images/tomboy.png,tomboy.png			\
-+	-resource:$(top_srcdir)/data/images/tomboy-24.png,tomboy-24.png			\
- 	-resource:$(top_srcdir)/data/images/stock_notes.png,stock_notes.png		\
- 	-resource:$(top_srcdir)/data/images/gnome-stock-searchtool.png,gnome-stock-searchtool.png
- 
 diff -urN tomboy-0.3.3.orig/Tomboy/Preferences.cs tomboy-0.3.3/Tomboy/Preferences.cs
 --- tomboy-0.3.3.orig/Tomboy/Preferences.cs	2005-05-25 04:10:11.000000000 +0100
 +++ tomboy-0.3.3/Tomboy/Preferences.cs	2005-08-10 11:14:43.000000000 +0100
@@ -102,27 +76,40 @@
  
  	<oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
          <oaf_attribute name="bugzilla:product" type="string" value="Tomboy"/>
-diff -urN tomboy-0.3.3.orig/data/images/Makefile.am tomboy-0.3.3/data/images/Makefile.am
---- tomboy-0.3.3.orig/data/images/Makefile.am	2004-10-31 01:11:30.000000000 +0000
-+++ tomboy-0.3.3/data/images/Makefile.am	2005-08-10 11:14:43.000000000 +0100
-@@ -1,10 +1,11 @@
+diff -urN tomboy-0.3.3.orig/tomboy.spec.in tomboy-0.3.3/tomboy.spec.in
+--- tomboy-0.3.3.orig/tomboy.spec.in	2005-03-09 08:59:57.000000000 +0000
++++ tomboy-0.3.3/tomboy.spec.in	2005-08-10 11:14:43.000000000 +0100
+@@ -83,7 +83,8 @@
+ %{_mandir}/man1/%{name}.1.gz
+ ###%{_datadir}/applications/tomboy.desktop
+ %{_datadir}/gnome-2.0/ui/GNOME_TomboyApplet.xml
+-%{_datadir}/pixmaps/tintin.png
++%{_datadir}/pixmaps/tomboy.png
++%{_datadir}/pixmaps/tomboy-24.png
+ %{_sysconfdir}/gconf/schemas/tomboy.schemas
  
+ %changelog
+
+--- tomboy-0.3.5/data/images/Makefile.am.old	2006-02-24 17:21:55.229489056 +0100
++++ tomboy-0.3.5/data/images/Makefile.am	2006-02-24 17:22:28.774389456 +0100
+@@ -1,11 +1,12 @@
+ 
  pixmapdir = $(datadir)/pixmaps
 -pixmap_DATA = tintin.png
 +pixmap_DATA = tomboy.png tomboy-24.png
  
  noinst_DATA = 				\
  	gnome-stock-searchtool.png	\
+ 	stock_mail.png			\
  	stock_notes.png			\
 -	tintin.png
 +	tomboy.png			\
 +	tomboy-24.png
  
  EXTRA_DIST = $(noinst_DATA) $(pixmap_DATA)
-diff -urN tomboy-0.3.3.orig/data/images/Makefile.in tomboy-0.3.3/data/images/Makefile.in
---- tomboy-0.3.3.orig/data/images/Makefile.in	2005-08-10 08:37:20.000000000 +0100
-+++ tomboy-0.3.3/data/images/Makefile.in	2005-08-10 11:14:43.000000000 +0100
-@@ -215,11 +215,12 @@
+--- tomboy-0.3.5/data/images/Makefile.in.old	2006-02-24 17:21:58.741955080 +0100
++++ tomboy-0.3.5/data/images/Makefile.in	2006-02-24 17:22:56.280207936 +0100
+@@ -225,12 +225,13 @@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  pixmapdir = $(datadir)/pixmaps
@@ -130,6 +117,7 @@
 +pixmap_DATA = tomboy.png tomboy-24.png
  noinst_DATA = \
  	gnome-stock-searchtool.png	\
+ 	stock_mail.png			\
  	stock_notes.png			\
 -	tintin.png
 +	tomboy.png			\
@@ -137,16 +125,27 @@
  
  EXTRA_DIST = $(noinst_DATA) $(pixmap_DATA)
  all: all-am
-diff -urN tomboy-0.3.3.orig/tomboy.spec.in tomboy-0.3.3/tomboy.spec.in
---- tomboy-0.3.3.orig/tomboy.spec.in	2005-03-09 08:59:57.000000000 +0000
-+++ tomboy-0.3.3/tomboy.spec.in	2005-08-10 11:14:43.000000000 +0100
-@@ -83,7 +83,8 @@
- %{_mandir}/man1/%{name}.1.gz
- ###%{_datadir}/applications/tomboy.desktop
- %{_datadir}/gnome-2.0/ui/GNOME_TomboyApplet.xml
--%{_datadir}/pixmaps/tintin.png
-+%{_datadir}/pixmaps/tomboy.png
-+%{_datadir}/pixmaps/tomboy-24.png
- %{_sysconfdir}/gconf/schemas/tomboy.schemas
+--- tomboy-0.3.5/Tomboy/Makefile.am.old	2006-02-24 17:20:18.016267712 +0100
++++ tomboy-0.3.5/Tomboy/Makefile.am	2006-02-24 17:20:49.079545376 +0100
+@@ -63,7 +63,8 @@
+ 	-resource:$(top_srcdir)/data/GNOME_TomboyApplet.xml,GNOME_TomboyApplet.xml	\
+ 	-resource:$(top_srcdir)/data/Start_Here.note,Start_Here.note			\
+ 	-resource:$(top_builddir)/data/DefaultPlugins.desktop,DefaultPlugins.desktop	\
+-	-resource:$(top_srcdir)/data/images/tintin.png,tintin.png			\
++	-resource:$(top_srcdir)/data/images/tomboy.png,tomboy.png			\
++	-resource:$(top_srcdir)/data/images/tomboy-24.png,tomboy-24.png			\
+ 	-resource:$(top_srcdir)/data/images/stock_notes.png,stock_notes.png		\
+ 	-resource:$(top_srcdir)/data/images/gnome-stock-searchtool.png,gnome-stock-searchtool.png
  
- %changelog
+--- tomboy-0.3.5/Tomboy/Makefile.in.old	2006-02-24 17:20:21.889678864 +0100
++++ tomboy-0.3.5/Tomboy/Makefile.in	2006-02-24 17:21:13.458839160 +0100
+@@ -289,7 +289,8 @@
+ 	-resource:$(top_srcdir)/data/GNOME_TomboyApplet.xml,GNOME_TomboyApplet.xml	\
+ 	-resource:$(top_srcdir)/data/Start_Here.note,Start_Here.note			\
+ 	-resource:$(top_builddir)/data/DefaultPlugins.desktop,DefaultPlugins.desktop	\
+-	-resource:$(top_srcdir)/data/images/tintin.png,tintin.png			\
++	-resource:$(top_srcdir)/data/images/tomboy.png,tomboy.png			\
++	-resource:$(top_srcdir)/data/images/tomboy-24.png,tomboy-24.png			\
+ 	-resource:$(top_srcdir)/data/images/stock_notes.png,stock_notes.png		\
+ 	-resource:$(top_srcdir)/data/images/gnome-stock-searchtool.png,gnome-stock-searchtool.png
+

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