[Pkg-cli-libs-commits] r3746 - in /packages/nunit/trunk/debian: ./ patches/

meebey at users.alioth.debian.org meebey at users.alioth.debian.org
Sat May 31 23:59:08 UTC 2008


Author: meebey
Date: Sat May 31 23:59:07 2008
New Revision: 3746

URL: http://svn.debian.org/wsvn/pkg-cli-libs/?sc=1&rev=3746
Log:
lots of nunit love (not completly tested yet)


Added:
    packages/nunit/trunk/debian/monodoc-nunit-manual.install
    packages/nunit/trunk/debian/monodoc-nunit-manual.postinst
    packages/nunit/trunk/debian/monodoc-nunit-manual.prerm
    packages/nunit/trunk/debian/nunit-console.install
    packages/nunit/trunk/debian/nunit-console.manpages
    packages/nunit/trunk/debian/nunit-gui.install
    packages/nunit/trunk/debian/nunit.core.source
    packages/nunit/trunk/debian/nunit.framework.source
    packages/nunit/trunk/debian/patches/03_disable_building_fit_fixtures.dpatch   (with props)
    packages/nunit/trunk/debian/patches/04_enable_building_gui_runner.dpatch   (with props)
    packages/nunit/trunk/debian/patches/05_build_xml_doc_for_nunit.core.dpatch   (with props)
Modified:
    packages/nunit/trunk/debian/changelog
    packages/nunit/trunk/debian/control
    packages/nunit/trunk/debian/libnunit2.4-cil.install
    packages/nunit/trunk/debian/nunit-2.4.pc
    packages/nunit/trunk/debian/patches/00list
    packages/nunit/trunk/debian/rules

Modified: packages/nunit/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/nunit/trunk/debian/changelog?rev=3746&op=diff
==============================================================================
--- packages/nunit/trunk/debian/changelog (original)
+++ packages/nunit/trunk/debian/changelog Sat May 31 23:59:07 2008
@@ -1,11 +1,49 @@
-nunit (2.4.7-1) unstable; urgency=low
+nunit (2.4.7+dfsg-1) unstable; urgency=low
 
