[Pkg-mono-svn-commits] rev 3821 - in mono-tools/trunk/debian: . patches

David Paleino hanska-guest at alioth.debian.org
Sun Nov 23 23:14:50 UTC 2008 

Author: hanska-guest
Date: 2008-11-23 23:14:50 +0000 (Sun, 23 Nov 2008)
New Revision: 3821

Modified:
   mono-tools/trunk/debian/changelog
   mono-tools/trunk/debian/control
   mono-tools/trunk/debian/patches/00list
   mono-tools/trunk/debian/patches/04_gendarme_link_libraries_correctly.dpatch
   mono-tools/trunk/debian/rules
Log:
NOT READY YET.

  + Build-Depends:
    - added autotools-dev, autoconf, automake
    - added mono-devel
    - removed mono-mcs, mono-gmcs, mono-gac and mono-1.0-devel
* debian/rules:
  + implemented autotools files re-generation
* debian/patches:
  + 04_gendarme_link_libraries_correctly updated
  + 05_webkit-sharp_port disabled
  + 99_autoreconf disabled

Modified: mono-tools/trunk/debian/changelog
===================================================================
--- mono-tools/trunk/debian/changelog	2008-11-23 22:58:59 UTC (rev 3820)
+++ mono-tools/trunk/debian/changelog	2008-11-23 23:14:50 UTC (rev 3821)
@@ -1,12 +1,24 @@
 mono-tools (2.0-1) UNRELEASED; urgency=low
 
+  NOT READY YET.
+  
   * New upstream release
   * Group Policy:
     + implemented get-orig-source in debian/rules
   * debian/control:
+    + Build-Depends:
+      - added autotools-dev, autoconf, automake
+      - added mono-devel
+      - removed mono-mcs, mono-gmcs, mono-gac and mono-1.0-devel
     + fixed spurious dot in long description
+  * debian/rules:
+    + implemented autotools files re-generation
+  * debian/patches:
+    + 04_gendarme_link_libraries_correctly updated
+    + 05_webkit-sharp_port disabled
+    + 99_autoreconf disabled
 
- -- David Paleino <d.paleino at gmail.com>  Sun, 23 Nov 2008 23:11:28 +0100
+ -- David Paleino <d.paleino at gmail.com>  Mon, 24 Nov 2008 00:14:31 +0100
 
 mono-tools (1.9-2) unstable; urgency=medium
 

Modified: mono-tools/trunk/debian/control
===================================================================
--- mono-tools/trunk/debian/control	2008-11-23 22:58:59 UTC (rev 3820)
+++ mono-tools/trunk/debian/control	2008-11-23 23:14:50 UTC (rev 3821)
@@ -6,14 +6,14 @@
 Build-Depends: debhelper (>= 5.0.0), dpatch
 Build-Depends-Indep: cli-common-dev (>= 0.5.4),
  pkg-config,
- mono-mcs (>= 1.0),
- mono-gmcs (>= 1.0),
+ autoconf,
+ automake,
+ autotools-dev,
+ mono-devel,
  libmono-dev (>= 1.0),
  libmono-nunit2.2-cil,
  libmono-system-web2.0-cil,
  libmono1.0-cil (>= 1.9.1),
- mono-gac (>= 1.0),
- mono-1.0-devel,
  libgtk2.0-cil (>= 2.0),
  libgconf2.0-cil (>= 2.0),
  libglade2.0-cil (>= 2.0),

Modified: mono-tools/trunk/debian/patches/00list
===================================================================
--- mono-tools/trunk/debian/patches/00list	2008-11-23 22:58:59 UTC (rev 3820)
+++ mono-tools/trunk/debian/patches/00list	2008-11-23 23:14:50 UTC (rev 3821)
@@ -2,6 +2,6 @@
 02_startup_mono_path
 03_mozilla-home
 04_gendarme_link_libraries_correctly
-05_webkit-sharp_port
+#05_webkit-sharp_port
 #05_nunit_2.4_port
-99_autoreconf
+#99_autoreconf

Modified: mono-tools/trunk/debian/patches/04_gendarme_link_libraries_correctly.dpatch
===================================================================
--- mono-tools/trunk/debian/patches/04_gendarme_link_libraries_correctly.dpatch	2008-11-23 22:58:59 UTC (rev 3820)
+++ mono-tools/trunk/debian/patches/04_gendarme_link_libraries_correctly.dpatch	2008-11-23 23:14:50 UTC (rev 3821)
@@ -1,19 +1,19 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## gendarme_link_libraries_correctly.dpatch by Mirco Bauer <meebey at debian.org>
+## 04_gendarme_link_libraries_correctly.dpatch by Mirco Bauer <meebey at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: No description.
 
 @DPATCH@
