[Pkg-mono-svn-commits] rev 3032 - cecil/branches/experimental/debian

Jose Carlos Garcia Sogo jsogo at alioth.debian.org
Mon Apr 9 21:56:41 UTC 2007 

Author: jsogo
Date: 2007-04-09 21:56:41 +0000 (Mon, 09 Apr 2007)
New Revision: 3032

Added:
   cecil/branches/experimental/debian/libmono-cecil0.5-cil.install
   cecil/branches/experimental/debian/libmono-cecil0.5-cil.installcligac
   cecil/branches/experimental/debian/policy.0.5.Mono.Cecil.config
Removed:
   cecil/branches/experimental/debian/libmono-cecil0.4-cil.install
   cecil/branches/experimental/debian/libmono-cecil0.4-cil.installcligac
   cecil/branches/experimental/debian/policy.0.4.Mono.Cecil.config
Modified:
   cecil/branches/experimental/debian/
   cecil/branches/experimental/debian/changelog
   cecil/branches/experimental/debian/control
   cecil/branches/experimental/debian/rules
Log:

 Cecil (0.5-1)

  * New upstream version.
  * debian/control:
     + Bump build dependency to cli-common-dev >= 0.4.4
     + In description, there is no need to say which software is also using
     this package.
     + ABI change. Change package name
  * debian/rules:
     + There is no need to install *.dll files by hand. dh_install will do it.
     + Don't delete *.mdb files if 'nostrip' option is set
     + dh_install must be called in binary targets
     + Disable building of policy file.
  * debian/installcligac
     + Do not try to install policy file in GAC




Property changes on: cecil/branches/experimental/debian
___________________________________________________________________
Name: mergeWithUpstream
   + 1

Modified: cecil/branches/experimental/debian/changelog
===================================================================
--- cecil/branches/experimental/debian/changelog	2007-04-09 13:14:56 UTC (rev 3031)
+++ cecil/branches/experimental/debian/changelog	2007-04-09 21:56:41 UTC (rev 3032)
@@ -1,3 +1,20 @@
+cecil (0.5-1) experimental; urgency=low
+
+  * New upstream version.
+  * debian/control:
+     + Bump build dependency to cli-common-dev >= 0.4.4
+     + In description, there is no need to say which software is also using
+     this package.
+  * debian/rules:
+     + There is no need to install *.dll files by hand. dh_install will do it.
+     + Don't delete *.mdb files if 'nostrip' option is set
+     + dh_install must be called in binary targets
+     + Disable building of policy file.
+  * debian/installcligac
+     + Do not try to install policy file in GAC
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org>  Mon, 09 Apr 2007 23:52:07 +0200
+
 cecil (0.4.3-2) unstable; urgency=low
 
   * debian/control:

Modified: cecil/branches/experimental/debian/control
===================================================================
--- cecil/branches/experimental/debian/control	2007-04-09 13:14:56 UTC (rev 3031)
+++ cecil/branches/experimental/debian/control	2007-04-09 21:56:41 UTC (rev 3032)
@@ -2,12 +2,12 @@
 Section: devel
 Priority: optional
 Maintainer: Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>
-Uploaders: Sebastian Dröge <slomo at debian.org>
+Uploaders: Sebastian Dröge <slomo at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>
 Build-Depends: debhelper (>= 5), dpatch
-Build-Depends-Indep: cli-common-dev (>= 0.4.0), mono-mcs (>= 1.1.9) | c-sharp-compiler, sharutils
+Build-Depends-Indep: cli-common-dev (>= 0.4.4), mono-mcs (>= 1.1.9) | c-sharp-compiler, sharutils
 Standards-Version: 3.7.2
 
-Package: libmono-cecil0.4-cil
+Package: libmono-cecil0.5-cil
 Architecture: all
 Depends: ${cli:Depends}
 Replaces: libmono-cecil0.3-cil
@@ -19,8 +19,5 @@
  browse all the contained types, modify them on the fly and save back to the
  disk the modified assembly.
  .
- Today it is used by the Mono Debugger by the bug-finding and compliance
- checking tool Gendarme as well as DB4O. 
- .
  http://www.mono-project.com/Cecil
 

Deleted: cecil/branches/experimental/debian/libmono-cecil0.4-cil.install
===================================================================
--- cecil/branches/experimental/debian/libmono-cecil0.4-cil.install	2007-04-09 13:14:56 UTC (rev 3031)
+++ cecil/branches/experimental/debian/libmono-cecil0.4-cil.install	2007-04-09 21:56:41 UTC (rev 3032)
@@ -1 +0,0 @@
-debian/tmp/usr

Deleted: cecil/branches/experimental/debian/libmono-cecil0.4-cil.installcligac
===================================================================
--- cecil/branches/experimental/debian/libmono-cecil0.4-cil.installcligac	2007-04-09 13:14:56 UTC (rev 3031)
+++ cecil/branches/experimental/debian/libmono-cecil0.4-cil.installcligac	2007-04-09 21:56:41 UTC (rev 3032)
@@ -1,2 +0,0 @@
-/usr/lib/cli/mono-cecil-0.4/Mono.Cecil.dll
-/usr/lib/cli/mono-cecil-0.4/policy.0.4.Mono.Cecil.dll