+  [ Jelmer Vernooij ]
   * New upstream release.
   * Set homepage and Vcs-Svn fields.
   * Change maintainer to Debian CLI Libraries Team. (Closes: #458551)
   * Allow Debian Maintainer uploads.
 
- -- Jelmer Vernooij <jelmer at samba.org>  Sat, 12 Jan 2008 00:00:21 +0100
+  [ Mirco Bauer ]
+  * The "get sexy and ready for lenny" release
+  * DFSG version of nunit 2.4.7
+    (deleted all pre-compiled binaries from the tarball)
+    + For the record here a list of the deleted files:
+      tools/fit/fit.dll
+      tools/fit/runFile.exe
+  * debian/control:
+    + Updated cli-common-dev build-dependency to >= 0.5.7
+      (needed for cli.make)
+    + Added new package monodoc-nunit-manual.
+    + Added dpatch to build-dependencies.
+    + Fixed usage of the ".NET" term in package descriptions.
+  * debian/rules:
+    + Include /usr/share/cli-common/cli.make
+    + Migrated to debhelper v7 minimalistic style.
+    + Bumped clilibs to 2.4.7
+  * debian/nunit-console.install
+    debian/nunit-console.manpages
+    debian/nunit-gui.install:
+    + Converted some debian/rules calls to debhelper files.
+  * debian/monodoc-nunit-manual.install
+    debian/monodoc-nunit-manual.postinst
+    debian/monodoc-nunit-manual.prerm:
+    + New package.
+  *  debian/nunit.core.source
+     debian/nunit.framework.source:
+     + Files needed by monodoc.
+  * debian/patches/03_disable_building_fit_fixtures.dpatch:
+    + DFSG version of nunit doesn't contain the FIT library, thus we have to
+      disable the fit test-fixtures.
+  * debian/patches/05_build_xml_doc_for_nunit.core.dpatch:
+    + Enable creating XML documentation for the nunit.core library
+      (needed for monodoc API docs).
+  * debian/patches/04_enable_building_gui_runner.dpatch:
+    + Build nunit GUI runner for Mono.
+
+ -- Mirco Bauer <meebey at debian.org>  Fri, 30 May 2008 21:55:27 +0200
 
 nunit (2.2.9-1) unstable; urgency=low
 

Modified: packages/nunit/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/nunit/trunk/debian/control?rev=3746&op=diff
==============================================================================
--- packages/nunit/trunk/debian/control (original)
+++ packages/nunit/trunk/debian/control Sat May 31 23:59:07 2008
@@ -2,35 +2,43 @@
 Section: devel
 Priority: optional
 Maintainer: Debian CLI Libraries Team <pkg-cli-libs-team at lists.alioth.debian.org>
-Uploaders: Jelmer Vernooij <jelmer at samba.org>
+Uploaders: Jelmer Vernooij <jelmer at samba.org>, Mirco Bauer <meebey at debian.org>
+DM-Upload-Allowed: yes
+Build-Depends: debhelper (>= 7), dpatch, cli-common-dev (>= 0.5.7)
+Build-Depends-Indep: mono-gmcs (>= 1.1.8) | c-sharp-2.0-compiler,
+ nant (>= 0.84),
+ mono-gac (>= 1.1.6),
+ libmono-winforms2.0-cil
+Standards-Version: 3.7.3
 Homepage: http://www.nunit.org/
-Build-Depends: debhelper (>= 4.0.0), dpatch, cli-common-dev (>= 0.4.4)
-Build-Depends-Indep: mono-mcs (>= 1.0) | c-sharp-compiler, c-sharp-2.0-compiler, nant (>= 0.84), mono-gac (>= 1.1.6), libmono-winforms1.0-cil, libmono-winforms2.0-cil
 Vcs-Svn: svn://svn.debian.org/svn/pkg-cli-libs/packages/nunit/trunk
-Standards-Version: 3.7.3
-DM-Upload-Allowed: yes
+Vcs-Browser: svn://svn.debian.org/wsvn/pkg-cli-libs/packages/nunit/trunk/
 
 Package: nunit-console
 Architecture: all
 Depends: ${cli:Depends}
-Conflicts: libnunit-cil
-Description: Unit test framework for .NET
+Description: Unit test framework for CLI
  NUnit is a unit testing framework for all .NET languages. It serves the
  same purpose as JUnit does in the Java world. It supports test
  categories, testing for exceptions and writing test results in plain
  text or XML.
+ .
+ NUnit targets the CLI (Common Language Infrastructure) and supports Mono and
+ the Microsoft .NET Framework.
  .
  This package contains the console front-end.
 
 Package: nunit-gui
 Architecture: all
 Depends: ${cli:Depends}
-Conflicts: libnunit-cil
-Description: Unit test framework for .NET
+Description: Unit test framework for CLI
  NUnit is a unit testing framework for all .NET languages. It serves the
  same purpose as JUnit does in the Java world. It supports test
  categories, testing for exceptions and writing test results in plain
  text or XML.
+ .
+ NUnit targets the CLI (Common Language Infrastructure) and supports Mono and
+ the Microsoft .NET Framework.
  .
  This package contains the graphical front-end.
 
@@ -38,8 +46,8 @@
 Architecture: all
 Depends: ${cli:Depends}
 Conflicts: libnunit-cil
-Suggests: libnunit-doc
-Description: Unit test framework for .NET
+Suggests: libnunit-doc, monodoc-nunit-manual
+Description: Unit test framework for CLI
  NUnit is a unit testing framework for all .NET languages. It serves the
  same purpose as JUnit does in the Java world. It supports test
  categories, testing for exceptions and writing test results in plain
@@ -49,21 +57,38 @@
 Section: doc
 Architecture: all
 Depends: ${cli:Depends}
-Description: Unit test framework for .NET
+Description: Unit test framework for CLI
  NUnit is a unit testing framework for all .NET languages. It serves the
  same purpose as JUnit does in the Java world. It supports test
  categories, testing for exceptions and writing test results in plain
  text or XML.
  .
+ NUnit targets the CLI (Common Language Infrastructure) and supports Mono and
+ the Microsoft .NET Framework.
+ .
  This package contains the API documentation and examples.
+
+Package: monodoc-nunit-manual
+Architecture: all
+Section: doc
+Depends: monodoc-manual
+Description: compiled XML documentation for NUnit
+ The MonoDoc Project is the documentation framework of the Mono project which
+ provides detailed API documentation for all Mono components and the Mono CLI
+ implementation.
+ .
+ This packages contains the compiled XML documentation for NUnit.
 
 Package: nunit
 Architecture: all
 Depends: libnunit-doc, nunit-console, nunit-gui, libnunit2.4-cil
-Description: Unit test framework for .NET
+Description: Unit test framework for CLI
  NUnit is a unit testing framework for all .NET languages. It serves the
  same purpose as JUnit does in the Java world. It supports test
  categories, testing for exceptions and writing test results in plain
  text or XML.
  .
- This is a dummy package that depends on the other nunit packages.
+ NUnit targets the CLI (Common Language Infrastructure) and supports Mono and
+ the Microsoft .NET Framework.
+ .
+ This is a dummy package that depends on all nunit packages.

Modified: packages/nunit/trunk/debian/libnunit2.4-cil.install
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/nunit/trunk/debian/libnunit2.4-cil.install?rev=3746&op=diff
==============================================================================
--- packages/nunit/trunk/debian/libnunit2.4-cil.install (original)
+++ packages/nunit/trunk/debian/libnunit2.4-cil.install Sat May 31 23:59:07 2008
@@ -1,1 +1,7 @@
-debian/nunit-2.4.pc /usr/lib/pkgconfig
+build/linux/mono/2.0/release/nunit.core.dll		/usr/lib/cli/nunit-2.4/
+build/linux/mono/2.0/release/nunit.core.interfaces.dll	/usr/lib/cli/nunit-2.4/
+build/linux/mono/2.0/release/nunit.core.extensions.dll	/usr/lib/cli/nunit-2.4/
+build/linux/mono/2.0/release/nunit.framework.dll	/usr/lib/cli/nunit-2.4/
+build/linux/mono/2.0/release/nunit.mocks.dll		/usr/lib/cli/nunit-2.4/
+build/linux/mono/2.0/release/nunit.util.dll		/usr/lib/cli/nunit-2.4/
+debian/nunit-2.4.pc					/usr/lib/pkgconfig/

Added: packages/nunit/trunk/debian/monodoc-nunit-manual.install
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/nunit/trunk/debian/monodoc-nunit-manual.install?rev=3746&op=file
==============================================================================
--- packages/nunit/trunk/debian/monodoc-nunit-manual.install (added)
+++ packages/nunit/trunk/debian/monodoc-nunit-manual.install Sat May 31 23:59:07 2008
@@ -1,0 +1,6 @@
+build/linux/mono/2.0/release/nunit.core.tree		/usr/lib/monodoc/sources/
+build/linux/mono/2.0/release/nunit.core.zip		/usr/lib/monodoc/sources/
+build/linux/mono/2.0/release/nunit.framework.tree	/usr/lib/monodoc/sources/
+build/linux/mono/2.0/release/nunit.framework.zip	/usr/lib/monodoc/sources/
+debian/nunit.core.source				/usr/lib/monodoc/sources/
+debian/nunit.framework.source				/usr/lib/monodoc/sources/

Added: packages/nunit/trunk/debian/monodoc-nunit-manual.postinst
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/nunit/trunk/debian/monodoc-nunit-manual.postinst?rev=3746&op=file
==============================================================================
--- packages/nunit/trunk/debian/monodoc-nunit-manual.postinst (added)
+++ packages/nunit/trunk/debian/monodoc-nunit-manual.postinst Sat May 31 23:59:07 2008
@@ -1,0 +1,19 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = "configure" ]; then
+	# Add the nunit node entry
+	grep -v nunit /usr/lib/monodoc/monodoc.xml \
+	    | sed 's@  <node label="Various" name="various">@  <node label="Various" name="various">\n    <node label="NUnit" name="nunit"/>@' \
+	    > /usr/lib/monodoc/monodoc.xml.new
+	mv -f /usr/lib/monodoc/monodoc.xml.new \
+	      /usr/lib/monodoc/monodoc.xml
+	
+	# Rebuild the index
+	if [ -x /usr/bin/monodoc ]; then
+		echo "generating monodoc search index..."
+		/usr/bin/monodoc --make-index > /dev/null
+	fi
+fi
+
+#DEBHELPER#

