[Pkg-cli-apps-commits] [SCM] Tomboy - desktop note taking program using Wiki style links branch, ubuntu, updated. debian/1.11.2-1ubuntu1

[Iain Lane]

The following commit has been merged in the ubuntu branch:
commit b6874c22ff32c0489e86e65eb57100a366a28d7b
Author: Robert Ancell <robert.ancell at canonical.com>
Date:   Tue May 15 09:49:23 2012 +1200

    Imported Debian patch 1.11.1-1ubuntu2

diff --git a/debian/changelog b/debian/changelog
index 77e68c8..4ea5de2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tomboy (1.11.1-1ubuntu2) quantal; urgency=low
+
+  * debian/control:
+    - Drop dependency on liblaunchpad-integration-cil-dev
+  * debian/patches/11_lpi.patch:
+    - Dropped, we no longer do Launchpad integration
+
+ -- Robert Ancell <robert.ancell at canonical.com>  Tue, 15 May 2012 09:49:23 +1200
+
 tomboy (1.11.1-1ubuntu1) quantal; urgency=low
 
   * [42fc674] Update gbp.conf for Ubuntu branch
diff --git a/debian/control b/debian/control
index 1d4c744..835ede2 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,6 @@ Build-Depends: debhelper (>= 7.0.50),
                libdbus-glib1.0-cil-dev (>= 0.3),
                libmono-addins-cil-dev (>= 0.3),
                libmono-addins-gui-cil-dev (>= 0.3),
-               liblaunchpad-integration-cil-dev,
                libappindicator0.1-cil-dev (>= 0.4.90),
                libproxy-dev
 Standards-Version: 3.9.3
diff --git a/debian/patches/11_lpi.patch b/debian/patches/11_lpi.patch
deleted file mode 100644
index 0e32bce..0000000
--- a/debian/patches/11_lpi.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-Index: tomboy/Tomboy/ActionManager.cs
-===================================================================
---- 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;
- using Mono.Unix;
-+using LaunchpadIntegration;
- 
- namespace Tomboy
- {
-@@ -74,6 +75,9 @@
- 					(imageItem.Image as Gtk.Image).Pixbuf = newNote;
- 				}
- 			}
-+
-+			LaunchpadIntegration.LaunchpadIntegration.SetSourcePackageName ("tomboy");
-+			LaunchpadIntegration.LaunchpadIntegration.AddUI (ui, "/MainWindowMenubar/HelpMenu/LaunchpadIntegration");
- 		}
- 		
- 		/// <summary>
-Index: tomboy/data/UIManagerLayout.xml
-===================================================================
---- 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">
-             <menuitem name="ShowHelp" action="ShowHelpAction"/>
-+            <placeholder name="LaunchpadIntegration" />
-             <menuitem name="ShowAbout" action="ShowAboutAction" />
-         </menu>
-     </menubar>
-Index: tomboy/configure.in
-===================================================================
---- 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)
- 	fi
-+	PKG_CHECK_MODULES(LP, launchpad-integration-sharp)
- fi
- AC_SUBST(GNOME_LIBS)
-+AC_SUBST(LP_LIBS)
- 
- PKG_CHECK_MODULES(GTKSHARP,
- 		  gtk-sharp-2.0 >= $GTKSHARP2_MINIMUM_VERSION)
-Index: tomboy/Tomboy/Tray.cs
-===================================================================
---- 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;
- #endif
-+using LaunchpadIntegration;
- 
- namespace Tomboy
- {
-@@ -295,6 +296,9 @@
- 			item.Activated += ShowAbout;
- 			context_menu.Append (item);
- 
-+			LaunchpadIntegration.LaunchpadIntegration.SetSourcePackageName ("tomboy");
-+			LaunchpadIntegration.LaunchpadIntegration.AddItems (context_menu, 5, true, false);
-+
- 			context_menu.Append (new Gtk.SeparatorMenuItem ());
- 
- 			item = new Gtk.ImageMenuItem (Catalog.GetString ("_Quit"));
-Index: tomboy/Tomboy/Makefile.am
-===================================================================
---- 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) 	\
- 	$(GNOME_LIBS) 	\
-+	$(LP_LIBS)	\
- 	-r:Mono.Posix	\
- 	$(DBUS_LIBS)	\
- 	$(LINK_MONO_ADDINS)	\
diff --git a/debian/patches/40_use_gmime_2.6.patch b/debian/patches/40_use_gmime_2.6.patch
index 8080e9b..36d33b6 100644
--- a/debian/patches/40_use_gmime_2.6.patch
+++ b/debian/patches/40_use_gmime_2.6.patch
@@ -2,11 +2,11 @@ Description: Use gmime 2.6 instead of 2.4
 Author: Michael Biebl <biebl at debian.org>
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=663216
 
-Index: tomboy/configure.in
+Index: tomboy-1.11.1/configure.in
 ===================================================================
---- 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 @@
+--- tomboy-1.11.1.orig/configure.in	2012-05-15 09:50:50.600196916 +1200
++++ tomboy-1.11.1/configure.in	2012-05-15 09:50:53.760196806 +1200
+@@ -236,8 +236,8 @@
  # Evolution.dll needs GMime#
  #
  if test "x$ENABLE_GNOME" != "xno"; then
diff --git a/debian/patches/series b/debian/patches/series
index fcf30f4..4d56ba5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,7 +4,6 @@
 04_app_indicator.patch
 05_add_start_u1_note.patch
 #06_use_ubuntu_sso.patch
-11_lpi.patch
 20_remove_pcfile_requires
 30_fix_manpage_syntax
 40_use_gmime_2.6.patch

-- 
Tomboy - desktop note taking program using Wiki style links