Copied: cecil/branches/experimental/debian/libmono-cecil0.5-cil.install (from rev 3024, cecil/branches/experimental/debian/libmono-cecil0.4-cil.install)
===================================================================
--- cecil/branches/experimental/debian/libmono-cecil0.4-cil.install	2007-04-05 22:13:22 UTC (rev 3024)
+++ cecil/branches/experimental/debian/libmono-cecil0.5-cil.install	2007-04-09 21:56:41 UTC (rev 3032)
@@ -0,0 +1,2 @@
+usr/lib/pkgconfig
+usr/lib/Mono.Cecil/* usr/lib/cli/mono-cecil-0.5

Copied: cecil/branches/experimental/debian/libmono-cecil0.5-cil.installcligac (from rev 3024, cecil/branches/experimental/debian/libmono-cecil0.4-cil.installcligac)
===================================================================
--- cecil/branches/experimental/debian/libmono-cecil0.4-cil.installcligac	2007-04-05 22:13:22 UTC (rev 3024)
+++ cecil/branches/experimental/debian/libmono-cecil0.5-cil.installcligac	2007-04-09 21:56:41 UTC (rev 3032)
@@ -0,0 +1 @@
+/usr/lib/cli/mono-cecil-0.5/Mono.Cecil.dll

Deleted: cecil/branches/experimental/debian/policy.0.4.Mono.Cecil.config
===================================================================
--- cecil/branches/experimental/debian/policy.0.4.Mono.Cecil.config	2007-04-09 13:14:56 UTC (rev 3031)
+++ cecil/branches/experimental/debian/policy.0.4.Mono.Cecil.config	2007-04-09 21:56:41 UTC (rev 3032)
@@ -1,11 +0,0 @@
-<configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Mono.Cecil" publicKeyToken="9b4bd814fdde2e2e" />
-        <bindingRedirect oldVersion="0.4.1.0-0.4.2.0" newVersion="0.4.3.0"/>
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
-

Copied: cecil/branches/experimental/debian/policy.0.5.Mono.Cecil.config (from rev 3024, cecil/branches/experimental/debian/policy.0.4.Mono.Cecil.config)

Modified: cecil/branches/experimental/debian/rules
===================================================================
--- cecil/branches/experimental/debian/rules	2007-04-09 13:14:56 UTC (rev 3031)
+++ cecil/branches/experimental/debian/rules	2007-04-09 21:56:41 UTC (rev 3032)
@@ -10,20 +10,28 @@
 # provide patch and unpatch targets
 include /usr/share/dpatch/dpatch.make
 
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+
 UPVERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\  -f2 | sed 's,-.*,,')
-ABIVERSION = 0.4
+ABIVERSION = 0.5
 
 configure: configure-stamp
-configure-stamp:
+configure-stamp: patch-stamp
 	./configure --prefix=debian/tmp/usr
 	touch configure-stamp
 
-build: patch-stamp configure-stamp build-stamp
-build-stamp:
+build: build-stamp
+build-stamp: configure-stamp
 	uudecode -o debian/Cecil.snk debian/Cecil.snk.uue
 	$(MAKE)
-	cd debian && al -link:policy.0.4.Mono.Cecil.config \
-                    -out:policy.0.4.Mono.Cecil.dll \
+#	cd debian && al -link:policy.0.5.Mono.Cecil.config \
+                    -out:policy.0.5.Mono.Cecil.dll \
                     -keyfile:Cecil.snk
 
 	touch build-stamp
@@ -32,7 +40,7 @@
 	dh_testdir
 	dh_testroot
 	-$(MAKE) clean
-	rm -f debian/policy.0.4.Mono.Cecil.dll
+	rm -f debian/policy.0.5.Mono.Cecil.dll
 	rm -rf $(MONO_SHARED_DIR)/.wapi
 	rm -f build-stamp configure-stamp debian/Cecil.snk
 	rm -f config.make
@@ -42,33 +50,42 @@
 	dh_testdir
 	dh_testroot
 	dh_clean -k 
-	dh_installdirs
-	$(MAKE) install
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+
 	# fix the path in the pkgconfig file
 	sed -i 's;debian/tmp/usr;/usr;g' debian/tmp/usr/lib/pkgconfig/mono-cecil.pc
+	
 	# fix the version in the pkgconfig file
 	sed -i 's;^Version:.*;Version:\ $(UPVERSION);g' debian/tmp/usr/lib/pkgconfig/mono-cecil.pc
+	
 	# fix the assemblies dir
-	mkdir -p debian/tmp/usr/lib/cli/mono-cecil-$(ABIVERSION)
-	cp -a debian/tmp/usr/lib/Mono.Cecil/* debian/tmp/usr/lib/cli/mono-cecil-$(ABIVERSION)
-	cp -a debian/policy.0.4.Mono.Cecil* debian/tmp/usr/lib/cli/mono-cecil-$(ABIVERSION)
+#	cp -a debian/policy.0.5.Mono.Cecil* debian/tmp/usr/lib/cli/mono-cecil-$(ABIVERSION)
 	sed -i 's;^assemblies_dir=.*;assemblies_dir=$${prefix}/lib/cli/mono-cecil-$(ABIVERSION);g' debian/tmp/usr/lib/pkgconfig/mono-cecil.pc
+	
 	# fix permissions
 	find debian/tmp -type f -name "*.dll" -or -name "*.mdb" -or -name "*.cs" -or -name "*.config" | xargs chmod -x
 
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	find debian/ -type f -name "*.mdb" -delete
+endif
+
+
 binary-indep: configure build install
 	dh_testdir
 	dh_testroot
+	dh_installdirs
+
+	dh_install --sourcedir=debian/tmp/
+
 	dh_installchangelogs ChangeLog
 	dh_installdocs
-	dh_installdirs
-	dh_install
 	dh_installman
 	dh_installcligac
+	
 	dh_compress
 	dh_fixperms
 	dh_makeclilibs -m $(UPVERSION)
-	dh_clideps
+	dh_clideps -d
 	dh_installdeb
 	dh_gencontrol
 	dh_md5sums

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