-diff -urNad mono-tools-1.9~/gendarme/rules/Gendarme.Rules.Portability/Makefile.am mono-tools-1.9/gendarme/rules/Gendarme.Rules.Portability/Makefile.am
---- mono-tools-1.9~/gendarme/rules/Gendarme.Rules.Portability/Makefile.am	2008-05-02 20:22:08.000000000 +0200
-+++ mono-tools-1.9/gendarme/rules/Gendarme.Rules.Portability/Makefile.am	2008-05-02 20:22:25.000000000 +0200
-@@ -17,7 +17,7 @@
- portability_rules_build_sources += $(portability_rules_generated_sources)
+diff -urNad mono-tools-2.0~/gendarme/rules/Gendarme.Rules.Portability/Makefile.am mono-tools-2.0/gendarme/rules/Gendarme.Rules.Portability/Makefile.am
+--- mono-tools-2.0~/gendarme/rules/Gendarme.Rules.Portability/Makefile.am	2008-11-23 23:54:52.000000000 +0100
++++ mono-tools-2.0/gendarme/rules/Gendarme.Rules.Portability/Makefile.am	2008-11-23 23:56:39.000000000 +0100
+@@ -13,7 +13,7 @@
+ CLEANFILES = $(rules_dll) $(rules_dll).mdb $(tests_dll)
+ DISTCLEANFILES = Makefile.in Gendarme.Rules.Portability.xml TestResult.xml
  
- ../../bin/Gendarme.Rules.Portability.dll: $(portability_rules_build_sources)
--	$(GMCS) -debug -target:library -r:$(top_builddir)/gendarme/bin/Mono.Cecil.dll -pkg:dotnet -r:ICSharpCode.SharpZipLib.dll -r:../../bin/Gendarme.Framework.dll -out:$@ $(portability_rules_build_sources)
-+	$(GMCS) -debug -target:library -r:$(top_builddir)/gendarme/bin/Mono.Cecil.dll -r:System.Web.Services -r:ICSharpCode.SharpZipLib.dll -r:../../bin/Gendarme.Framework.dll -out:$@ $(portability_rules_build_sources)
- 	cp Gendarme.Rules.*.xml ../../bin/
+-EXTRA_RULES_OPTIONS = -r:ICSharpCode.SharpZipLib.dll -pkg:dotnet
++EXTRA_RULES_OPTIONS = -r:ICSharpCode.SharpZipLib.dll -r:System.Web.Services
  
- portability_test_sources = NewLineLiteralTest.cs FeatureRequiresRootPrivilegeOnUnixTest.cs \
+ rules_sources = \
+ 	DoNotHardcodePathsRule.cs \

Modified: mono-tools/trunk/debian/rules
===================================================================
--- mono-tools/trunk/debian/rules	2008-11-23 22:58:59 UTC (rev 3820)
+++ mono-tools/trunk/debian/rules	2008-11-23 23:14:50 UTC (rev 3821)
@@ -6,10 +6,21 @@
 
 include /usr/share/dpatch/dpatch.make
 
+configure: config-stamp
+config-stamp: patch
+	dh_testdir
+	
+	aclocal
+	autoconf
+	automake --add-missing --copy
+	
+	./configure --prefix=/usr
+	
+	touch $@
+
 build: build-stamp
-build-stamp: patch-stamp
+build-stamp: config-stamp
 	dh_testdir
-	./configure --prefix=/usr
 	$(MAKE)
 	touch build-stamp
 
@@ -17,12 +28,10 @@
 clean-patched:
 	dh_testdir
 	dh_testroot
-	#[ ! -f Makefile ] || $(MAKE) distclean
-	# distclean deletes some Makefile.in files :(
-	[ ! -f Makefile ] || $(MAKE) clean
-	rm -rf $$MONO_SHARED_DIR/.wapi
-	rm -f build-stamp
-	dh_clean
+	[ ! -f Makefile ] || $(MAKE) distclean
+	find . -name "Makefile.in" | xargs rm -rf
+	rm -rf $$MONO_SHARED_DIR/.wapi autom4te.cache/
+	dh_clean configure config.sub config.guess
 
 install: build
 	dh_testdir

More information about the Pkg-mono-svn-commits mailing list