Added: packages/nunit/trunk/debian/monodoc-nunit-manual.prerm
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/nunit/trunk/debian/monodoc-nunit-manual.prerm?rev=3746&op=file
==============================================================================
--- packages/nunit/trunk/debian/monodoc-nunit-manual.prerm (added)
+++ packages/nunit/trunk/debian/monodoc-nunit-manual.prerm Sat May 31 23:59:07 2008
@@ -1,0 +1,10 @@
+#!/bin/sh
+set -e
+
+# Remove the node entry
+grep -v nunit /usr/lib/monodoc/monodoc.xml \
+            > /usr/lib/monodoc/monodoc.xml.new
+mv /usr/lib/monodoc/monodoc.xml.new \
+   /usr/lib/monodoc/monodoc.xml
+
+#DEBHELPER#

Modified: packages/nunit/trunk/debian/nunit-2.4.pc
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/nunit/trunk/debian/nunit-2.4.pc?rev=3746&op=diff
==============================================================================
--- packages/nunit/trunk/debian/nunit-2.4.pc (original)
+++ packages/nunit/trunk/debian/nunit-2.4.pc Sat May 31 23:59:07 2008
@@ -1,9 +1,9 @@
 prefix=/usr
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
-
+pkglibdir=${libdir}/
 
 Name: NUnit
