[Pkg-cli-libs-commits] r3743 - in /packages/nunit/trunk/debian: control copyright libnunit2.4-cil.installcligac nunit-console.dirs policy.nunit.2.2.7.config rules

Tue May 27 00:15:51 UTC 2008

Author: ctrlsoft-guest
Date: Tue May 27 00:15:50 2008
New Revision: 3743

URL: http://svn.debian.org/wsvn/pkg-cli-libs/?sc=1&rev=3743
Log:
Use policy-recommended way of installing into gac, fix characters in copyright, update section for libndoc-doc.

Added:
    packages/nunit/trunk/debian/libnunit2.4-cil.installcligac
    packages/nunit/trunk/debian/nunit-console.dirs
Removed:
    packages/nunit/trunk/debian/policy.nunit.2.2.7.config
Modified:
    packages/nunit/trunk/debian/control
    packages/nunit/trunk/debian/copyright
    packages/nunit/trunk/debian/rules

Modified: packages/nunit/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/nunit/trunk/debian/control?rev=3743&op=diff
==============================================================================

--- packages/nunit/trunk/debian/control (original)
+++ packages/nunit/trunk/debian/control Tue May 27 00:15:50 2008
@@ -5,7 +5,7 @@
 Uploaders: Jelmer Vernooij <jelmer at samba.org>
 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, cli-common-dev (>= 0.4.0), libmono-dev (>= 1.0), nant (>= 0.84), mono-gac (>= 1.1.6), libmono-winforms1.0-cil, libmono-winforms2.0-cil
+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
@@ -46,6 +46,7 @@
  text or XML.
 
 Package: libnunit-doc
+Section: doc
 Architecture: all
 Depends: ${cli:Depends}
 Description: Unit test framework for .NET

Modified: packages/nunit/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/nunit/trunk/debian/copyright?rev=3743&op=diff
==============================================================================
--- packages/nunit/trunk/debian/copyright (original)
+++ packages/nunit/trunk/debian/copyright Tue May 27 00:15:50 2008
@@ -14,9 +14,9 @@
 
 Copyright:
 
-Copyright © 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov,
+Copyright (C) 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov,
 Charlie Poole
-Copyright © 2000-2004 Philip A. Craig
+Copyright (C) 2000-2004 Philip A. Craig
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages
@@ -31,9 +31,9 @@
 software in a product, an acknowledgment (see the following) in the
 product documentation is required.
 
-Portions Copyright © 2002 James W. Newkirk, Michael C. Two,
+Portions Copyright (C) 2002 James W. Newkirk, Michael C. Two,
 Alexei A. Vorontsov or 
-Copyright © 2000-2002 Philip A. Craig
+Copyright (C) 2000-2002 Philip A. Craig
 
 2. Altered source versions must be plainly marked as such, and must not be
 misrepresented as being the original software.

Added: packages/nunit/trunk/debian/libnunit2.4-cil.installcligac
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/nunit/trunk/debian/libnunit2.4-cil.installcligac?rev=3743&op=file
==============================================================================
--- packages/nunit/trunk/debian/libnunit2.4-cil.installcligac (added)
+++ packages/nunit/trunk/debian/libnunit2.4-cil.installcligac Tue May 27 00:15:50 2008
@@ -1,0 +1,5 @@
+/usr/lib/cli/nunit-2.4/nunit.core.dll
+/usr/lib/cli/nunit-2.4/nunit.core.extensions.dll
+/usr/lib/cli/nunit-2.4/nunit.framework.dll
+/usr/lib/cli/nunit-2.4/nunit.mocks.dll
+/usr/lib/cli/nunit-2.4/nunit.util.dll

Added: packages/nunit/trunk/debian/nunit-console.dirs
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/nunit/trunk/debian/nunit-console.dirs?rev=3743&op=file
==============================================================================
--- packages/nunit/trunk/debian/nunit-console.dirs (added)
+++ packages/nunit/trunk/debian/nunit-console.dirs Tue May 27 00:15:50 2008
@@ -1,0 +1,1 @@
+usr/bin

Modified: packages/nunit/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/nunit/trunk/debian/rules?rev=3743&op=diff
==============================================================================
--- packages/nunit/trunk/debian/rules (original)
+++ packages/nunit/trunk/debian/rules Tue May 27 00:15:50 2008
@@ -2,8 +2,8 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
-BUILDDIR1 = src/build/mono/1.0/release
-BUILDDIR2 = src/build/mono/2.0/release
+BUILDDIR1 = build/linux/mono/1.0/release
+BUILDDIR2 = build/linux/mono/2.0/release
 export MONO_SHARED_DIR=$(CURDIR)
 NANT = nant
 
@@ -43,10 +43,8 @@
 	dh_testroot
 	dh_clean -k 
 	dh_installdirs
+	rm -f doc/files/Thumbs.db
 	# mono-1.0
-	gacutil -root debian/libnunit2.4-cil/usr/lib -i $(BUILDDIR1)/nunit.framework.dll 
-	gacutil -root debian/libnunit2.4-cil/usr/lib -i $(BUILDDIR1)/nunit.core.dll
-	gacutil -root debian/libnunit2.4-cil/usr/lib -i $(BUILDDIR1)/nunit.util.dll
 	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 \
@@ -55,25 +53,19 @@
 		$(BUILDDIR1)/nunit.mocks.dll \
 		$(BUILDDIR1)/nunit.util.dll \
 		/usr/lib/cli/nunit-2.4
-	# mono-2.0
-	# FIXME
-	mkdir -p debian/nunit-console/usr/bin
+	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 {} \;
 
-	# Compatibility with 2.2.7
-	al -link:policy.nunit.2.2.7.config -out:policy.2.2.7.nunit.dll -keyfile:src/nunit.snk
-	gacutil /i policy.2.2.7.nunit.dll
-
 binary-indep: install
 	dh_testdir -i
 	dh_testroot -i
 	dh_link -i
 	dh_install -i
-	dh_installchangelogs -i doc/ChangeLog.txt
+	dh_installchangelogs -i 
 	dh_installdocs
 	dh_installexamples -i 
 	dh_installmenu -i


