[Pkg-cli-libs-commits] [SCM] cecil branch, master, updated. upstream/0.6-9-g2c0e475

Iain Lane laney at ubuntu.com
Wed Dec 16 21:46:13 UTC 2009 

The following commit has been merged in the master branch:
commit 2c0e475a11c44e0f5ff322d165cb0bfae8349169
Author: Iain Lane <laney at ubuntu.com>
Date:   Wed Dec 16 21:12:21 2009 +0000

    Make lib unstable
    
    * Package as unstable as the library is not considered by upstream to be API
      or ABI stable. Consumers must now copy the library.
    * debian/control, debian/rules, debian/patches: Disable patchsys as this was
      only used to change assembly version which is now not necessary.
    * debian/rules, debian/mono.snk.uue: No need to sign now, not neccessary for
      unstable libs.
    * debian/control, debian/libmono-cecil-cil-dev*: Drop -dev package as this
      is used for dynamic linking, which we are not doing any more.
    * debian/changelog, debian/clean: Update dh7isation

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 3070a10..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,31 +0,0 @@
-cecil for Debian
-----------------
-
-This package uses dpatch to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-To get the fully patched source after unpacking the source package, cd
-to the root level of the source package and run:
-
-    debian/rules patch
-
-Removing a patch is as simple as removing its entry from the
-debian/patches/00list file, and please also remove the patch file
-itself.
-
-Creating a new patch is done with "dpatch-edit-patch patch XX_patchname"
-where you should replace XX with a new number and patchname with a
-descriptive shortname of the patch. You can then simply edit all the
-files your patch wants to edit, and then simply "exit 0" from the shell
-to actually create the patch file.
-
-To tweak an already existing patch, call "dpatch-edit-patch XX_patchname"
-and replace XX_patchname with the actual filename from debian/patches
-you want to use.
-
-To clean up afterwards again, "debian/rules unpatch" will do the
-work for you - or you can of course choose to call
-"fakeroot debian/rules clean" all together.
-
- -- David Paleino <d.paleino at gmail.com>  Sat, 07 Feb 2009 21:22:18 +0100
diff --git a/debian/changelog b/debian/changelog
index 10a3ee4..02e9019 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,18 @@ cecil (0.6+svn148654-1) UNRELEASED; urgency=low
 
   * debian/control: Move to git and update Vcs-* metadata 
   * New upstream SVN snapshot, needed for db4o
-
- -- Iain Lane <laney at ubuntu.com>  Wed, 16 Dec 2009 20:15:46 +0000
+  * Package as unstable as the library is not considered by upstream to be API
+    or ABI stable. Consumers must now copy the library.
+  * debian/control, debian/rules, debian/patches: Disable patchsys as this was
+    only used to change assembly version which is now not necessary.
+  * debian/rules, debian/mono.snk.uue: No need to sign now, not neccessary for
+    unstable libs.
+  * debian/control, debian/libmono-cecil-cil-dev*: Drop -dev package as this
+    is used for dynamic linking, which we are not doing any more.
+  * debian/changelog, debian/clean, debian/libmono-cecil-cil.docs: Update
+    dh7isation
+
+ -- Iain Lane <laney at ubuntu.com>  Wed, 16 Dec 2009 20:27:43 +0000
 
 cecil (0.6-3) unstable; urgency=low
 
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..ad766af
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,4 @@
+config.make
+Mono.Cecil/Mono.Cecil.dll
+Mono.Cecil/mono-cecil.pc
+Mono.Cecil.Mdb/Mono.Cecil.Mdb.dll
diff --git a/debian/control b/debian/control
index 876feac..e22707f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: cli-mono
 Priority: optional
 Maintainer: Debian CLI Libraries Team <pkg-cli-libs-team at lists.alioth.debian.org>
 Uploaders: Sebastian Dröge <slomo at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>
-Build-Depends: debhelper (>= 7), dpatch
+Build-Depends: debhelper (>= 7)
 Build-Depends-Indep: cli-common-dev (>= 0.5.4),
  mono-devel (>= 2.4.2.3),
  sharutils,
@@ -13,10 +13,10 @@ Homepage: http://www.mono-project.com/Cecil
 Vcs-Git: git://git.debian.org/git/pkg-cli-libs/packages/cecil.git
 Vcs-Browser: http://git.debian.org/?p=pkg-cli-libs/packages/cecil.git
 
-Package: libmono-cecil0.5-cil
+Package: libmono-cecil-cil
 Architecture: all
 Depends: ${cli:Depends}, ${misc:Depends}
-Conflicts: libmono-cecil0.3-cil, libmono-cecil0.4-cil
+Conflicts: libmono-cecil0.3-cil, libmono-cecil0.4-cil, libmono-cecil0.5-cil
 Description: library to generate and inspect CIL assemblies
  Cecil is a library under development to generate and inspect programs and
  libraries in the ECMA CIL format.
