[Pkg-cli-libs-commits] [cecil-flowanalysis] 09/24: Fix dependency on nunit.

[Jo Shields]

This is an automated email from the git hooks/post-receive script.

directhex pushed a commit to annotated tag debian/0.1%7Esvn.128879-1
in repository cecil-flowanalysis.

commit 3d6098063c3bb56a4e18d48cc1fbad7f4606fc93
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Jun 14 13:24:12 2008 +0000

    Fix dependency on nunit.
---
 debian/changelog                             |  6 ++++++
 debian/control                               |  4 ++--
 debian/patches/00list                        |  1 +
 debian/patches/01_fix_nunit_reference.dpatch | 31 ++++++++++++++++++++++++++++
 debian/rules                                 |  2 +-
 5 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 15d6ae2..082d88f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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"
diff --git a/debian/control b/debian/control
index ee652fd..5e6df9a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,9 @@ Source: cecil-flowanalysis
 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
diff --git a/debian/patches/00list b/debian/patches/00list
new file mode 100644
index 0000000..b2934e5
--- /dev/null
+++ b/debian/patches/00list
@@ -0,0 +1 @@
+01_fix_nunit_reference.dpatch
diff --git a/debian/patches/01_fix_nunit_reference.dpatch b/debian/patches/01_fix_nunit_reference.dpatch
new file mode 100644
index 0000000..ab9017e
--- /dev/null
+++ b/debian/patches/01_fix_nunit_reference.dpatch
@@ -0,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>
+ 
diff --git a/debian/rules b/debian/rules
index d728ebc..22d55ac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,7 +38,7 @@ build-stamp: configure-stamp
 
 	touch $@
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-libs/packages/cecil-flowanalysis.git