[Pkg-mono-svn-commits] rev 1901 - in non-group/tomboy/trunk/debian: . patches
Dave Beckett
dajobe@costa.debian.org
Mon, 11 Jul 2005 18:14:25 +0000
Author: dajobe
Date: 2005-07-11 18:14:25 +0000 (Mon, 11 Jul 2005)
New Revision: 1901
Modified:
non-group/tomboy/trunk/debian/changelog
non-group/tomboy/trunk/debian/control
non-group/tomboy/trunk/debian/copyright
non-group/tomboy/trunk/debian/patches/01_image_name.patch
non-group/tomboy/trunk/debian/rules
non-group/tomboy/trunk/debian/watch
Log:
tomboy-0.3.2-9
Modified: non-group/tomboy/trunk/debian/changelog
===================================================================
--- non-group/tomboy/trunk/debian/changelog 2005-07-10 23:02:56 UTC (rev 1900)
+++ non-group/tomboy/trunk/debian/changelog 2005-07-11 18:14:25 UTC (rev 1901)
@@ -1,3 +1,17 @@
+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@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
Modified: non-group/tomboy/trunk/debian/control
===================================================================
--- non-group/tomboy/trunk/debian/control 2005-07-10 23:02:56 UTC (rev 1900)
+++ non-group/tomboy/trunk/debian/control 2005-07-11 18:14:25 UTC (rev 1901)
@@ -2,7 +2,7 @@
Section: gnome
Priority: optional
Maintainer: Dave Beckett <dajobe@debian.org>
-Build-Depends: cdbs, debhelper (>= 4.1.87), mono-mcs (>= 1.1.6) | c-sharp-compiler, libgtk-cil (>= 1.0), libgnome-cil (>= 1.0), libgtkspell-dev (>= 2.0.5), mono-jit [i386 powerpc amd64], libmono-dev (>= 1.1.6), mono-utils (>= 0.96), intltool, libdbus-cil (>= 0.23.4-3), libpanel-applet2-dev, cli-common (>= 0.1.3), sharutils
+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-cil (>= 0.23.4-3), libpanel-applet2-dev, cli-common (>= 0.1.3), sharutils
Standards-Version: 3.6.1.0
Package: tomboy
Modified: non-group/tomboy/trunk/debian/copyright
===================================================================
--- non-group/tomboy/trunk/debian/copyright 2005-07-10 23:02:56 UTC (rev 1900)
+++ non-group/tomboy/trunk/debian/copyright 2005-07-11 18:14:25 UTC (rev 1901)
@@ -13,8 +13,8 @@
---
-The tomboy-16.xpm.uu tomboy-32.xpm.uu and tomboy.png.uu files
-are uuencoding of icons in PNG format that are
+The tomboy-16.xpm.uu, tomboy-32.xpm.uu, tomboy.png.uu and
+tomboy-24.png.uu files are uuencodings of icons in PNG format that are:
Copyright Jakub Steiner, Copyright Novell
from http://jimmac.musichall.cz/i.php?i=tomboy
Modified: non-group/tomboy/trunk/debian/patches/01_image_name.patch
===================================================================
--- non-group/tomboy/trunk/debian/patches/01_image_name.patch 2005-07-10 23:02:56 UTC (rev 1900)
+++ non-group/tomboy/trunk/debian/patches/01_image_name.patch 2005-07-11 18:14:25 UTC (rev 1901)
@@ -1,24 +1,26 @@
diff -urN tomboy-0.3.1.orig/Tomboy/Makefile.am tomboy-0.3.1/Tomboy/Makefile.am
--- tomboy-0.3.1.orig/Tomboy/Makefile.am 2005-01-18 10:55:19.000000000 +0000
+++ tomboy-0.3.1/Tomboy/Makefile.am 2005-03-13 20:01:14.000000000 +0000
-@@ -60,7 +60,7 @@
+@@ -60,7 +60,8 @@
RESOURCES = \
-resource:$(top_srcdir)/data/GNOME_TomboyApplet.xml,GNOME_TomboyApplet.xml \
-resource:$(top_srcdir)/data/Start_Here.note,Start_Here.note \
- -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.1.orig/Tomboy/Makefile.in tomboy-0.3.1/Tomboy/Makefile.in
--- tomboy-0.3.1.orig/Tomboy/Makefile.in 2005-01-19 00:10:44.000000000 +0000
+++ tomboy-0.3.1/Tomboy/Makefile.in 2005-03-13 20:07:34.000000000 +0000
-@@ -269,7 +269,7 @@
+@@ -269,7 +269,8 @@
RESOURCES = \
-resource:$(top_srcdir)/data/GNOME_TomboyApplet.xml,GNOME_TomboyApplet.xml \
-resource:$(top_srcdir)/data/Start_Here.note,Start_Here.note \
- -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
@@ -63,7 +65,7 @@
{
- tintin = GuiUtils.GetMiniIcon ("tintin.png");
- tintin_large = GuiUtils.GetIcon ("tintin.png");
-+ tomboy = GuiUtils.GetMiniIcon ("tomboy.png");
++ tomboy = GuiUtils.GetMiniIcon ("tomboy-24.png");
+ tomboy_large = GuiUtils.GetIcon ("tomboy.png");
stock_notes = GuiUtils.GetMiniIcon ("stock_notes.png");
}
@@ -103,45 +105,48 @@
diff -urN tomboy-0.3.1.orig/data/images/Makefile.am tomboy-0.3.1/data/images/Makefile.am
--- tomboy-0.3.1.orig/data/images/Makefile.am 2004-10-31 01:11:30.000000000 +0000
+++ tomboy-0.3.1/data/images/Makefile.am 2005-03-13 19:59:45.000000000 +0000
-@@ -1,10 +1,10 @@
+@@ -1,10 +1,11 @@
pixmapdir = $(datadir)/pixmaps
-pixmap_DATA = tintin.png
-+pixmap_DATA = tomboy.png
++pixmap_DATA = tomboy.png tomboy-24.png
noinst_DATA = \
gnome-stock-searchtool.png \
stock_notes.png \
- tintin.png
-+ tomboy.png
++ tomboy.png \
++ tomboy-24.png
EXTRA_DIST = $(noinst_DATA) $(pixmap_DATA)
diff -urN tomboy-0.3.1.orig/data/images/Makefile.in tomboy-0.3.1/data/images/Makefile.in
--- tomboy-0.3.1.orig/data/images/Makefile.in 2005-01-19 00:10:45.000000000 +0000
+++ tomboy-0.3.1/data/images/Makefile.in 2005-03-13 20:00:09.000000000 +0000
-@@ -208,11 +208,11 @@
+@@ -208,11 +208,12 @@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
pixmapdir = $(datadir)/pixmaps
-pixmap_DATA = tintin.png
-+pixmap_DATA = tomboy.png
++pixmap_DATA = tomboy.png tomboy-24.png
noinst_DATA = \
gnome-stock-searchtool.png \
stock_notes.png \
- tintin.png
-+ tomboy.png
++ tomboy.png \
++ tomboy-24.png
EXTRA_DIST = $(noinst_DATA) $(pixmap_DATA)
all: all-am
diff -urN tomboy-0.3.1.orig/tomboy.spec.in tomboy-0.3.1/tomboy.spec.in
--- tomboy-0.3.1.orig/tomboy.spec.in 2005-01-18 10:34:48.000000000 +0000
+++ tomboy-0.3.1/tomboy.spec.in 2005-03-13 19:58:01.000000000 +0000
-@@ -86,7 +86,7 @@
+@@ -86,7 +86,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
Modified: non-group/tomboy/trunk/debian/rules
===================================================================
--- non-group/tomboy/trunk/debian/rules 2005-07-10 23:02:56 UTC (rev 1900)
+++ non-group/tomboy/trunk/debian/rules 2005-07-11 18:14:25 UTC (rev 1901)
@@ -1,5 +1,7 @@
#!/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
@@ -7,8 +9,12 @@
DEB_CONFIGURE_SCRIPT_ENV := LDFLAGS="-Wl,-O1"
DEB_INSTALL_DOCS_ALL := README NEWS
+common-configure-indep::
+ mkdir -p $(MONO_SHARED_DIR)/.wapi
+
post-patches::
uudecode debian/tomboy.png.uu && mv tomboy.png data/images/tomboy.png
+ uudecode debian/tomboy-24.png.uu && mv tomboy-24.png data/images/tomboy-24.png
install/tomboy::
uudecode debian/tomboy-16.xpm.uu && mv tomboy-16.xpm debian/tomboy/usr/share/pixmaps
@@ -18,11 +24,13 @@
cp debian/tomboy.desktop debian/tomboy/usr/share/applications
common-binary-predeb-arch::
- dh_makeclilibs
dh_clideps
clean::
+ rm -rf $(MONO_SHARED_DIR)/.wapi
+
rm -f data/images/tomboy.png
+ rm -f data/images/tomboy-24.png
# cdbs leaves junk around after patching
if test -r config.guess.cdbs-orig ; then \
Modified: non-group/tomboy/trunk/debian/watch
===================================================================
--- non-group/tomboy/trunk/debian/watch 2005-07-10 23:02:56 UTC (rev 1900)
+++ non-group/tomboy/trunk/debian/watch 2005-07-11 18:14:25 UTC (rev 1901)
@@ -1,3 +1,3 @@
version=2
-http://www.beatniksoftware.com/tomboy/tomboy-(.*)\.tar\.gz
+http://www.beatniksoftware.com/tomboy/releases/tomboy-(.*)\.tar\.gz