[Pkg-cli-libs-commits] r4450 - in /packages/cecil-flowanalysis/trunk/debian: ./ patches/ source/

laney at users.alioth.debian.org laney at users.alioth.debian.org
Tue Aug 9 23:52:28 UTC 2011 

Author: laney
Date: Tue Aug  9 23:52:26 2011
New Revision: 4450

URL: http://svn.debian.org/wsvn/pkg-cli-libs/?sc=1&rev=4450
Log:
* New upstream snapshot
* Depend on CLR 4.0 version of nant and new cli-common-dev
* Make library unstable; should not be in the GAC. Consumers must now copy
  the library to make use of it
* Switch to 3.0 (quilt) to include mono.snk directly
* Standards-Version → 3.9.2, no changes required
* Provide build-arch and build-indep targets, as recommended

Added:
    packages/cecil-flowanalysis/trunk/debian/libmono-cecil-flowanalysis-cil.install
      - copied, changed from r4449, packages/cecil-flowanalysis/trunk/debian/libmono-cecil-flowanalysis0.1a-cil.install
    packages/cecil-flowanalysis/trunk/debian/mono.snk   (with props)
    packages/cecil-flowanalysis/trunk/debian/patches/00_use_csc
      - copied unchanged from r4449, packages/cecil-flowanalysis/trunk/debian/patches/00_use_csc.dpatch
    packages/cecil-flowanalysis/trunk/debian/patches/01_fix_nunit_reference
      - copied unchanged from r4449, packages/cecil-flowanalysis/trunk/debian/patches/01_fix_nunit_reference.dpatch
    packages/cecil-flowanalysis/trunk/debian/patches/02_cecil_location
      - copied unchanged from r4449, packages/cecil-flowanalysis/trunk/debian/patches/02_cecil_location.dpatch
    packages/cecil-flowanalysis/trunk/debian/patches/series
      - copied, changed from r4449, packages/cecil-flowanalysis/trunk/debian/patches/00list
    packages/cecil-flowanalysis/trunk/debian/source/
    packages/cecil-flowanalysis/trunk/debian/source/format
    packages/cecil-flowanalysis/trunk/debian/source/include-binaries
Removed:
    packages/cecil-flowanalysis/trunk/debian/README.source
    packages/cecil-flowanalysis/trunk/debian/libmono-cecil-flowanalysis0.1a-cil.install
    packages/cecil-flowanalysis/trunk/debian/libmono-cecil-flowanalysis0.1a-cil.installcligac
    packages/cecil-flowanalysis/trunk/debian/mono.snk.uue
    packages/cecil-flowanalysis/trunk/debian/patches/00_use_csc.dpatch
    packages/cecil-flowanalysis/trunk/debian/patches/00list
    packages/cecil-flowanalysis/trunk/debian/patches/01_fix_nunit_reference.dpatch
    packages/cecil-flowanalysis/trunk/debian/patches/02_cecil_location.dpatch
Modified:
    packages/cecil-flowanalysis/trunk/debian/cecil-flowanalysis.pc
    packages/cecil-flowanalysis/trunk/debian/changelog
    packages/cecil-flowanalysis/trunk/debian/compat
    packages/cecil-flowanalysis/trunk/debian/control
    packages/cecil-flowanalysis/trunk/debian/copyright
    packages/cecil-flowanalysis/trunk/debian/rules

Modified: packages/cecil-flowanalysis/trunk/debian/cecil-flowanalysis.pc
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/cecil-flowanalysis/trunk/debian/cecil-flowanalysis.pc?rev=4450&op=diff
==============================================================================
--- packages/cecil-flowanalysis/trunk/debian/cecil-flowanalysis.pc (original)
+++ packages/cecil-flowanalysis/trunk/debian/cecil-flowanalysis.pc Tue Aug  9 23:52:26 2011
@@ -1,5 +1,5 @@
 prefix=/usr
-assemblies_dir=${prefix}/lib/cli/Cecil.FlowAnalysis-0.1
+assemblies_dir=${prefix}/lib/cecil-flowanalysis/
 Libraries=${assemblies_dir}/Cecil.FlowAnalysis.dll
 
 Name: Cecil.Flowanalysis

Modified: packages/cecil-flowanalysis/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/cecil-flowanalysis/trunk/debian/changelog?rev=4450&op=diff
==============================================================================
--- packages/cecil-flowanalysis/trunk/debian/changelog (original)
+++ packages/cecil-flowanalysis/trunk/debian/changelog Tue Aug  9 23:52:26 2011
@@ -1,3 +1,15 @@
+cecil-flowanalysis (0.1~vcs20110809.r1.b34edf6-1) experimental; urgency=low
+
+  * New upstream snapshot
+  * Depend on CLR 4.0 version of nant and new cli-common-dev
+  * Make library unstable; should not be in the GAC. Consumers must now copy
+    the library to make use of it
+  * Switch to 3.0 (quilt) to include mono.snk directly
+  * Standards-Version → 3.9.2, no changes required
+  * Provide build-arch and build-indep targets, as recommended
+
+ -- Iain Lane <laney at debian.org>  Tue, 09 Aug 2011 23:12:56 +0100
+
 cecil-flowanalysis (0.1~svn.128879-3) unstable; urgency=low
 
   * debian/control:

Modified: packages/cecil-flowanalysis/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/cecil-flowanalysis/trunk/debian/compat?rev=4450&op=diff
==============================================================================
--- packages/cecil-flowanalysis/trunk/debian/compat (original)
+++ packages/cecil-flowanalysis/trunk/debian/compat Tue Aug  9 23:52:26 2011
@@ -1,1 +1,1 @@
-5
+7

Modified: packages/cecil-flowanalysis/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/cecil-flowanalysis/trunk/debian/control?rev=4450&op=diff
==============================================================================
--- packages/cecil-flowanalysis/trunk/debian/control (original)
+++ packages/cecil-flowanalysis/trunk/debian/control Tue Aug  9 23:52:26 2011
@@ -3,36 +3,35 @@
 Priority: optional
 Maintainer: Debian CLI Libraries Team <pkg-cli-libs-team at lists.alioth.debian.org>
 Uploaders: Jose Carlos Garcia Sogo <jsogo at debian.org>
-Build-Depends: debhelper (>= 5), dpatch
-Build-Depends-Indep: cli-common-dev (>= 0.4.4),
- sharutils,
- libmono-cecil-cil-dev (>= 0.6+svn148654),
- nant (>= 0.85.dfsg1-6~),
- libnunit-cil-dev
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 7), nant (>= 0.91~alpha2+dfsg-3~)
+Build-Depends-Indep: cli-common-dev (>= 0.8~),
+                     libmono-cecil-cil-dev (>= 0.9.5),
+                     libnunit-cil-dev
+Standards-Version: 3.9.2
 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/
 
-Package: libmono-cecil-flowanalysis0.1a-cil
+Package: libmono-cecil-flowanalysis-cil
 Architecture: all
 Depends: ${cli:Depends}, ${misc:Depends}
-Conflicts: libmono-cecil-flowanalysis0.1-cil
+Conflicts: libmono-cecil-flowanalysis0.1-cil,
+           libmono-cecil-flowanalysis0.1a-cil (<= 0.1~svn.128879-3)
 Replaces: libmono-cecil-flowanalysis0.1-cil
 Description: FlowAnalysis extension for Mono.Cecil
- Cecil.FlowAnalysis is an extension for the Cecil CIL-mangling library 
- which enhances the ability to read back and analyse program execution 
+ Cecil.FlowAnalysis is an extension for the Cecil CIL-mangling library
+ which enhances the ability to read back and analyse program execution
  patterns and flow.
  .
  This package contains the Cecil.FlowAnalysis library itself
 
 Package: libmono-cecil-flowanalysis-cil-dev
 Architecture: all
-Depends: libmono-cecil-flowanalysis0.1a-cil (= ${binary:Version}), ${misc:Depends}
+Depends: libmono-cecil-flowanalysis-cil (= ${binary:Version}), ${misc:Depends}
 Replaces: libmono-cecil-flowanalysis0.1-cil
 Description: FlowAnalysis extension for Mono.Cecil
- Cecil.FlowAnalysis is an extension for the Cecil CIL-mangling library 
- which enhances the ability to read back and analyse program execution 
+ Cecil.FlowAnalysis is an extension for the Cecil CIL-mangling library
+ which enhances the ability to read back and analyse program execution
  patterns and flow.
  .
- This package contains development files for the Cecil.FlowAnalysis 
+ This package contains development files for the Cecil.FlowAnalysis
  library, and should be used for compilation

