[Pkg-cli-apps-commits] r4037 - in /packages/f-spot/trunk/debian: NDesk.Glitz.dll.config changelog control patches/00list patches/debian_fix_f-spot.exe.config.dpatch rules

meebey at users.alioth.debian.org meebey at users.alioth.debian.org
Tue Jul 1 23:31:15 UTC 2008 

Author: meebey
Date: Tue Jul  1 23:31:14 2008
New Revision: 4037

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4037
Log:
  * debian/control:
    + Added libcairo2-dev, libglitz1-dev and libglitz-glx1-dev to
      build-dependencies, needed for resolving the binary dependencies, using
      dh_clideps.
  * debian/rules
    debian/NDesk.Glitz.dll.config
    debian/patches/debian_fix_f-spot.exe.config.dpatch:
    + Added missing DLL maps.


Added:
    packages/f-spot/trunk/debian/NDesk.Glitz.dll.config
    packages/f-spot/trunk/debian/patches/debian_fix_f-spot.exe.config.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

Added: packages/f-spot/trunk/debian/NDesk.Glitz.dll.config
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/NDesk.Glitz.dll.config?rev=4037&op=file
==============================================================================
--- packages/f-spot/trunk/debian/NDesk.Glitz.dll.config (added)
+++ packages/f-spot/trunk/debian/NDesk.Glitz.dll.config Tue Jul  1 23:31:14 2008
@@ -1,0 +1,4 @@
+<configuration>
+	<dllmap dll="glitz-glx" target="libglitz-glx.so.1"/>
+	<dllmap dll="glitz" target="libglitz.so.1"/>
+</configuration>

Modified: packages/f-spot/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/changelog?rev=4037&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/changelog (original)
+++ packages/f-spot/trunk/debian/changelog Tue Jul  1 23:31:14 2008
@@ -20,7 +20,14 @@
     + Removed beagle from build and binary dependencies, as beagle doesn't add
       any significant features but might cause a new set of issues.
       (Closes: #458897)
+    + Added libcairo2-dev, libglitz1-dev and libglitz-glx1-dev to
+      build-dependencies, needed for resolving the binary dependencies, using
+      dh_clideps.
     + Bumped Standards-Version to 3.8.0 (no changes needed).
+  * debian/rules
+    debian/NDesk.Glitz.dll.config
+    debian/patches/debian_fix_f-spot.exe.config.dpatch:
+    + Added missing DLL maps.
 
  -- Tim Retout <tim at retout.co.uk>  Tue, 01 Jul 2008 23:35:19 +0200
 

Modified: packages/f-spot/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/control?rev=4037&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/control (original)
+++ packages/f-spot/trunk/debian/control Tue Jul  1 23:31:14 2008
@@ -16,6 +16,7 @@
  libmono-dev (>= 1.1.7),
  libmono-sqlite2.0-cil,
  libmono-system-runtime2.0-cil,
+ libcairo2-dev,
  libmono-cairo2.0-cil,
  libmono-addins0.2-cil,
  libmono-addins-gui0.2-cil,
@@ -33,6 +34,8 @@
  libsqlite3-dev,
  libgphoto2-2-dev (>= 2.1.4),
  libgl1-mesa-dev | libgl-dev,
+ libglitz1-dev,
+ libglitz-glx1-dev,
  libxml-parser-perl,
  gnome-screensaver,
  gnome-doc-utils (>= 0.3.2),

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=4037&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/00list (original)
+++ packages/f-spot/trunk/debian/patches/00list Tue Jul  1 23:31:14 2008
@@ -12,6 +12,7 @@
 debian_link-system-flickrnet
 debian_link-system-gnome-keyring
 debian_flickrnet-2.1.5-port
+debian_fix_f-spot.exe.config
 
 # Patches to be applied last.
 98_autoreconf

Added: packages/f-spot/trunk/debian/patches/debian_fix_f-spot.exe.config.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/debian_fix_f-spot.exe.config.dpatch?rev=4037&op=file
==============================================================================
--- packages/f-spot/trunk/debian/patches/debian_fix_f-spot.exe.config.dpatch (added)
+++ packages/f-spot/trunk/debian/patches/debian_fix_f-spot.exe.config.dpatch Tue Jul  1 23:31:14 2008
@@ -1,0 +1,16 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## debian_fix_f-spot.exe.config.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.4~/src/f-spot.exe.config.in f-spot-0.4.4/src/f-spot.exe.config.in
+--- f-spot-0.4.4~/src/f-spot.exe.config.in	2008-05-07 14:35:26.000000000 +0200
++++ f-spot-0.4.4/src/f-spot.exe.config.in	2008-07-02 01:11:48.000000000 +0200
+@@ -14,4 +14,5 @@
+   <dllmap dll="libXcomposite.dll" target="libXcomposite.so.1"/>
+   <dllmap dll="liblcms-1.0.0.dll" target="liblcms.so.1"/>
+   <dllmap dll="libexif.dll" target="libexif.so. at EXIF_SOVERSION@"/>
++  <dllmap dll="cairo" target="libcairo.so.2"/>
+ </configuration>

Propchange: packages/f-spot/trunk/debian/patches/debian_fix_f-spot.exe.config.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=4037&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/rules (original)
+++ packages/f-spot/trunk/debian/rules Tue Jul  1 23:31:14 2008
@@ -26,6 +26,8 @@
 	rm $(CURDIR)/debian/f-spot/usr/lib/f-spot/*.a \
 	   $(CURDIR)/debian/f-spot/usr/lib/f-spot/*.la \
 	   $(CURDIR)/debian/f-spot/usr/lib/f-spot/*.so
+	cp $(CURDIR)/debian/NDesk.Glitz.dll.config \
+	   $(CURDIR)/debian/f-spot/usr/lib/f-spot/
 
 clean::
 	rm -rf $(MONO_SHARED_DIR)/.wapi

More information about the Pkg-cli-apps-commits mailing list