[Pkg-cli-apps-commits] r3830 - in /packages/f-spot/trunk/debian: changelog control patches/00list patches/gtkhtml-sharp-3.14_port.dpatch

Thu Mar 20 19:53:41 UTC 2008

Author: diocles-guest
Date: Thu Mar 20 19:53:41 2008
New Revision: 3830

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=3830
Log:
Port to gtkhtml-sharp-3.14. Bump libgnome2.0-cil dependency to >= 2.20.

Added:
    packages/f-spot/trunk/debian/patches/gtkhtml-sharp-3.14_port.dpatch   (with props)
Modified:
    packages/f-spot/trunk/debian/changelog
    packages/f-spot/trunk/debian/control
    packages/f-spot/trunk/debian/patches/00list

Modified: packages/f-spot/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/changelog?rev=3830&op=diff
==============================================================================

--- packages/f-spot/trunk/debian/changelog (original)
+++ packages/f-spot/trunk/debian/changelog Thu Mar 20 19:53:41 2008
@@ -28,15 +28,18 @@
         f-spot photo database.
     + debian/patches/fix_gnome-sharp_typo.dpatch:
       - Fix from upstream SVN for typo in configure.in.
+    + debian/patches/gtkhtml-sharp-3.14_port.dpatch:
+      - Forward port to gtkhtml-sharp-3.14.
     + debian/patches/98_autoreconf.dpatch:
       - Move all generated changes from other patches into single patch,
         for easier maintenance. 
   * debian/control:
     + Recommend dbus-x11. (Closes: #459272)
+    + Require a version of libgnome2.0-cil >= 2.20.
     + Build against libgtkhtml3.16-cil rather than libgtkhtml2.0-cil.
       (Closes: #470822)
 
- -- Tim Retout <tim at retout.co.uk>  Thu, 20 Mar 2008 18:12:55 +0000
+ -- Tim Retout <tim at retout.co.uk>  Thu, 20 Mar 2008 19:45:46 +0000
 
 f-spot (0.4.1-4) unstable; urgency=low
 

Modified: packages/f-spot/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/control?rev=3830&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/control (original)
+++ packages/f-spot/trunk/debian/control Thu Mar 20 19:53:41 2008
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
 Uploaders: Tim Retout <tim at retout.co.uk>, Mirco Bauer <meebey at debian.org>
-Build-Depends: debhelper (>= 5.0.0), cli-common-dev (>= 0.4.4), cdbs, dpatch, mono-gmcs (>= 1.1.17) | c-sharp-2.0-compiler, libgtk2.0-cil (>= 2.8), libgtkhtml3.16-cil (>= 2.20), libgtk2.0-dev (>= 2.6), libgnome2.0-cil (>= 2.8), libgnome2-dev (>= 2.2), libxml-parser-perl, libmono-dev (>= 1.1.7), libgnomeui-dev (>= 2.2), libexif-dev (>= 0.5.7), libsqlite3-dev, libgphoto2-2-dev (>= 2.1.4), liblcms1-dev, libmono-sqlite2.0-cil, libmono-system-runtime2.0-cil, libmono-cairo2.0-cil, libusb-dev, gnome-doc-utils (>= 0.3.2), libgl1-mesa-dev | libgl-dev, libndesk-dbus1.0-cil (>= 0.4.2), libndesk-dbus-glib1.0-cil (>= 0.3.0), libgconf2.0-cil, libglade2.0-cil, libgnome-vfs2.0-cil, libmono-addins0.2-cil, libmono-addins-gui0.2-cil, beagle-dev (>= 0.3), gnome-screensaver, docbook-xml
+Build-Depends: debhelper (>= 5.0.0), cli-common-dev (>= 0.4.4), cdbs, dpatch, mono-gmcs (>= 1.1.17) | c-sharp-2.0-compiler, libgtk2.0-cil (>= 2.8), libgtkhtml3.16-cil (>= 2.20), libgtk2.0-dev (>= 2.6), libgnome2.0-cil (>= 2.20), libgnome2-dev (>= 2.2), libxml-parser-perl, libmono-dev (>= 1.1.7), libgnomeui-dev (>= 2.2), libexif-dev (>= 0.5.7), libsqlite3-dev, libgphoto2-2-dev (>= 2.1.4), liblcms1-dev, libmono-sqlite2.0-cil, libmono-system-runtime2.0-cil, libmono-cairo2.0-cil, libusb-dev, gnome-doc-utils (>= 0.3.2), libgl1-mesa-dev | libgl-dev, libndesk-dbus1.0-cil (>= 0.4.2), libndesk-dbus-glib1.0-cil (>= 0.3.0), libgconf2.0-cil, libglade2.0-cil, libgnome-vfs2.0-cil, libmono-addins0.2-cil, libmono-addins-gui0.2-cil, beagle-dev (>= 0.3), gnome-screensaver, docbook-xml
 Standards-Version: 3.7.3
 Homepage: http://www.f-spot.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-cli-apps/packages/f-spot/trunk/

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=3830&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/00list (original)
+++ packages/f-spot/trunk/debian/patches/00list Thu Mar 20 19:53:41 2008
@@ -20,6 +20,9 @@
 # Bugfix for build breakage.
 fix_gallery_extension_install_hook
 
+# Update gtkhtml-sharp to 3.14
+gtkhtml-sharp-3.14_port
+
 # Update FlickrNet to 2.1.5
 link_system_flickrnet
 forward_port_to_flickrnet_2.1.5

Added: packages/f-spot/trunk/debian/patches/gtkhtml-sharp-3.14_port.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/gtkhtml-sharp-3.14_port.dpatch?rev=3830&op=file
==============================================================================
--- packages/f-spot/trunk/debian/patches/gtkhtml-sharp-3.14_port.dpatch (added)
+++ packages/f-spot/trunk/debian/patches/gtkhtml-sharp-3.14_port.dpatch Thu Mar 20 19:53:41 2008
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## gtkhtml-sharp-3.14_port.dpatch by Tim Retout <tim at retout.co.uk>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Port to gtkhtml-sharp-3.14
+
+ at DPATCH@
+diff -urNad f-spot~/src/InfoDisplay.cs f-spot/src/InfoDisplay.cs
+--- f-spot~/src/InfoDisplay.cs	2008-03-09 11:12:45.000000000 +0000
++++ f-spot/src/InfoDisplay.cs	2008-03-20 19:31:22.000000000 +0000
+@@ -148,7 +148,7 @@
+ 
+ 		private void Update ()
+ 		{
+-			Gtk.HTMLStream stream = this.Begin (null, "text/html; charset=utf-8", Gtk.HTMLBeginFlags.Scroll);
++			Gtk.HTMLStream stream = this.Begin (null, "text/html; charset=utf-8", Gtk.HTMLBeginFlags.KeepScroll);
+ 			
+ 			string bg = Color (this.Style.Background (Gtk.StateType.Active));
+ 			string fg = Color (this.Style.Foreground (Gtk.StateType.Active));

Propchange: packages/f-spot/trunk/debian/patches/gtkhtml-sharp-3.14_port.dpatch
------------------------------------------------------------------------------
    svn:executable = *