Modified: packages/cecil-flowanalysis/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/cecil-flowanalysis/trunk/debian/copyright?rev=4450&op=diff
==============================================================================
--- packages/cecil-flowanalysis/trunk/debian/copyright (original)
+++ packages/cecil-flowanalysis/trunk/debian/copyright Tue Aug  9 23:52:26 2011
@@ -29,6 +29,5 @@
  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-
 The Debian packaging is (C) 2007, Jose Carlos Garcia Sogo <jsogo at debian.org> and
 is licensed under the GPL, see `/usr/share/common-licenses/GPL'.

Copied: packages/cecil-flowanalysis/trunk/debian/libmono-cecil-flowanalysis-cil.install (from r4449, packages/cecil-flowanalysis/trunk/debian/libmono-cecil-flowanalysis0.1a-cil.install)
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/cecil-flowanalysis/trunk/debian/libmono-cecil-flowanalysis-cil.install?rev=4450&op=diff
==============================================================================
--- packages/cecil-flowanalysis/trunk/debian/libmono-cecil-flowanalysis0.1a-cil.install (original)
+++ packages/cecil-flowanalysis/trunk/debian/libmono-cecil-flowanalysis-cil.install Tue Aug  9 23:52:26 2011
@@ -1,1 +1,1 @@
-bin/* /usr/lib/cli/Cecil.FlowAnalysis-0.1/
+bin/* /usr/lib/cecil-flowanalysis/

Added: packages/cecil-flowanalysis/trunk/debian/mono.snk
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/cecil-flowanalysis/trunk/debian/mono.snk?rev=4450&op=file
==============================================================================
Binary file - no diff available.

Propchange: packages/cecil-flowanalysis/trunk/debian/mono.snk
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Copied: packages/cecil-flowanalysis/trunk/debian/patches/series (from r4449, packages/cecil-flowanalysis/trunk/debian/patches/00list)
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/cecil-flowanalysis/trunk/debian/patches/series?rev=4450&op=diff
==============================================================================
--- packages/cecil-flowanalysis/trunk/debian/patches/00list (original)
+++ packages/cecil-flowanalysis/trunk/debian/patches/series Tue Aug  9 23:52:26 2011
@@ -1,3 +1,3 @@
-00_use_csc.dpatch
-01_fix_nunit_reference.dpatch
-02_cecil_location.dpatch
+00_use_csc
+01_fix_nunit_reference
+02_cecil_location

Modified: packages/cecil-flowanalysis/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/cecil-flowanalysis/trunk/debian/rules?rev=4450&op=diff
==============================================================================
--- packages/cecil-flowanalysis/trunk/debian/rules (original)
+++ packages/cecil-flowanalysis/trunk/debian/rules Tue Aug  9 23:52:26 2011
@@ -6,9 +6,6 @@
 
 # This is for the .wapi directory for Mono.
 export MONO_SHARED_DIR=$(CURDIR)
-
-# provide patch and unpatch targets
-include /usr/share/dpatch/dpatch.make
 
 DEB_VERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\  -f2)
 VERSION = $(shell echo $(DEB_VERSION) | sed 's,-.*,,' | sed 's,+dfsg.*,,')
@@ -23,36 +20,42 @@
 endif
 
 configure: configure-stamp
-configure-stamp: patch-stamp
+configure-stamp: 
 	dh_testdir
 
 	touch configure-stamp
 
-build: build-stamp
+build: build-arch build-indep
 
-build-stamp: configure-stamp 
+build-arch:
+
+build-indep: build-indep-stamp
+
+build-indep-stamp: configure-stamp 
 	dh_testdir
 	
-	uudecode -o debian/mono.snk debian/mono.snk.uue
-	nant -v -buildfile:default.build -D:"Mono.Cecil.dll"="$(shell pkg-config --variable=Libraries mono-cecil)" \
+	nant -v -buildfile:default.build -D:"Mono.Cecil.dll"="$(shell pkg-config --variable=Libraries mono-cecil | cut -d' ' -f1)" \
 		-D:"keyfile"="debian/mono.snk"
 
 	touch $@
 
-clean: unpatch
+clean: 
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
 
 	nant -v clean
-	rm -f debian/mono.snk
 
 	dh_clean 
 
-install: build
+install: install-arch install-indep
+
+install-arch: build-arch
+
+install-indep: build-indep
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
+	dh_prep
 
 	dh_installdirs
 	
@@ -64,16 +67,15 @@
 	# Files are yet installed. We only need to deleted unwanted ones.
 	rm -f $(CURDIR)/debian/tmp/bin/*Test*
 
-	# 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/tmp -type f -name "*.mdb" -delete
 endif
 
-binary-arch: build install
+binary: binary-indep binary-arch
 
-binary-indep: build install
+binary-arch: build-arch install-arch
+
+binary-indep: build-indep install-indep
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs ChangeLog
@@ -82,7 +84,7 @@
 	dh_installcligac
 	dh_compress
 	dh_fixperms
-	dh_makeclilibs -m $(VERSION)
+	dh_clifixperms
 	dh_clideps -d
 	dh_installdeb
 	dh_shlibdeps
@@ -102,6 +104,4 @@
 	mv $(TARBALL_NAME) $(BASE_NAME)_$(TARBALL_VERSION).orig.tar.gz
 	rm -rf $(BASE_NAME)-$(TARBALL_VERSION)
 
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install install-arch install-indep

Added: packages/cecil-flowanalysis/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/cecil-flowanalysis/trunk/debian/source/format?rev=4450&op=file
==============================================================================
--- packages/cecil-flowanalysis/trunk/debian/source/format (added)
+++ packages/cecil-flowanalysis/trunk/debian/source/format Tue Aug  9 23:52:26 2011
@@ -1,0 +1,1 @@
+3.0 (quilt)

Added: packages/cecil-flowanalysis/trunk/debian/source/include-binaries
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/cecil-flowanalysis/trunk/debian/source/include-binaries?rev=4450&op=file
==============================================================================
--- packages/cecil-flowanalysis/trunk/debian/source/include-binaries (added)
+++ packages/cecil-flowanalysis/trunk/debian/source/include-binaries Tue Aug  9 23:52:26 2011
@@ -1,0 +1,1 @@
+debian/mono.snk

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