@@ -26,18 +26,3 @@ Description: library to generate and inspect CIL assemblies
  disk the modified assembly.
  .
  This package contains the Cecil library
-
-Package: libmono-cecil-cil-dev
-Architecture: all
-Depends: libmono-cecil0.5-cil (= ${binary:Version}), ${misc:Depends}
-Replaces: libmono-cecil0.3-cil, libmono-cecil0.4-cil, libmono-cecil0.5-cil (<< 0.6-3)
-Description: library to generate and inspect CIL assemblies
- Cecil is a library under development to generate and inspect programs and
- libraries in the ECMA CIL format.
- .
- In simple English, with Cecil, you can load existing managed assemblies,
- browse all the contained types, modify them on the fly and save back to the
- disk the modified assembly.
- .
- This package contains development files for the Cecil library, and should 
- be used for compilation
diff --git a/debian/installcligac b/debian/installcligac
deleted file mode 100644
index 2148255..0000000
--- a/debian/installcligac
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/cli/Mono.Cecil-0.5/Mono.Cecil.dll
diff --git a/debian/libmono-cecil-cil-dev.install b/debian/libmono-cecil-cil-dev.install
deleted file mode 100644
index 0fe9f3f..0000000
--- a/debian/libmono-cecil-cil-dev.install
+++ /dev/null
@@ -1 +0,0 @@
-Mono.Cecil/mono-cecil.pc usr/lib/pkgconfig
diff --git a/debian/libmono-cecil-cil.docs b/debian/libmono-cecil-cil.docs
new file mode 100644
index 0000000..c024c36
--- /dev/null
+++ b/debian/libmono-cecil-cil.docs
@@ -0,0 +1 @@
+Mono.Cecil/ChangeLog
diff --git a/debian/install b/debian/libmono-cecil-cil.install
similarity index 53%
rename from debian/install
rename to debian/libmono-cecil-cil.install
index 0673038..1d666ea 100644
--- a/debian/install
+++ b/debian/libmono-cecil-cil.install
@@ -1,2 +1,2 @@
-Mono.Cecil/Mono.Cecil.dll usr/lib/cli/Mono.Cecil-0.5
+Mono.Cecil/Mono.Cecil.dll usr/lib/cli/mono-cecil/
 #Mono.Cecil.Mdb/Mono.Cecil.Mdb.dll usr/lib/cli/mono-cecil-0.5
