[Pkg-cli-libs-commits] r3754 - in /packages/cecil-flowanalysis/trunk/debian: changelog control patches/00list patches/01_fix_nunit_reference.dpatch rules

[ctrlsoft-guest at users.alioth.debian.org]

Author: ctrlsoft-guest
Date: Sat Jun 14 13:24:12 2008
New Revision: 3754

URL: http://svn.debian.org/wsvn/pkg-cli-libs/?sc=1&rev=3754
Log:
Fix dependency on nunit.

Added:
    packages/cecil-flowanalysis/trunk/debian/patches/00list
    packages/cecil-flowanalysis/trunk/debian/patches/01_fix_nunit_reference.dpatch
Modified:
    packages/cecil-flowanalysis/trunk/debian/changelog
    packages/cecil-flowanalysis/trunk/debian/control
    packages/cecil-flowanalysis/trunk/debian/rules

Modified: packages/cecil-flowanalysis/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/cecil-flowanalysis/trunk/debian/changelog?rev=3754&op=diff
==============================================================================
--- packages/cecil-flowanalysis/trunk/debian/changelog (original)
+++ packages/cecil-flowanalysis/trunk/debian/changelog Sat Jun 14 13:24:12 2008
@@ -1,3 +1,9 @@
+cecil-flowanalysis (0.1~svn.68457-5) unstable; urgency=low
+
+  * Fix build against nunit for testsuite. (Closes: #484202)
+
+ -- Jelmer Vernooij <jelmer at samba.org>  Sat, 14 Jun 2008 15:19:27 +0200
+
 cecil-flowanalysis (0.1~svn.68457-4) unstable; urgency=low
 
   * The "you shouldn't be allowed to do certain things at certain hours"

Modified: packages/cecil-flowanalysis/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/cecil-flowanalysis/trunk/debian/control?rev=3754&op=diff
==============================================================================
--- packages/cecil-flowanalysis/trunk/debian/control (original)
+++ packages/cecil-flowanalysis/trunk/debian/control Sat Jun 14 13:24:12 2008
@@ -2,9 +2,9 @@
 Section: libs
 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>
+Uploaders: Jose Carlos Garcia Sogo <jsogo at debian.org>, Jelmer Vernooij <jelmer at samba.org>
 Build-Depends: debhelper (>= 5), dpatch
-Build-Depends-Indep: cli-common-dev (>= 0.4.4), mono-mcs (>= 1.1.9) | c-sharp-compiler, sharutils, libmono-cecil0.5-cil, nant
+Build-Depends-Indep: cli-common-dev (>= 0.4.4), mono-mcs (>= 1.1.9) | c-sharp-compiler, sharutils, libmono-cecil0.5-cil, nant, libnunit2.4-cil
 Standards-Version: 3.7.2
 
 Package: libmono-cecil-flowanalysis0.1-cil

Added: packages/cecil-flowanalysis/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/cecil-flowanalysis/trunk/debian/patches/00list?rev=3754&op=file
==============================================================================
--- packages/cecil-flowanalysis/trunk/debian/patches/00list (added)
+++ packages/cecil-flowanalysis/trunk/debian/patches/00list Sat Jun 14 13:24:12 2008
@@ -1,0 +1,1 @@
+01_fix_nunit_reference.dpatch

Added: packages/cecil-flowanalysis/trunk/debian/patches/01_fix_nunit_reference.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/cecil-flowanalysis/trunk/debian/patches/01_fix_nunit_reference.dpatch?rev=3754&op=file
==============================================================================
--- packages/cecil-flowanalysis/trunk/debian/patches/01_fix_nunit_reference.dpatch (added)
+++ packages/cecil-flowanalysis/trunk/debian/patches/01_fix_nunit_reference.dpatch Sat Jun 14 13:24:12 2008
@@ -1,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_fix_nunit_reference.dpatch by Jelmer Vernooij <jelmer at samba.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix reference to nunit library.
+
+ at DPATCH@
+diff -u flowanalysis/default.build flowanalysis-fixed/default.build
+--- flowanalysis/default.build	2006-11-25 11:54:38.000000000 +0100
++++ flowanalysis-fixed/default.build	2008-06-14 15:10:36.000000000 +0200
+@@ -1,8 +1,6 @@
+ <?xml version="1.0"?>
+ <project name="Cecil.FlowAnalysis" default="test">
+ 
+-	<include buildfile="nunit.inc" />
+-
+ 	<!-- allow properties to be customized in external file" -->
+ 	<include buildfile="build.properties" if="${file::exists('build.properties')}" />
+ 
+@@ -58,8 +56,10 @@
+ 			<references basedir="${build.dir}">
+ 				<include name="Cecil.FlowAnalysis.dll" />
+ 				<include name="Mono.Cecil.dll" />
+-				<include name="${nunit.framework.dll}" />
+ 			</references>
++			<pkg-references>
++				<package name="nunit"/>
++			</pkg-references>
+ 		</csc>
+ 	</target>
+ 

Modified: packages/cecil-flowanalysis/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/cecil-flowanalysis/trunk/debian/rules?rev=3754&op=diff
==============================================================================
--- packages/cecil-flowanalysis/trunk/debian/rules (original)
+++ packages/cecil-flowanalysis/trunk/debian/rules Sat Jun 14 13:24:12 2008
@@ -38,7 +38,7 @@
 
 	touch $@
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp