[Pkg-cli-libs-commits] r4376 - in /packages/cecil-flowanalysis/trunk/debian: README.source changelog control patches/00list patches/02_cecil_location.dpatch rules

laney-guest at users.alioth.debian.org laney-guest at users.alioth.debian.org
Tue Jan 19 20:11:14 UTC 2010 

Author: laney-guest
Date: Tue Jan 19 20:11:07 2010
New Revision: 4376

URL: http://svn.debian.org/wsvn/pkg-cli-libs/?sc=1&rev=4376
Log:
* debian/control:
   + Update nunit build-dep to use -cil-dev package (Closes: #564380)
   + Update nant build-dep to be bpo friendly.
* debian/rules: Make get-orig-source policy conformant.
* debian/patches/02_cecil_location.dpatch, debian/rules: Add new patch to
  copy cecil using pkg-config to discover location of the dll. Also tell
  nant about the new location in rules.
* debian/README.source: Add, taken from dpatch package. 
* debian/libmono-cecil-flowanalysis0.1a-cil.installcligac

Added:
    packages/cecil-flowanalysis/trunk/debian/README.source
    packages/cecil-flowanalysis/trunk/debian/patches/02_cecil_location.dpatch   (with props)
Modified:
    packages/cecil-flowanalysis/trunk/debian/changelog
    packages/cecil-flowanalysis/trunk/debian/control
    packages/cecil-flowanalysis/trunk/debian/patches/00list
    packages/cecil-flowanalysis/trunk/debian/rules

Added: packages/cecil-flowanalysis/trunk/debian/README.source
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/cecil-flowanalysis/trunk/debian/README.source?rev=4376&op=file
==============================================================================
--- packages/cecil-flowanalysis/trunk/debian/README.source (added)
+++ packages/cecil-flowanalysis/trunk/debian/README.source Tue Jan 19 20:11:07 2010
@@ -1,0 +1,38 @@
+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.
+
+
+--- 
+
+this documentation is part of dpatch package, and may be used by
+packages using dpatch to comply with policy on README.source. This
+documentation is meant to be useful to users who are not proficient in
+dpatch in doing work with dpatch-based packages. Please send any
+improvements to the BTS of dpatch package.
+
+original text by Gerfried Fuchs, edited by Junichi Uekawa <dancer at debian.org>
+10 Aug 2008.

Modified: packages/cecil-flowanalysis/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/cecil-flowanalysis/trunk/debian/changelog?rev=4376&op=diff
==============================================================================
--- packages/cecil-flowanalysis/trunk/debian/changelog (original)
+++ packages/cecil-flowanalysis/trunk/debian/changelog Tue Jan 19 20:11:07 2010
@@ -1,3 +1,16 @@
+cecil-flowanalysis (0.1~svn.128879-2) UNRELEASED; urgency=low
+
+  * debian/control:
+     + Update nunit build-dep to use -cil-dev package (Closes: #564380)
+     + Update nant build-dep to be bpo friendly.
+  * debian/rules: Make get-orig-source policy conformant.
+  * debian/patches/02_cecil_location.dpatch, debian/rules: Add new patch to
+    copy cecil using pkg-config to discover location of the dll. Also tell
+    nant about the new location in rules.
+  * debian/README.source: Add, taken from dpatch package. 
+
+ -- Iain Lane <laney at ubuntu.com>  Tue, 19 Jan 2010 20:06:24 +0000
+
 cecil-flowanalysis (0.1~svn.128879-1) unstable; urgency=low
 
   * Updated SVN snapshot release
@@ -11,7 +24,7 @@
     + Remove Jelmer from Uploaders
   * debian/rules:
     + Write a get-orig-source rule
-  * debian/libmono-cecil-flowanalysis0.1a-cil.installcligac,
+  * debian/libmono-cecil-flowanalysis0.1a-cil.installcligac
     debian/libmono-cecil-flowanalysis0.1a-cil.install,
     debian/cecil-flowanalysis.pc:
     + CLI Policy 0.7 install location

Modified: packages/cecil-flowanalysis/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/cecil-flowanalysis/trunk/debian/control?rev=4376&op=diff
==============================================================================
--- packages/cecil-flowanalysis/trunk/debian/control (original)
+++ packages/cecil-flowanalysis/trunk/debian/control Tue Jan 19 20:11:07 2010
@@ -7,8 +7,8 @@
 Build-Depends-Indep: cli-common-dev (>= 0.4.4),
  sharutils,
  libmono-cecil-cil-dev,
- nant (>= 0.85.dfsg1-6),
- libnunit2.4-cil
+ nant (>= 0.85.dfsg1-6~),
+ libnunit-cil-dev
 Standards-Version: 3.8.3
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-cli-libs/packages/cecil-flowanalysis/trunk/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-cli-libs/packages/cecil-flowanalysis/trunk/

Modified: packages/cecil-flowanalysis/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/cecil-flowanalysis/trunk/debian/patches/00list?rev=4376&op=diff
==============================================================================
--- packages/cecil-flowanalysis/trunk/debian/patches/00list (original)
+++ packages/cecil-flowanalysis/trunk/debian/patches/00list Tue Jan 19 20:11:07 2010
@@ -1,2 +1,3 @@
 00_use_csc.dpatch
 01_fix_nunit_reference.dpatch
+02_cecil_location.dpatch

Added: packages/cecil-flowanalysis/trunk/debian/patches/02_cecil_location.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/cecil-flowanalysis/trunk/debian/patches/02_cecil_location.dpatch?rev=4376&op=file
==============================================================================
--- packages/cecil-flowanalysis/trunk/debian/patches/02_cecil_location.dpatch (added)
+++ packages/cecil-flowanalysis/trunk/debian/patches/02_cecil_location.dpatch Tue Jan 19 20:11:07 2010
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_cecil_flowanalysis_location.dpatch by Iain Lane <laney at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Copy mono-cecil, using pcfile to discover where the dll is located.
+
+ at DPATCH@
+diff -urNad cecil-flowanalysis-0.1~svn.128879~/Makefile cecil-flowanalysis-0.1~svn.128879/Makefile
+--- cecil-flowanalysis-0.1~svn.128879~/Makefile	2010-01-19 19:04:21.504734613 +0000
++++ cecil-flowanalysis-0.1~svn.128879/Makefile	2010-01-19 19:05:13.053476182 +0000
+@@ -2,7 +2,7 @@
+ KEY_FILE = ../../mcs/class/mono.snk
+ MCS_FLAGS = -keyfile:$(KEY_FILE)
+ BUILD.DIR = bin
+-MONO.CECIL.DLL = ../../mcs/class/Mono.Cecil/Mono.Cecil.dll
++MONO.CECIL.DLL = $(shell pkg-config --variable=Libraries mono-cecil)
+ 
+ all: init
+ 	$(MCS) $(MCS_FLAGS) @Cecil.FlowAnalysis.sources /target:library /out:$(BUILD.DIR)/Cecil.FlowAnalysis.dll /r:$(BUILD.DIR)/Mono.Cecil.dll

Propchange: packages/cecil-flowanalysis/trunk/debian/patches/02_cecil_location.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: packages/cecil-flowanalysis/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/cecil-flowanalysis/trunk/debian/rules?rev=4376&op=diff
==============================================================================
--- packages/cecil-flowanalysis/trunk/debian/rules (original)
+++ packages/cecil-flowanalysis/trunk/debian/rules Tue Jan 19 20:11:07 2010
@@ -34,7 +34,7 @@
 	dh_testdir
 	
 	uudecode -o debian/mono.snk debian/mono.snk.uue
-	nant -v -buildfile:default.build -D:"Mono.Cecil.dll"="/usr/lib/cli/Mono.Cecil-0.5/Mono.Cecil.dll" \
+	nant -v -buildfile:default.build -D:"Mono.Cecil.dll"="$(shell pkg-config --variable=Libraries mono-cecil)" \
 		-D:"keyfile"="debian/mono.snk"
 
 	touch $@
@@ -63,7 +63,6 @@
 
 	# Files are yet installed. We only need to deleted unwanted ones.
 	rm -f $(CURDIR)/debian/tmp/bin/*Test*
-	rm -f $(CURDIR)/debian/tmp/bin/Mono.Cecil*
 
 	# fix permissions
 	find debian/tmp -type f -name "*.dll" -or -name "*.mdb" -or -name "*.cs" -or -name "*.config" | xargs chmod -x
@@ -100,8 +99,7 @@
 	tar -czf $(TARBALL_NAME) $(BASE_NAME)-$(TARBALL_VERSION)
 
 get-orig-source: $(TARBALL_NAME)
-	mkdir -p ../tarballs
-	mv $(TARBALL_NAME) ../tarballs/$(BASE_NAME)_$(TARBALL_VERSION).orig.tar.gz
+	mv $(TARBALL_NAME) $(BASE_NAME)_$(TARBALL_VERSION).orig.tar.gz
 	rm -rf $(BASE_NAME)-$(TARBALL_VERSION)

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