[Pkg-cli-apps-commits] [SCM] Packaging for f-spot branch, master, updated. debian/0.6.1.3-1-1-g16fd9c8

[Iain Lane]

The following commit has been merged in the master branch:
commit 16fd9c854299b0a6fc9586cf2a8ee5cff3bf3629
Author: Iain Lane <laney at ubuntu.com>
Date:   Mon Sep 28 22:49:38 2009 +0100

    Use mono-csc, don't set LDFLAGS
    
    * debian/rules, debian/control: Use mono-csc instead of csc to build. Bump
      mono-devel build-dep version to 2.4.2.3 for this.
    * debian/rules: Remove LDFLAGS definition and set flags in dh_auto_configure
      override. Somehow it was being parsed twice - this was only used in one
      place so just setting it directly in the target doesn't hurt.

diff --git a/debian/changelog b/debian/changelog
index 55b6442..7a822cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+f-spot (0.6.1.3-2) karmic; urgency=low
+
+  * debian/rules, debian/control: Use mono-csc instead of csc to build. Bump
+    mono-devel build-dep version to 2.4.2.3 for this.
+  * debian/rules: Remove LDFLAGS definition and set flags in dh_auto_configure
+    override. Somehow it was being parsed twice - this was only used in one
+    place so just setting it directly in the target doesn't hurt.
+
+ -- Iain Lane <laney at ubuntu.com>  Mon, 28 Sep 2009 22:32:46 +0100
+
 f-spot (0.6.1.3-1) unstable; urgency=low
 
   * New upstream Version 0.6.1.3
diff --git a/debian/control b/debian/control
index 9b42b91..bf33182 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Mirco Bauer <meebey at debian.org>, Iain Lane <laney at ubuntu.com>
 Build-Depends: debhelper (>= 7.0.50),
  cli-common-dev (>= 0.5.4),
  quilt (>= 0.46-7~),
- mono-devel (>= 2.0),
+ mono-devel (>= 2.4.2.3),
  libgtk2.0-dev (>= 2.14),
  libgtk2.0-cil (>= 2.12.2),
  gtk-sharp2-gapi,
diff --git a/debian/rules b/debian/rules
index fe2971b..8493554 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,8 +5,6 @@ include /usr/share/cli-common/cli.make
 VERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\  -f2)
 UPVERSION = $(shell echo $(VERSION) | sed 's,-.*,,' | sed 's,+dfsg.*,,') 
 
-LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
-
 # robbed from tomboy
 autoreconf: autoreconf-stamp
 autoreconf-stamp:
@@ -23,8 +21,8 @@ override_dh_clean:
 override_dh_auto_configure: autoreconf-stamp
 	dh_auto_configure -- \
 		--disable-scrollkeeper \
-		LDFLAGS="$(LDFLAGS)" \
-		MCS=/usr/bin/csc
+		LDFLAGS="-Wl,-z,defs -Wl,-O1 -Wl,--as-needed" \
+		MCS=/usr/bin/mono-csc
 
 override_dh_install:
 	rm -f $(CURDIR)/debian/f-spot/usr/lib/f-spot/*.a \

-- 
Packaging for f-spot