-Description: Testing framework for .NET
+Description: Testing framework for CLI
 Version: 2.4.7
-Libs: -r:${libdir}/cli/nunit-2.4/nunit.core.dll -r:${libdir}/cli/nunit-2.4/nunit.util.dll -r:${libdir}/cli/nunit-2.4/nunit.framework.dll
+Libs: -r:${pkglibdir}/nunit.core.dll -r:${pkglibdir}/nunit.util.dll -r:$${pkglibdir}/nunit.framework.dll

Added: packages/nunit/trunk/debian/nunit-console.install
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/nunit/trunk/debian/nunit-console.install?rev=3746&op=file
==============================================================================
--- packages/nunit/trunk/debian/nunit-console.install (added)
+++ packages/nunit/trunk/debian/nunit-console.install Sat May 31 23:59:07 2008
@@ -1,0 +1,2 @@
+build/linux/mono/2.0/release/nunit-console.exe*		/usr/lib/nunit/
+build/linux/mono/2.0/release/nunit-console-runner.dll*	/usr/lib/nunit/

Added: packages/nunit/trunk/debian/nunit-console.manpages
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/nunit/trunk/debian/nunit-console.manpages?rev=3746&op=file
==============================================================================
--- packages/nunit/trunk/debian/nunit-console.manpages (added)
+++ packages/nunit/trunk/debian/nunit-console.manpages Sat May 31 23:59:07 2008
@@ -1,0 +1,1 @@
+debian/nunit-console.1

