[Pkg-cli-apps-commits] r4339 - in /packages/f-spot/trunk/debian: changelog control patches/debian_use_csc.dpatch rules

meebey at users.alioth.debian.org meebey at users.alioth.debian.org
Mon Dec 15 23:23:47 UTC 2008 

Author: meebey
Date: Mon Dec 15 23:23:47 2008
New Revision: 4339

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4339
Log:
  * debian/control:
    + Added gtk-sharp2-gapi to build-deps.
  * debian/patches/debian_use_csc.dpatch:
     + Replaces hardcoded compiler calls with MCS variable from configure.
      (thanks to Iain Lane <laney at ubuntu.com> for the patch)
  * debian/rules:
    + Pass csc compiler variable to configure.


Modified:
    packages/f-spot/trunk/debian/changelog
    packages/f-spot/trunk/debian/control
    packages/f-spot/trunk/debian/patches/debian_use_csc.dpatch
    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=4339&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/changelog (original)
+++ packages/f-spot/trunk/debian/changelog Mon Dec 15 23:23:47 2008
@@ -11,10 +11,14 @@
     + Replaced mono-gmcs build-dep with mono-devel >= 2.0 as part of the
       Mono 2.0 transition.
     + Enhanced package description.
+    + Added gtk-sharp2-gapi to build-deps.
   * debian/patches/debian_use_csc.dpatch:
     + Replaces hardcoded compiler calls with MCS variable from configure.
-
- -- Mirco Bauer <meebey at debian.org>  Mon, 15 Dec 2008 23:59:13 +0100
+      (thanks to Iain Lane <laney at ubuntu.com> for the patch)
+  * debian/rules:
+    + Pass csc compiler variable to configure.
+
+ -- Mirco Bauer <meebey at debian.org>  Tue, 16 Dec 2008 00:21:33 +0100
 
 f-spot (0.4.4-1) unstable; urgency=medium
 

Modified: packages/f-spot/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/control?rev=4339&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/control (original)
+++ packages/f-spot/trunk/debian/control Mon Dec 15 23:23:47 2008
@@ -10,6 +10,7 @@
  mono-devel (>= 2.0),
  libgtk2.0-dev (>= 2.6),
  libgtk2.0-cil (>= 2.8),
+ gtk-sharp2-gapi,
  libgnome2-dev (>= 2.2),
  libgnome2.0-cil (>= 2.20),
  libgtkhtml3.16-cil (>= 2.20),

Modified: packages/f-spot/trunk/debian/patches/debian_use_csc.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/debian_use_csc.dpatch?rev=4339&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/debian_use_csc.dpatch (original)
+++ packages/f-spot/trunk/debian/patches/debian_use_csc.dpatch Mon Dec 15 23:23:47 2008
@@ -1,32 +1,33 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## use_csc.dpatch by Mirco Bauer <meebey at debian.org>
+## mono_transition_use_csc.dpatch by Iain Lane <laney at ubuntu.com>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Patch build system to use compiler from MCS variable instead of hardcoded gmcs. Part of mono 2.0 transition.
 
 @DPATCH@
-diff -urNad f-spot-0.4.4~/Makefile.include f-spot-0.4.4/Makefile.include
---- f-spot-0.4.4~/Makefile.include	2008-12-15 23:56:40.000000000 +0100
-+++ f-spot-0.4.4/Makefile.include	2008-12-15 23:58:09.000000000 +0100
+diff -urNad f-spot-0.5.0.3~/Makefile.include f-spot-0.5.0.3/Makefile.include
+--- f-spot-0.5.0.3~/Makefile.include	2008-07-08 12:01:42.000000000 +0100
++++ f-spot-0.5.0.3/Makefile.include	2008-11-30 20:27:01.000000000 +0000
 @@ -40,8 +40,8 @@
  ## Build
  
  CSC_FLAGS = -debug
 -CSC = gmcs $(CSC_FLAGS) -target:exe
 -CSC_LIB = gmcs $(CSC_FLAGS) -target:library
-+CSC = @MCS@ $(CSC_FLAGS) -target:exe
-+CSC_LIB = @MCS@ $(CSC_FLAGS) -target:library
++CSC = $(MCS) $(CSC_FLAGS) -target:exe
++CSC_LIB = $(MCS) $(CSC_FLAGS) -target:library
  
  ## Runtime
  
-diff -urNad f-spot-0.4.4~/configure.in f-spot-0.4.4/configure.in
---- f-spot-0.4.4~/configure.in	2008-12-15 23:56:40.000000000 +0100
-+++ f-spot-0.4.4/configure.in	2008-12-15 23:58:28.000000000 +0100
-@@ -324,6 +324,7 @@
+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	2008-10-17 19:54:15.000000000 +0100
++++ f-spot-0.5.0.3/configure.in	2008-11-30 20:26:23.000000000 +0000
+@@ -315,7 +315,7 @@
+ AC_SUBST(CPPFLAGS)
+ AC_SUBST(LDFLAGS)
  
- AC_OUTPUT([
- Makefile
-+Makefile.include
- dbus-sharp/Makefile
- dbus-sharp-glib/Makefile
- docs/Makefile
+-CSC=gmcs
++CSC=$(MCS)
+ AC_SUBST(CSC)
+ 
+ expanded_libdir=`( case $prefix in NONE) prefix=$ac_default_prefix ;; *) ;; esac

Modified: packages/f-spot/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/rules?rev=4339&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/rules (original)
+++ packages/f-spot/trunk/debian/rules Mon Dec 15 23:23:47 2008
@@ -14,6 +14,7 @@
 CFLAGS := -Wall -g
 
 DEB_CONFIGURE_SCRIPT_ENV := LDFLAGS="-Wl,-O1 -Wl,--as-needed"
+DEB_CONFIGURE_USER_FLAGS += MCS=/usr/bin/csc
 DEB_CONFIGURE_EXTRA_FLAGS := --disable-scrollkeeper
 
 common-configure-indep::

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