[Pkg-cli-apps-commits] [SCM] Tomboy - desktop note taking program using Wiki style links branch, ubuntu, updated. debian/1.11.1-1ubuntu1
Iain Lane
laney at debian.org
Thu May 3 22:55:52 UTC 2012
The following commit has been merged in the ubuntu branch:
commit 3cbe3f14512b26a2bba359d39aec535cf5d60014
Author: Iain Lane <laney at debian.org>
Date: Thu May 3 21:17:06 2012 +0100
Refresh patches to apply cleanly
diff --git a/debian/patches/01_dllmaps.patch b/debian/patches/01_dllmaps.patch
index b832db4..7989d88 100644
--- a/debian/patches/01_dllmaps.patch
+++ b/debian/patches/01_dllmaps.patch
@@ -1,8 +1,8 @@
Description: Update libtomboy dllmap to use absolute path
-Index: tomboy.git/Tomboy/Tomboy.exe.config.in
+Index: tomboy/Tomboy/Tomboy.exe.config.in
===================================================================
---- tomboy.git.orig/Tomboy/Tomboy.exe.config.in 2011-04-12 19:37:20.634328063 +0100
-+++ tomboy.git/Tomboy/Tomboy.exe.config.in 2011-04-12 19:37:48.253245653 +0100
+--- tomboy.orig/Tomboy/Tomboy.exe.config.in 2012-05-03 21:16:57.732547227 +0100
++++ tomboy/Tomboy/Tomboy.exe.config.in 2012-05-03 21:17:00.364547139 +0100
@@ -1,7 +1,7 @@
<configuration>
- <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0.so.0"/>
diff --git a/debian/patches/02_sync_save_button_sensitive.patch b/debian/patches/02_sync_save_button_sensitive.patch
index 997393c..0f68a02 100644
--- a/debian/patches/02_sync_save_button_sensitive.patch
+++ b/debian/patches/02_sync_save_button_sensitive.patch
@@ -10,8 +10,10 @@ Bug: https://bugzilla.gnome.org/show_bug.cgi?id=473332
Forwarded: not-needed
=== modified file 'Tomboy/PreferencesDialog.cs'
---- old/Tomboy/PreferencesDialog.cs 2011-10-14 14:18:09 +0000
-+++ new/Tomboy/PreferencesDialog.cs 2011-10-14 14:18:45 +0000
+Index: tomboy/Tomboy/PreferencesDialog.cs
+===================================================================
+--- tomboy.orig/Tomboy/PreferencesDialog.cs 2012-05-03 21:16:57.692547228 +0100
++++ tomboy/Tomboy/PreferencesDialog.cs 2012-05-03 21:17:00.604547100 +0100
@@ -1113,7 +1113,7 @@
syncAddinPrefsContainer.PackStart (syncAddinPrefsWidget, false, false, 0);
@@ -21,4 +23,3 @@ Forwarded: not-needed
}
} else {
selectedSyncAddin = null;
-
diff --git a/debian/patches/03_u1_as_default_sync.patch b/debian/patches/03_u1_as_default_sync.patch
index 96522dc..02590d4 100644
--- a/debian/patches/03_u1_as_default_sync.patch
+++ b/debian/patches/03_u1_as_default_sync.patch
@@ -1,7 +1,7 @@
Index: tomboy/Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs
===================================================================
---- tomboy.orig/Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs 2011-09-26 22:25:08.135886195 +0100
-+++ tomboy/Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs 2011-09-26 23:37:26.202367732 +0100
+--- tomboy.orig/Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs 2012-05-03 21:16:57.656547230 +0100
++++ tomboy/Tomboy/Addins/WebSyncService/WebSyncServiceAddin.cs 2012-05-03 21:17:00.788547091 +0100
@@ -97,6 +97,8 @@
string serverPref;
Api.OAuth oauth;
diff --git a/debian/patches/04_app_indicator.patch b/debian/patches/04_app_indicator.patch
index f7c90a9..98dee82 100644
--- a/debian/patches/04_app_indicator.patch
+++ b/debian/patches/04_app_indicator.patch
@@ -1,8 +1,8 @@
=== modified file 'Tomboy/Makefile.am'
-Index: ubuntu/Tomboy/Makefile.am
+Index: tomboy/Tomboy/Makefile.am
===================================================================
---- ubuntu.orig/Tomboy/Makefile.am 2011-07-27 10:43:38.341500123 +0100
-+++ ubuntu/Tomboy/Makefile.am 2011-07-27 10:46:56.749860595 +0100
+--- tomboy.orig/Tomboy/Makefile.am 2012-05-03 21:16:57.608547232 +0100
++++ tomboy/Tomboy/Makefile.am 2012-05-03 21:17:00.972547084 +0100
@@ -122,6 +122,7 @@
$(srcdir)/Tag.cs \
$(srcdir)/TagButton.cs \
@@ -19,11 +19,11 @@ Index: ubuntu/Tomboy/Makefile.am
$(GNOME_LIBS) \
-r:Mono.Posix \
$(DBUS_LIBS) \
-Index: ubuntu/Tomboy/NoteManager.cs
+Index: tomboy/Tomboy/NoteManager.cs
===================================================================
---- ubuntu.orig/Tomboy/NoteManager.cs 2011-07-27 10:45:15.862950000 +0100
-+++ ubuntu/Tomboy/NoteManager.cs 2011-07-27 10:46:56.969852092 +0100
-@@ -365,6 +365,9 @@
+--- tomboy.orig/Tomboy/NoteManager.cs 2012-05-03 21:16:57.584547233 +0100
++++ tomboy/Tomboy/NoteManager.cs 2012-05-03 21:17:00.972547084 +0100
+@@ -369,6 +369,9 @@
// Update the trie so addins can access it, if they want.
trie_controller.Update ();
@@ -33,10 +33,10 @@ Index: ubuntu/Tomboy/NoteManager.cs
bool startup_notes_enabled = (bool)
Preferences.Get (Preferences.ENABLE_STARTUP_NOTES);
-Index: ubuntu/Tomboy/RecentChanges.cs
+Index: tomboy/Tomboy/RecentChanges.cs
===================================================================
---- ubuntu.orig/Tomboy/RecentChanges.cs 2011-07-27 10:45:15.862950000 +0100
-+++ ubuntu/Tomboy/RecentChanges.cs 2011-07-27 10:46:56.585866932 +0100
+--- tomboy.orig/Tomboy/RecentChanges.cs 2012-05-03 21:16:57.596547233 +0100
++++ tomboy/Tomboy/RecentChanges.cs 2012-05-03 21:17:00.972547084 +0100
@@ -247,7 +247,8 @@
am ["DeleteNotebookAction"].Activated += OnDeleteNotebook;
am ["CloseWindowAction"].Activated += OnCloseWindow;
@@ -57,11 +57,11 @@ Index: ubuntu/Tomboy/RecentChanges.cs
Tomboy.ActionManager ["QuitTomboyAction"].Activate ();
#endif
}
-Index: ubuntu/Tomboy/Tomboy.cs
+Index: tomboy/Tomboy/Tomboy.cs
===================================================================
---- ubuntu.orig/Tomboy/Tomboy.cs 2011-07-27 10:43:38.309501355 +0100
-+++ ubuntu/Tomboy/Tomboy.cs 2011-07-27 10:46:25.595060455 +0100
-@@ -189,11 +189,17 @@
+--- tomboy.orig/Tomboy/Tomboy.cs 2012-05-03 21:16:57.576547234 +0100
++++ tomboy/Tomboy/Tomboy.cs 2012-05-03 21:17:00.972547084 +0100
+@@ -191,11 +191,17 @@
#endif
}
@@ -82,10 +82,10 @@ Index: ubuntu/Tomboy/Tomboy.cs
StartMainLoop ();
}
-Index: ubuntu/Tomboy/TomboyIndicatorTray.cs
+Index: tomboy/Tomboy/TomboyIndicatorTray.cs
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ ubuntu/Tomboy/TomboyIndicatorTray.cs 2011-07-27 10:46:25.595060455 +0100
++++ tomboy/Tomboy/TomboyIndicatorTray.cs 2012-05-03 21:17:00.972547084 +0100
@@ -0,0 +1,180 @@
+//
+// Copyright (C) 2009 GNOME Do
@@ -267,10 +267,10 @@ Index: ubuntu/Tomboy/TomboyIndicatorTray.cs
+ }
+ }
+}
-Index: ubuntu/configure.in
+Index: tomboy/configure.in
===================================================================
---- ubuntu.orig/configure.in 2011-07-27 10:45:15.862950000 +0100
-+++ ubuntu/configure.in 2011-07-27 10:46:56.717861832 +0100
+--- tomboy.orig/configure.in 2012-05-03 21:16:57.552547235 +0100
++++ tomboy/configure.in 2012-05-03 21:17:00.976547084 +0100
@@ -204,6 +204,10 @@
gtk-sharp-2.0 >= $GTKSHARP2_MINIMUM_VERSION)
AC_SUBST(GTKSHARP_LIBS)
@@ -282,10 +282,10 @@ Index: ubuntu/configure.in
#
# Printing at least needs Mono.Cairo
#
-Index: ubuntu/po/POTFILES.in
+Index: tomboy/po/POTFILES.in
===================================================================
---- ubuntu.orig/po/POTFILES.in 2011-07-27 10:45:15.862950000 +0100
-+++ ubuntu/po/POTFILES.in 2011-07-27 10:46:25.595060455 +0100
+--- tomboy.orig/po/POTFILES.in 2012-05-03 21:16:57.564547233 +0100
++++ tomboy/po/POTFILES.in 2012-05-03 21:17:00.976547084 +0100
@@ -68,6 +68,7 @@
Tomboy/Synchronization/SyncManager.cs
Tomboy/Synchronization/SyncUtils.cs
diff --git a/debian/patches/05_add_start_u1_note.patch b/debian/patches/05_add_start_u1_note.patch
index 076e23b..50b9c9c 100644
--- a/debian/patches/05_add_start_u1_note.patch
+++ b/debian/patches/05_add_start_u1_note.patch
@@ -1,8 +1,8 @@
-Index: tomboy-1.7.1/Tomboy/NoteManager.cs
+Index: tomboy/Tomboy/NoteManager.cs
===================================================================
---- tomboy-1.7.1.orig/Tomboy/NoteManager.cs 2011-07-06 09:58:29.039428045 +0100
-+++ tomboy-1.7.1/Tomboy/NoteManager.cs 2011-07-06 09:58:36.719133213 +0100
-@@ -294,6 +294,24 @@
+--- tomboy.orig/Tomboy/NoteManager.cs 2012-05-03 21:17:00.972547084 +0100
++++ tomboy/Tomboy/NoteManager.cs 2012-05-03 21:17:01.280547071 +0100
+@@ -298,6 +298,24 @@
"Also, if you type the name of another note in your " +
"current note, it will automatically be linked for you." +
"</note-content>");
@@ -27,7 +27,7 @@ Index: tomboy-1.7.1/Tomboy/NoteManager.cs
try {
Note start_note = Create (Catalog.GetString ("Start Here"),
-@@ -305,6 +323,9 @@
+@@ -309,6 +327,9 @@
links_note_content);
links_note.QueueSave (ChangeType.ContentChanged);
diff --git a/debian/patches/11_lpi.patch b/debian/patches/11_lpi.patch
index e2b5f99..0e32bce 100644
--- a/debian/patches/11_lpi.patch
+++ b/debian/patches/11_lpi.patch
@@ -1,7 +1,7 @@
-Index: tomboy-1.7.1/Tomboy/ActionManager.cs
+Index: tomboy/Tomboy/ActionManager.cs
===================================================================
---- tomboy-1.7.1.orig/Tomboy/ActionManager.cs 2011-04-05 06:01:06.000000000 +0100
-+++ tomboy-1.7.1/Tomboy/ActionManager.cs 2011-07-06 09:58:43.988854117 +0100
+--- tomboy.orig/Tomboy/ActionManager.cs 2012-05-03 21:16:57.380547242 +0100
++++ tomboy/Tomboy/ActionManager.cs 2012-05-03 21:17:01.468547062 +0100
@@ -36,6 +36,7 @@
using System.Collections;
using System.Collections.Generic;
@@ -20,10 +20,10 @@ Index: tomboy-1.7.1/Tomboy/ActionManager.cs
}
/// <summary>
-Index: tomboy-1.7.1/data/UIManagerLayout.xml
+Index: tomboy/data/UIManagerLayout.xml
===================================================================
---- tomboy-1.7.1.orig/data/UIManagerLayout.xml 2011-04-05 06:01:07.000000000 +0100
-+++ tomboy-1.7.1/data/UIManagerLayout.xml 2011-07-06 09:58:43.988854117 +0100
+--- tomboy.orig/data/UIManagerLayout.xml 2012-05-03 21:16:57.368547243 +0100
++++ tomboy/data/UIManagerLayout.xml 2012-05-03 21:17:01.472547062 +0100
@@ -19,6 +19,7 @@
<placeholder name="MainWindowMenuPlaceholder" />
<menu name="HelpMenu" action="HelpMenuAction">
@@ -32,10 +32,10 @@ Index: tomboy-1.7.1/data/UIManagerLayout.xml
<menuitem name="ShowAbout" action="ShowAboutAction" />
</menu>
</menubar>
-Index: tomboy-1.7.1/configure.in
+Index: tomboy/configure.in
===================================================================
---- tomboy-1.7.1.orig/configure.in 2011-07-06 09:58:29.049427661 +0100
-+++ tomboy-1.7.1/configure.in 2011-07-06 09:58:43.988854117 +0100
+--- tomboy.orig/configure.in 2012-05-03 21:17:00.976547084 +0100
++++ tomboy/configure.in 2012-05-03 21:17:01.472547062 +0100
@@ -197,8 +197,10 @@
PKG_CHECK_MODULES(GNOME,
gconf-sharp-2.0)
@@ -47,10 +47,10 @@ Index: tomboy-1.7.1/configure.in
PKG_CHECK_MODULES(GTKSHARP,
gtk-sharp-2.0 >= $GTKSHARP2_MINIMUM_VERSION)
-Index: tomboy-1.7.1/Tomboy/Tray.cs
+Index: tomboy/Tomboy/Tray.cs
===================================================================
---- tomboy-1.7.1.orig/Tomboy/Tray.cs 2011-04-23 22:03:08.000000000 +0100
-+++ tomboy-1.7.1/Tomboy/Tray.cs 2011-07-06 09:58:43.988854117 +0100
+--- tomboy.orig/Tomboy/Tray.cs 2012-05-03 21:16:57.404547240 +0100
++++ tomboy/Tomboy/Tray.cs 2012-05-03 21:17:01.472547062 +0100
@@ -5,6 +5,7 @@
#if !WIN32 && !MAC
using GtkBeans;
@@ -69,10 +69,10 @@ Index: tomboy-1.7.1/Tomboy/Tray.cs
context_menu.Append (new Gtk.SeparatorMenuItem ());
item = new Gtk.ImageMenuItem (Catalog.GetString ("_Quit"));
-Index: tomboy-1.7.1/Tomboy/Makefile.am
+Index: tomboy/Tomboy/Makefile.am
===================================================================
---- tomboy-1.7.1.orig/Tomboy/Makefile.am 2011-07-06 09:58:29.039428045 +0100
-+++ tomboy-1.7.1/Tomboy/Makefile.am 2011-07-06 09:58:43.988854117 +0100
+--- tomboy.orig/Tomboy/Makefile.am 2012-05-03 21:17:00.972547084 +0100
++++ tomboy/Tomboy/Makefile.am 2012-05-03 21:17:01.472547062 +0100
@@ -150,6 +150,7 @@
$(GTKSHARP_LIBS) \
$(APPINDICATORSHARP_LIBS) \
diff --git a/debian/patches/20_remove_pcfile_requires b/debian/patches/20_remove_pcfile_requires
index 8c3e20a..8e87795 100644
--- a/debian/patches/20_remove_pcfile_requires
+++ b/debian/patches/20_remove_pcfile_requires
@@ -3,10 +3,10 @@ Forwarded: not-needed
Origin: vendor
Author: Iain Lane <laney at ubuntu.com>
-Index: tomboy-1.7.1/data/tomboy-addins.pc.in
+Index: tomboy/data/tomboy-addins.pc.in
===================================================================
---- tomboy-1.7.1.orig/data/tomboy-addins.pc.in 2011-07-06 09:58:23.929624211 +0100
-+++ tomboy-1.7.1/data/tomboy-addins.pc.in 2011-07-06 09:58:48.278689421 +0100
+--- tomboy.orig/data/tomboy-addins.pc.in 2012-05-03 21:16:57.232547251 +0100
++++ tomboy/data/tomboy-addins.pc.in 2012-05-03 21:17:01.720547051 +0100
@@ -5,6 +5,5 @@
Name: Tomboy Addin Library
diff --git a/debian/patches/30_fix_manpage_syntax b/debian/patches/30_fix_manpage_syntax
index 01a997b..75ef3b6 100644
--- a/debian/patches/30_fix_manpage_syntax
+++ b/debian/patches/30_fix_manpage_syntax
@@ -1,9 +1,9 @@
Description: Remove line from manpage which causes a warning
Author: Iain Lane <laney at ubuntu.com>
-Index: tomboy.git/data/tomboy.1
+Index: tomboy/data/tomboy.1
===================================================================
---- tomboy.git.orig/data/tomboy.1 2010-07-04 17:57:29.898601907 +0100
-+++ tomboy.git/data/tomboy.1 2010-07-04 17:57:39.779851491 +0100
+--- tomboy.orig/data/tomboy.1 2012-05-03 21:16:57.196547253 +0100
++++ tomboy/data/tomboy.1 2012-05-03 21:17:01.908547043 +0100
@@ -13,7 +13,6 @@
This manual page documents briefly the
.BR tomboy
diff --git a/debian/patches/40_use_gmime_2.6.patch b/debian/patches/40_use_gmime_2.6.patch
index 7cacabd..8080e9b 100644
--- a/debian/patches/40_use_gmime_2.6.patch
+++ b/debian/patches/40_use_gmime_2.6.patch
@@ -4,9 +4,9 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=663216
Index: tomboy/configure.in
===================================================================
---- tomboy.orig/configure.in 2012-03-12 21:05:16.128137316 +0000
-+++ tomboy/configure.in 2012-03-12 21:06:16.085786547 +0000
-@@ -232,8 +232,8 @@
+--- tomboy.orig/configure.in 2012-05-03 21:17:01.472547062 +0100
++++ tomboy/configure.in 2012-05-03 21:17:02.088547035 +0100
+@@ -238,8 +238,8 @@
# Evolution.dll needs GMime#
#
if test "x$ENABLE_GNOME" != "xno"; then
--
Tomboy - desktop note taking program using Wiki style links
More information about the Pkg-cli-apps-commits
mailing list