[Pkg-cli-apps-commits] r4515 - in /packages/f-spot/trunk/debian: changelog control patches/00list patches/svn-r4545_locales-import.dpatch rules
laney-guest at users.alioth.debian.org
laney-guest at users.alioth.debian.org
Sat Feb 7 20:30:57 UTC 2009
Author: laney-guest
Date: Sat Feb 7 20:30:56 2009
New Revision: 4515
URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4515
Log:
* debian/patches/svn-r4545_locales-import.dpatch: Patch backported from SVN
trunk revision 4545 - initialize the translation catalog earlier (LP: #293305)
(Closes: #514457). Thanks to Florian Heinle for finding the patch and to
Chris Coulson for preparing the update.
* debian/control: Build-depend on libmono-dev (>= 1.2.4) to match configure
checks.
* debian/rules: Pass CSC=/usr/bin/csc to configure for gio-sharp to fix FTBFS
Added:
packages/f-spot/trunk/debian/patches/svn-r4545_locales-import.dpatch (with props)
Modified:
packages/f-spot/trunk/debian/changelog
packages/f-spot/trunk/debian/control
packages/f-spot/trunk/debian/patches/00list
packages/f-spot/trunk/debian/rules
Modified: packages/f-spot/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/changelog?rev=4515&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/changelog (original)
+++ packages/f-spot/trunk/debian/changelog Sat Feb 7 20:30:56 2009
@@ -1,3 +1,15 @@
+f-spot (0.5.0.3-2) experimental; urgency=low
+
+ * debian/patches/svn-r4545_locales-import.dpatch: Patch backported from SVN
+ trunk revision 4545 - initialize the translation catalog earlier (LP: #293305)
+ (Closes: #514457). Thanks to Florian Heinle for finding the patch and to
+ Chris Coulson for preparing the update.
+ * debian/control: Build-depend on libmono-dev (>= 1.2.4) to match configure
+ checks.
+ * debian/rules: Pass CSC=/usr/bin/csc to configure for gio-sharp to fix FTBFS
+
+ -- Iain Lane <laney at ubuntu.com> Sat, 07 Feb 2009 20:23:32 +0000
+
f-spot (0.5.0.3-1) experimental; urgency=low
[ David Paleino ]
Modified: packages/f-spot/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/control?rev=4515&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/control (original)
+++ packages/f-spot/trunk/debian/control Sat Feb 7 20:30:56 2009
@@ -14,7 +14,7 @@
libgnome2-dev (>= 2.2),
libgnome2.24-cil,
libgtkhtml3.16-cil (>= 2.20),
- libmono-dev (>= 1.1.7),
+ libmono-dev (>= 1.2.4),
libmono-sqlite2.0-cil,
libmono-system-runtime2.0-cil,
libcairo2-dev,
Modified: packages/f-spot/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/00list?rev=4515&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/00list (original)
+++ packages/f-spot/trunk/debian/patches/00list Sat Feb 7 20:30:56 2009
@@ -11,6 +11,7 @@
debian_fix_f-spot.exe.config
f-spot-import-gphoto
svn-r4555_fix-crash-on-icon-size-change.dpatch
+svn-r4545_locales-import.dpatch
debian_use_csc
debian_link_2.0_profile_cairo
Added: packages/f-spot/trunk/debian/patches/svn-r4545_locales-import.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/svn-r4545_locales-import.dpatch?rev=4515&op=file
==============================================================================
--- packages/f-spot/trunk/debian/patches/svn-r4545_locales-import.dpatch (added)
+++ packages/f-spot/trunk/debian/patches/svn-r4545_locales-import.dpatch Sat Feb 7 20:30:56 2009
@@ -1,0 +1,39 @@
+#! /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),
Propchange: packages/f-spot/trunk/debian/patches/svn-r4545_locales-import.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: packages/f-spot/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/rules?rev=4515&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/rules (original)
+++ packages/f-spot/trunk/debian/rules Sat Feb 7 20:30:56 2009
@@ -17,7 +17,7 @@
CFLAGS := -Wall -g
DEB_CONFIGURE_SCRIPT_ENV := LDFLAGS="-Wl,-O1 -Wl,--as-needed"
-DEB_CONFIGURE_USER_FLAGS += MCS=/usr/bin/csc
+DEB_CONFIGURE_USER_FLAGS += MCS=/usr/bin/csc CSC=/usr/bin/csc
DEB_CONFIGURE_EXTRA_FLAGS := --disable-scrollkeeper
DEB_AUTO_UPDATE_ACLOCAL = 1.10
More information about the Pkg-cli-apps-commits
mailing list