[Pkg-cli-apps-commits] r4325 - in /packages/monodevelop/trunk/debian: changelog control patches/00list patches/use_csc.dpatch rules

meebey at users.alioth.debian.org meebey at users.alioth.debian.org
Mon Dec 15 21:21:08 UTC 2008 

Author: meebey
Date: Mon Dec 15 21:21:08 2008
New Revision: 4325

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4325
Log:
  * debian/control
    + Added autoconf, automake and autotools-dev to build-deps.
    + Refresh build-system as we patch parts of it.
  * debian/patches/use_csc.dpatch:
    + This patch replaces hardcoded mcs and gmcs calls with csc.


Added:
    packages/monodevelop/trunk/debian/patches/use_csc.dpatch   (with props)
Modified:
    packages/monodevelop/trunk/debian/changelog
    packages/monodevelop/trunk/debian/control
    packages/monodevelop/trunk/debian/patches/00list
    packages/monodevelop/trunk/debian/rules

Modified: packages/monodevelop/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/changelog?rev=4325&op=diff
==============================================================================
--- packages/monodevelop/trunk/debian/changelog (original)
+++ packages/monodevelop/trunk/debian/changelog Mon Dec 15 21:21:08 2008
@@ -11,8 +11,12 @@
       Mono 2.0 transition.
     + Removed mono-mcs and mono-gmcs from Suggests/Recommends as
       mono-1.0/2.0-devel does that job already.
+    + Added autoconf, automake and autotools-dev to build-deps.
   * debian/rules:
     + Pass "csc" as C# compiler to configure
+    + Refresh build-system as we patch parts of it.
+  * debian/patches/use_csc.dpatch:
+    + This patch replaces hardcoded mcs and gmcs calls with csc.
 
  -- Mirco Bauer <meebey at debian.org>  Mon, 15 Dec 2008 21:49:52 +0100
 

Modified: packages/monodevelop/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/control?rev=4325&op=diff
==============================================================================
--- packages/monodevelop/trunk/debian/control (original)
+++ packages/monodevelop/trunk/debian/control Mon Dec 15 21:21:08 2008
@@ -8,6 +8,9 @@
  libmono-dev (>= 1.1.10),
  monodoc-base (>= 1.1.9),
  intltool,
+ autoconf,
+ automake,
+ autotools-dev,
  gtk-sharp2-gapi (>= 2.8),
  libgtk2.0-cil (>= 2.8),
  libgnome2.0-cil (>= 2.8),

Modified: packages/monodevelop/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/patches/00list?rev=4325&op=diff
==============================================================================
--- packages/monodevelop/trunk/debian/patches/00list (original)
+++ packages/monodevelop/trunk/debian/patches/00list Mon Dec 15 21:21:08 2008
@@ -1,5 +1,3 @@
-#link_system_nunit
-#nunit_2.4_port
 link_system_mono-nunit
 nunit_2.2_backport
 use_libsvn1
@@ -8,3 +6,4 @@
 update_templates_for_gtk-sharp_2.10
 boo_mimetype
 bashism
+use_csc

Added: packages/monodevelop/trunk/debian/patches/use_csc.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/patches/use_csc.dpatch?rev=4325&op=file
==============================================================================
--- packages/monodevelop/trunk/debian/patches/use_csc.dpatch (added)
+++ packages/monodevelop/trunk/debian/patches/use_csc.dpatch Mon Dec 15 21:21:08 2008
@@ -1,0 +1,46 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## use_csc.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 monodevelop-1.0+dfsg~/contrib/Mono.Cecil/Makefile.am monodevelop-1.0+dfsg/contrib/Mono.Cecil/Makefile.am
+--- monodevelop-1.0+dfsg~/contrib/Mono.Cecil/Makefile.am	2008-03-11 03:21:32.000000000 +0100
++++ monodevelop-1.0+dfsg/contrib/Mono.Cecil/Makefile.am	2008-12-15 22:15:39.000000000 +0100
+@@ -1,4 +1,5 @@
+ BINDIR=$(top_builddir)/build/bin
++MCS=@CS@
+ 
+ all: $(CECIL)
+ 
+@@ -11,7 +12,7 @@
+ 
+ $(CECIL): $(CECIL_CSFILES)
+ 	mkdir -p $(BINDIR)
+-	mcs $(CECIL_CSFILES) /debug /target:library /out:$(CECIL)
++	$(MCS) $(CECIL_CSFILES) /debug /target:library /out:$(CECIL)
+ 
+ $(CECIL_DEBUG): $(CECIL)
+ 
+@@ -24,7 +25,7 @@
+ 
+ $(CECIL_MDB): $(CECIL_MDB_CSFILES) $(CECIL)
+ 	mkdir -p $(BINDIR)
+-	mcs $(CECIL_MDB_CSFILES) /debug /target:library /r:$(CECIL) /d:CECIL /out:$(CECIL_MDB)
++	$(CSC) $(CECIL_MDB_CSFILES) /debug /target:library /r:$(CECIL) /d:CECIL /out:$(CECIL_MDB)
+ 
+ $(CECIL_MDB_DEBUG): $(CECIL_MDB)
+ 
+diff -urNad monodevelop-1.0+dfsg~/src/addins/MonoDevelop.GtkCore/lib/Makefile.am monodevelop-1.0+dfsg/src/addins/MonoDevelop.GtkCore/lib/Makefile.am
+--- monodevelop-1.0+dfsg~/src/addins/MonoDevelop.GtkCore/lib/Makefile.am	2008-03-11 03:19:54.000000000 +0100
++++ monodevelop-1.0+dfsg/src/addins/MonoDevelop.GtkCore/lib/Makefile.am	2008-12-15 22:15:18.000000000 +0100
+@@ -6,7 +6,7 @@
+ libsteticui: $(libsteticui)
+ 
+ ### Common settings ###
+-MCS = gmcs
++MCS = @CSC@
+ EXTRACT_VARS = $(top_srcdir)/contrib/extract_makefile_variable.sh
+ 
+ 

Propchange: packages/monodevelop/trunk/debian/patches/use_csc.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: packages/monodevelop/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop/trunk/debian/rules?rev=4325&op=diff
==============================================================================
--- packages/monodevelop/trunk/debian/rules (original)
+++ packages/monodevelop/trunk/debian/rules Mon Dec 15 21:21:08 2008
@@ -7,6 +7,9 @@
 build: build-stamp
 build-stamp: patch-stamp
 	dh build --before configure
+	aclocal -I.
+	autoconf
+	automake --add-missing --copy
 	dh_auto_configure -- \
 	  --disable-update-mimedb \
 	  --disable-update-desktopdb \
@@ -21,6 +24,8 @@
 clean: clean-patched unpatch
 clean-patched:
 	dh clean
+	rm -rf configure config.sub config.guess ltmain.sh aclocal.m4 autom4te.cache/
+	find . -name "Makefile.in" -delete
 
 install: build
 	dh $@ --before dh_install

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