Added: packages/nunit/trunk/debian/nunit-gui.install
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/nunit/trunk/debian/nunit-gui.install?rev=3746&op=file
==============================================================================
--- packages/nunit/trunk/debian/nunit-gui.install (added)
+++ packages/nunit/trunk/debian/nunit-gui.install Sat May 31 23:59:07 2008
@@ -1,0 +1,2 @@
+build/linux/mono/2.0/release/nunit.exe*			/usr/lib/nunit/
+build/linux/mono/2.0/release/nunit-gui-runner.dll*	/usr/lib/nunit/

Added: packages/nunit/trunk/debian/nunit.core.source
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/nunit/trunk/debian/nunit.core.source?rev=3746&op=file
==============================================================================
--- packages/nunit/trunk/debian/nunit.core.source (added)
+++ packages/nunit/trunk/debian/nunit.core.source Sat May 31 23:59:07 2008
@@ -1,0 +1,4 @@
+<?xml version="1.0"?>
+<monodoc>
+  <source provider="ecma" basefile="nunit.core" path="nunit"/>
+</monodoc>

Added: packages/nunit/trunk/debian/nunit.framework.source
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/nunit/trunk/debian/nunit.framework.source?rev=3746&op=file
==============================================================================
--- packages/nunit/trunk/debian/nunit.framework.source (added)
+++ packages/nunit/trunk/debian/nunit.framework.source Sat May 31 23:59:07 2008
@@ -1,0 +1,4 @@
+<?xml version="1.0"?>
+<monodoc>
+  <source provider="ecma" basefile="nunit.framework" path="nunit"/>
+</monodoc>

Modified: packages/nunit/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/nunit/trunk/debian/patches/00list?rev=3746&op=diff
==============================================================================
--- packages/nunit/trunk/debian/patches/00list (original)
+++ packages/nunit/trunk/debian/patches/00list Sat May 31 23:59:07 2008
@@ -1,1 +1,4 @@
-02_gui.dpatch
+02_gui
+03_disable_building_fit_fixtures
+04_enable_building_gui_runner
+05_build_xml_doc_for_nunit.core

Added: packages/nunit/trunk/debian/patches/03_disable_building_fit_fixtures.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/nunit/trunk/debian/patches/03_disable_building_fit_fixtures.dpatch?rev=3746&op=file
==============================================================================
--- packages/nunit/trunk/debian/patches/03_disable_building_fit_fixtures.dpatch (added)
+++ packages/nunit/trunk/debian/patches/03_disable_building_fit_fixtures.dpatch Sat May 31 23:59:07 2008
@@ -1,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## disable_building_fit_fixtures.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad nunit-2.4.7~/src/nunit.build.include nunit-2.4.7/src/nunit.build.include
+--- nunit-2.4.7~/src/nunit.build.include	2008-05-31 21:33:28.000000000 +0200
++++ nunit-2.4.7/src/nunit.build.include	2008-05-31 21:33:46.000000000 +0200
+@@ -180,10 +180,6 @@
+     <!-- GUI Tests -->
+     <include name="GuiComponents/tests/nunit.uikit.tests.build" if="${build.gui}" />
+     <include name="GuiRunner/tests/nunit-gui.tests.build" if="${build.gui}" />
+-
+-    <!-- FIT Tests -->
+-    <include name="NUnitFixtures/fixtures/nunit.fixtures.build" />
+-    <include name="NUnitFixtures/tests/nunit.fixtures.tests.build" />
+   </fileset>
+ 
+   <!-- BuildFiles for Samples -->