diff --git a/debian/mono.snk.uue b/debian/mono.snk.uue
deleted file mode 100644
index c394926..0000000
--- a/debian/mono.snk.uue
+++ /dev/null
@@ -1,17 +0,0 @@
-begin 644 mono.snk
-M!P(````D``!24T$R``0```$``0!Y%9EWTM`ZCFOJ>BYTZ-&OS)/HA1ETE2NT
-M@*$LD31'300&)$?#?@YHP(!3;\\\/[XO^<EYSIF$=>4&Z,Z"W5L/-0W!#I._
-M+N[/ATLD=PQ0@=OJ=$?]VOHG>R+>1];_ZD26=*3Y_,^$T5!I").`*$V]TU]&
-MS?\2H;UXY.\`9=`6WTW&V[S-/V")DAN)G[17F at RI:B)C5#D%RJ56:#^3AH,C
-M]@&$<!=,R%8*<F"H`S/!I(,;/V3OE6!0!Z`&H,SN[/;=^?:,:CB8!<'N2$.%
-M7H%/2X3=?@$W-)2"1)`'WV\2 at 53=A6JBUHW;N?U!-S]<EJ/Y6HW9F4=Z::0K
-MC=$/H4GG7;O3OP\,QS/*+(.1##JVL!^\0:S9KUORVJ*OY?23U1C</20JL+MN
-MY*-:I&QG!TAKRN5Z7%,_D!Y@^\S6+41[9`GU8FWBY at M+$ZS&#K(\<<GX`1GJ
-MQT-7=!]>W>!$Z8GJN;LFRG+&@,&'^&J!2YL4]D*X*;XW'`$9-D,ZEH"`T-L\
-MPU"47K=X!%N$=E*!_.5#/%'9DL*<%>?&(60?[(CZ_.8[1Y0B%U'\GL:UQF`P
-M\@6'"3BB at G]:IBH-9]TTGER_$0GG'@?>3)<Z'^>B^*J&Y5W-W,A=.\\4*>\+
-M*L(^3D9>^G_9U9<N]IZ?;39PJI<OLPD/L8E-C/%(BQS6L2^W1E])]Z#[M2YD
-MR\0O7F0E1BOXBHJE$K'XC#U1H="B6>7:7^IZ$+.NG,][`/4*::QS_SFM!W[`
-+"5R_0#E/%?%_J<\`
-`
-end
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 0398a35..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01_assembly-version.dpatch
diff --git a/debian/patches/01_assembly-version.dpatch b/debian/patches/01_assembly-version.dpatch
deleted file mode 100644
index e992995..0000000
--- a/debian/patches/01_assembly-version.dpatch
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## DP: Author: Sebastian Dröge <slomo at debian.org>
-## DP: Change assembly version back to 0.5.0.0 as it's ABI compatible.
-
- at DPATCH@
-
---- cecil/Mono.Cecil/Mono.Cecil/AssemblyInfo.cs.old	2008-03-20 18:20:55.000000000 +0100
-+++ cecil/Mono.Cecil/Mono.Cecil/AssemblyInfo.cs	2008-03-20 18:21:01.000000000 +0100
-@@ -43,7 +43,7 @@
- [assembly: CLSCompliant (false)]
- [assembly: ComVisible (false)]
- 
--[assembly: AssemblyVersion ("0.6.0.0")]
-+[assembly: AssemblyVersion ("0.5.0.0")]
- 
- #if KEYFILE
- [assembly: AssemblyKeyFile("../../mono.snk")]
diff --git a/debian/policy.0.5.Mono.Cecil.config b/debian/policy.0.5.Mono.Cecil.config
deleted file mode 100644
index 81a3c09..0000000
--- a/debian/policy.0.5.Mono.Cecil.config
+++ /dev/null
@@ -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>
-
diff --git a/debian/rules b/debian/rules
index 7d48943..d48a01f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,25 +6,17 @@
 
 include /usr/share/cli-common/cli.make
 
-# provide patch and unpatch targets
-include /usr/share/dpatch/dpatch.make
-
 UPVERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\  -f2 | sed 's,-.*,,')
-ABIVERSION = 0.5
-
-build: build-stamp
-build-stamp: $(DPATCH_STAMPFN)
-	uudecode -o debian/mono.snk debian/mono.snk.uue
-	dh build --before dh_auto_build
 
+override_dh_auto_build:
 	# build Mono.Cecil.dll
-	cd Mono.Cecil && mono-csc -keyfile:../debian/mono.snk \
+	cd Mono.Cecil && mono-csc \
 		@Mono.Cecil.dll.sources /target:library \
 		/out:Mono.Cecil.dll
-	sed -e 's;@prefix@;/usr;g' \
-		-e 's;^Version:.*;Version:\ $(UPVERSION);g' \
-		-e 's;^assemblies_dir=.*;assemblies_dir=$${prefix}/lib/cli/Mono.Cecil-$(ABIVERSION);g' \
-		Mono.Cecil/mono-cecil.pc.in > Mono.Cecil/mono-cecil.pc
+#	sed -e 's;@prefix@;/usr;g' \
+#		-e 's;^Version:.*;Version:\ $(UPVERSION);g' \
+#		-e 's;^assemblies_dir=.*;assemblies_dir=$${prefix}/lib/cli/Mono.Cecil-$(ABIVERSION);g' \
+#		Mono.Cecil/mono-cecil.pc.in > Mono.Cecil/mono-cecil.pc
 
 	# build Mono.Cecil.Mdb.dll, needs newer mono!
 	# cd Mono.Cecil.Mdb && mono-csc -keyfile:../debian/mono.snk \
@@ -38,29 +30,8 @@ build-stamp: $(DPATCH_STAMPFN)
                     -out:policy.0.5.Mono.Cecil.dll \
                     -keyfile:mono.snk
 
-	dh build --after dh_auto_build
-	touch $@
-
-clean: unpatch
-	dh $@ --before dh_clean
-	dh_clean debian/policy.0.5.Mono.Cecil.dll debian/mono.snk config.make \
-		Mono.Cecil/Mono.Cecil.dll Mono.Cecil/mono-cecil.pc Mono.Cecil.Mdb/Mono.Cecil.Mdb.dll
-
-install: install-stamp
-install-stamp: build
-	dh install --before dh_installchangelogs
-	dh_installchangelogs Mono.Cecil/ChangeLog
-	dh install --after dh_installchangelogs
-
-binary-indep: install
-	dh $@ --before dh_makeclilibs
-	dh_makeclilibs -m $(UPVERSION)
-	dh_clideps -d
-	dh $@ --remaining
-
-binary-arch:
-
-binary: binary-indep binary-arch
+%:
+	dh $@
 
 get-orig-source:
 	[ -d ../tarballs ] || mkdir ../tarballs
@@ -69,5 +40,3 @@ get-orig-source:
 		--download-version $(UPVERSION) \
 		--destdir ../tarballs \
 		--rename --verbose
-
-.PHONY: build clean binary-indep binary-arch binary install 

-- 
cecil

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