[Pkg-cli-apps-commits] [SCM] Packaging for f-spot branch, master, updated. debian/0.6.0.0-1-7-gebc833b
Iain Lane
laney at ubuntu.com
Sat Aug 29 19:47:09 UTC 2009
The following commit has been merged in the master branch:
commit 7e5a57cb67067eeffe19cf469d514723dc5c8a21
Author: Iain Lane <laney at ubuntu.com>
Date: Wed Aug 26 20:37:13 2009 +0100
Remove unused patches
diff --git a/debian/patches/debian_dont_link_libmono.patch b/debian/patches/debian_dont_link_libmono.patch
deleted file mode 100644
index 23917a7..0000000
--- a/debian/patches/debian_dont_link_libmono.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## debian_dont_link_libmono.dpatch by Jo Shields <directhex at apebox.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Force cflags not to link against libmono0 needlessly
-
- at DPATCH@
-diff -urNad f-spot-0.5.0.3~/configure.in f-spot-0.5.0.3/configure.in
---- f-spot-0.5.0.3~/configure.in 2009-07-08 23:33:57.000000000 +0100
-+++ f-spot-0.5.0.3/configure.in 2009-07-08 23:34:17.000000000 +0100
-@@ -69,7 +69,7 @@
- LCMS_REQUIRED=1.12
- dnl -- LIBGPHOTO2_REQUIRED=2.1.4
-
--PKG_CHECK_MODULES(F, libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libexif >= $LIBEXIF_REQUIRED_MIN libexif < $LIBEXIF_REQUIRED_MAX glade-sharp-2.0 >= $GTKSHARP_REQUIRED gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED gtk+-2.0 >= $GTK_REQUIRED mono >= $MONO_REQUIRED)
-+PKG_CHECK_MODULES(F, libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libexif >= $LIBEXIF_REQUIRED_MIN libexif < $LIBEXIF_REQUIRED_MAX glade-sharp-2.0 >= $GTKSHARP_REQUIRED gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED gtk+-2.0 >= $GTK_REQUIRED)
- F_LIBS="$F_LIBS -r:Mono.Cairo"
- AC_SUBST(F_CFLAGS)
- AC_SUBST(F_LIBS)
diff --git a/debian/patches/debian_optional-beagle.patch b/debian/patches/debian_optional-beagle.patch
deleted file mode 100755
index 0329cb6..0000000
--- a/debian/patches/debian_optional-beagle.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## optional_beagle.dpatch by Mirco Bauer <meebey at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad f-spot-0.4.3.1~/src/BeagleNotifier.cs f-spot-0.4.3.1/src/BeagleNotifier.cs
---- f-spot-0.4.3.1~/src/BeagleNotifier.cs 2008-05-02 16:50:23.000000000 +0200
-+++ f-spot-0.4.3.1/src/BeagleNotifier.cs 2008-05-02 16:57:12.000000000 +0200
-@@ -3,8 +3,33 @@
-
- namespace FSpot {
- public static class BeagleNotifier {
-+ static bool BeagleSupport;
-+
-+ static BeagleNotifier () {
-+ try {
-+ if (System.Reflection.Assembly.Load ("Beagle") != null) {
-+ BeagleSupport = true;
-+ return;
-+ }
-+ } catch (System.Exception) {
-+ }
-+
-+ BeagleSupport = false;
-+ System.Console.WriteLine ("Beagle.dll not found, disabled beagle support.");
-+ }
-+
- public static void SendUpdate (IBrowsableItem item)
- {
-+ if (!BeagleSupport) {
-+ return;
-+ }
-+
-+ SendBeagleUpdate (item);
-+ }
-+
-+ static void SendBeagleUpdate (IBrowsableItem item)
-+ {
-+
- Indexable indexable = new Indexable (item.DefaultVersionUri);
- indexable.Type = IndexableType.PropertyChange;
- Beagle.Property prop;
diff --git a/debian/patches/svn-display-sidebar.patch b/debian/patches/svn-display-sidebar.patch
deleted file mode 100644
index 2c97c73..0000000
--- a/debian/patches/svn-display-sidebar.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## svn-display-sidebar.dpatch by Sebastien Bacher <seb128 at ubuntu.com>
-##
-## DP: Display the sidebar by default (taken from upstream SVN)
-## DP: LP: #286490
- at DPATCH@
-diff -urNad f-spot-0.5.0.3~/src/Preferences.cs f-spot-0.5.0.3/src/Preferences.cs
---- f-spot-0.5.0.3~/src/Preferences.cs 2008-10-16 08:42:01.000000000 +0200
-+++ f-spot-0.5.0.3/src/Preferences.cs 2009-04-08 14:24:52.000000000 +0200
-@@ -149,6 +149,7 @@
- return (int) Tag.IconSize.Medium;
-
- case SIDEBAR_POSITION:
-+ return 130;
- case ZOOM:
- return null;
-
diff --git a/debian/patches/svn-no-versionellipze.patch b/debian/patches/svn-no-versionellipze.patch
deleted file mode 100644
index d44fe43..0000000
--- a/debian/patches/svn-no-versionellipze.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## svn-no-versionellipze.dpatch by Sebastien Bacher <seb128 at ubuntu.com>
-##
-## DP: Do not ellipize the version menu labels (taken from upstream svn)
-## DP: LP: #296852, #356989
-
- at DPATCH@
-diff -urNad f-spot-0.5.0.3~/src/PhotoVersionMenu.cs f-spot-0.5.0.3/src/PhotoVersionMenu.cs
---- f-spot-0.5.0.3~/src/PhotoVersionMenu.cs 2008-10-18 12:54:25.000000000 +0200
-+++ f-spot-0.5.0.3/src/PhotoVersionMenu.cs 2009-04-08 14:27:57.000000000 +0200
-@@ -56,7 +56,6 @@
- menu_item.Show ();
- menu_item.Sensitive = true;
- ((Gtk.Label)menu_item.Child).UseUnderline = false;
-- ((Gtk.Label)menu_item.Child).Ellipsize = Pango.EllipsizeMode.End;
- menu_item.Activated += new EventHandler (HandleMenuItemActivated);
-
- item_infos [i ++] = new MenuItemInfo (menu_item, id);
-@@ -68,7 +67,6 @@
- MenuItem no_edits_menu_item = new MenuItem (Mono.Unix.Catalog.GetString ("(No Edits)"));
- no_edits_menu_item.Show ();
- no_edits_menu_item.Sensitive = false;
-- ((Gtk.Label)no_edits_menu_item.Child).Ellipsize = Pango.EllipsizeMode.End;
- Append (no_edits_menu_item);
- }
- }
diff --git a/debian/patches/svn-r4545_locales-import.patch b/debian/patches/svn-r4545_locales-import.patch
deleted file mode 100755
index a6d883d..0000000
--- a/debian/patches/svn-r4545_locales-import.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## svn-r4545_locales-import.dpatch by Chris Coulson <chrisccoulson at googlemail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch backported from SVN trunk revision 4545
-## DP: initialize the translation catalog earlier. Fix a nasty bug.
-## DP: Launchpad bug: https://bugs.launchpad.net/ubuntu/+source/f-spot/+bug/293305
-
- at DPATCH@
-diff -urNad f-spot-0.5.0.3~/src/main.cs f-spot-0.5.0.3/src/main.cs
---- f-spot-0.5.0.3~/src/main.cs 2008-10-18 11:54:25.000000000 +0100
-+++ f-spot-0.5.0.3/src/main.cs 2009-02-06 17:39:58.000000000 +0000
-@@ -72,7 +72,8 @@
- program = new Program (Defines.PACKAGE,
- Defines.VERSION,
- Modules.UI, args);
--
-+
-+ Catalog.Init ("f-spot", Defines.LOCALE_DIR);
- FSpot.Global.PhotoDirectory = Preferences.Get<string> (Preferences.STORAGE_PATH);
-
- for (int i = 0; i < args.Length && !shutdown; i++) {
-@@ -170,8 +171,6 @@
- }
-
- if (slideshow == true) {
-- Catalog.Init ("f-spot", Defines.LOCALE_DIR);
--
- Core core = new Core ();
- core.ShowSlides (null);
- program.Run ();
-@@ -231,7 +230,6 @@
- Gtk.Rc.AddDefaultFile (Preferences.Get<string> (Preferences.GTK_RC));
- }
-
-- Catalog.Init ("f-spot", Defines.LOCALE_DIR);
- try {
- Gtk.Window.DefaultIconList = new Gdk.Pixbuf [] {
- GtkUtil.TryLoadIcon (FSpot.Global.IconTheme, "f-spot", 16, (Gtk.IconLookupFlags)0),
--
Packaging for f-spot
More information about the Pkg-cli-apps-commits
mailing list