Propchange: packages/nunit/trunk/debian/patches/03_disable_building_fit_fixtures.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: packages/nunit/trunk/debian/patches/04_enable_building_gui_runner.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/nunit/trunk/debian/patches/04_enable_building_gui_runner.dpatch?rev=3746&op=file
==============================================================================
--- packages/nunit/trunk/debian/patches/04_enable_building_gui_runner.dpatch (added)
+++ packages/nunit/trunk/debian/patches/04_enable_building_gui_runner.dpatch Sat May 31 23:59:07 2008
@@ -1,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## enable_building_gui_runner.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad nunit-2.4.7~/src/nunit.build.include nunit-2.4.7/src/nunit.build.include
+--- nunit-2.4.7~/src/nunit.build.include	2008-05-31 23:56:41.000000000 +0200
++++ nunit-2.4.7/src/nunit.build.include	2008-05-31 23:57:49.000000000 +0200
+@@ -364,7 +364,7 @@
+     <property name="runtime.defines" value="MONO,MONO_1_0"/>
+     <property name="build.mono" value="true"/>
+     <property name="build.win32" value="false"/>
+-    <property name="build.gui" value="false"/>
++    <property name="build.gui" value="true"/>
+     <property name="build.x86" value="false"/>
+     <property name="nant.settings.currentframework" 
+       value="mono-1.0"/>
+@@ -385,7 +385,7 @@
+     <property name="runtime.defines" value="MONO,MONO_2_0"/>
+     <property name="build.mono" value="true"/>
+     <property name="build.win32" value="false"/>
+-    <property name="build.gui" value="false"/>
++    <property name="build.gui" value="true"/>
+     <property name="build.x86" value="true"/>
+     <property name="nant.settings.currentframework" 
+       value="mono-2.0"/>

Propchange: packages/nunit/trunk/debian/patches/04_enable_building_gui_runner.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: packages/nunit/trunk/debian/patches/05_build_xml_doc_for_nunit.core.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/nunit/trunk/debian/patches/05_build_xml_doc_for_nunit.core.dpatch?rev=3746&op=file
==============================================================================
--- packages/nunit/trunk/debian/patches/05_build_xml_doc_for_nunit.core.dpatch (added)
+++ packages/nunit/trunk/debian/patches/05_build_xml_doc_for_nunit.core.dpatch Sat May 31 23:59:07 2008
@@ -1,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05_build_xml_doc_for_nunit.core.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad nunit-2.4.7~/src/NUnitCore/core/nunit.core.build nunit-2.4.7/src/NUnitCore/core/nunit.core.build
+--- nunit-2.4.7~/src/NUnitCore/core/nunit.core.build	2008-03-12 21:55:50.000000000 +0100
++++ nunit-2.4.7/src/NUnitCore/core/nunit.core.build	2008-06-01 00:49:29.000000000 +0200
+@@ -4,6 +4,7 @@
+   <target name="build">
+     <csc target="library" 
+         output="${current.build.dir}/nunit.core.dll"
++        doc="${current.build.dir}/nunit.core.xml"
+         debug="${build.debug}" 
+         define="${build.defines}">
+       <sources>

Propchange: packages/nunit/trunk/debian/patches/05_build_xml_doc_for_nunit.core.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: packages/nunit/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/nunit/trunk/debian/rules?rev=3746&op=diff
==============================================================================
--- packages/nunit/trunk/debian/rules (original)
+++ packages/nunit/trunk/debian/rules Sat May 31 23:59:07 2008
@@ -1,34 +1,54 @@
 #!/usr/bin/make -f
+export DH_VERBOSE=1
+# nant has race conditions on SMP systems and causes hangs or failures
+export MONO_NO_SMP=1
+BUILD_DIR = build/linux/mono/2.0/release
+NANT = nant
+DEB_CLI_ABI_VERSION = 2.4
+DEB_CLI_API_VERSION = 2.4.7
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-BUILDDIR1 = build/linux/mono/1.0/release
-BUILDDIR2 = build/linux/mono/2.0/release
-export MONO_SHARED_DIR=$(CURDIR)
-NANT = nant
-
-# Include dpatch stuff.
+include /usr/share/cli-common/cli.make
 include /usr/share/dpatch/dpatch.make
 
-build: patch build-stamp
+build: patch-stamp build-stamp
 build-stamp:
-	dh_testdir
-	$(NANT) /f:src/nunit.build mono-1.0 release build
-	$(NANT) /f:src/nunit.build mono-2.0 release build
+	dh build --before build
+	$(NANT) -f:src/nunit.build mono-2.0 release build
+	for lib in nunit.core nunit.framework; do \
+	  rm -rf $(BUILD_DIR)/monodocer; \
+	  monodocer \
+	    -importslashdoc:$(BUILD_DIR)/$$lib.xml \
+	    --assembly:$(BUILD_DIR)/$$lib.dll \
+	    --path:$(BUILD_DIR)/monodocer; \
+	  mdassembler \
+	    --out $(BUILD_DIR)/$$lib \
+	    --ecma $(BUILD_DIR)/monodocer; \
+	done
 	touch build-stamp
 
+install: build
+	dh $@ --before dh_install
+	rm -f doc/files/Thumbs.db
+	cp debian/nunit-console.sh debian/nunit-console/usr/bin/nunit-console
+	chmod 755 debian/nunit-console/usr/bin/nunit-console
+	dh $@ --remaining
+
+binary: binary-indep
+binary-indep: install
+	dh $@ --before dh_makeclilibs
+	dh_makeclilibs -i -m $(DEB_CLI_API_VERSION)
+	dh $@ --after dh_makeclilibs
+
 clean: unpatch
-	dh_testdir
-	dh_testroot
 	rm -rf build
-	$(NANT) /f:src/nunit.build mono-1.0 clean-all
+	rm -f build-stamp
 	$(NANT) /f:src/nunit.build mono-2.0 clean-all
-	rm -f build-stamp
-	rm -rf .wapi
-	dh_clean
+	dh $@
+
+%:
+	dh $@
 
 upstream_version=$(shell uscan --dehs | sed -n 's/.*<upstream-version>\(.*\)<\/upstream-version>.*/\1/p')
-
 get-orig-source::
 	mkdir nunit-$(upstream_version)
 	cd nunit-$(upstream_version) && unzip ../../NUnit-$(upstream_version)-src.zip
@@ -37,49 +57,3 @@
 	cd nunit-$(upstream_version) && $(NANT) /f:src/nunit.build mono-2.0 clean-all
 	tar cfz ../nunit_$(upstream_version).orig.tar.gz nunit-$(upstream_version)
 	rm -rf nunit-$(upstream_version)
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-	rm -f doc/files/Thumbs.db
-	# mono-1.0
-	dh_install -p nunit-console $(BUILDDIR1)/nunit-console*.dll $(BUILDDIR1)/nunit-console.exe* /usr/lib/nunit/
-	dh_install -p nunit-gui $(BUILDDIR1)/nunit-gui*.dll $(BUILDDIR1)/nunit-gui.exe* /usr/lib/nunit/
-	dh_install -p libnunit2.4-cil $(BUILDDIR1)/nunit.core.dll \
-		$(BUILDDIR1)/nunit.core.interfaces.dll \
-		$(BUILDDIR1)/nunit.core.extensions.dll \
-		$(BUILDDIR1)/nunit.framework.dll \
-		$(BUILDDIR1)/nunit.mocks.dll \
-		$(BUILDDIR1)/nunit.util.dll \
-		/usr/lib/cli/nunit-2.4
-	dh_installcligac
-	cp debian/nunit-console.sh debian/nunit-console/usr/bin/nunit-console
-	chmod 755 debian/nunit-console/usr/bin/nunit-console
-
-	-cd $(CURDIR)/debian && find -type f -name "*.exe" -exec chmod +x {} \;
-	-cd $(CURDIR)/debian && find -type f -name "*.dll" -exec chmod -x {} \;
-
-binary-indep: install
-	dh_testdir -i
-	dh_testroot -i
-	dh_link -i
-	dh_install -i
-	dh_installchangelogs -i 
-	dh_installdocs
-	dh_installexamples -i 
-	dh_installmenu -i
-	dh_installman -i debian/nunit-console.1
-	dh_strip -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_makeclilibs -i
-	dh_clideps -i -d
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-binary: binary-indep
-.PHONY: clean build binary-indep binary install




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