[Pkg-cli-apps-commits] r4402 - in /packages/nant/trunk/debian: control dirs patches/000-fix_build_system.dpatch rules
hanska-guest at users.alioth.debian.org
hanska-guest at users.alioth.debian.org
Mon Jan 5 15:11:33 UTC 2009
Author: hanska-guest
Date: Mon Jan 5 15:11:32 2009
New Revision: 4402
URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4402
Log:
Probably completed, should be checked though, since the packaging is "hacky"
Modified:
packages/nant/trunk/debian/control
packages/nant/trunk/debian/dirs
packages/nant/trunk/debian/patches/000-fix_build_system.dpatch
packages/nant/trunk/debian/rules
Modified: packages/nant/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/nant/trunk/debian/control?rev=4402&op=diff
==============================================================================
--- packages/nant/trunk/debian/control (original)
+++ packages/nant/trunk/debian/control Mon Jan 5 15:11:32 2009
@@ -6,9 +6,8 @@
David Paleino <d.paleino at gmail.com>
Build-Depends: debhelper (>= 7), dpatch
Build-Depends-Indep: mono-devel (>= 2.0.1),
- libmono-dev (>= 1.1.6),
pkg-config,
- cli-common-dev (>= 0.5.4),
+ cli-common-dev (>= 0.5.7),
libnunit2.4-cil,
libndoc1.3-cil,
libmono-winforms2.0-cil,
@@ -24,7 +23,6 @@
Architecture: all
Depends: ${cli:Depends}, ${misc:Depends},
pkg-config,
- libmono-dev (>= 1.1.6),
mono-devel (>= 2.0.1)
Description: build tool similar to Ant
NAnt is different than Make. Instead of a model where it is extended with
Modified: packages/nant/trunk/debian/dirs
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/nant/trunk/debian/dirs?rev=4402&op=diff
==============================================================================
--- packages/nant/trunk/debian/dirs (original)
+++ packages/nant/trunk/debian/dirs Mon Jan 5 15:11:32 2009
@@ -1,2 +1,3 @@
usr/bin
usr/lib/NAnt
+usr/share/doc/nant
Modified: packages/nant/trunk/debian/patches/000-fix_build_system.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/nant/trunk/debian/patches/000-fix_build_system.dpatch?rev=4402&op=diff
==============================================================================
--- packages/nant/trunk/debian/patches/000-fix_build_system.dpatch (original)
+++ packages/nant/trunk/debian/patches/000-fix_build_system.dpatch Mon Jan 5 15:11:32 2009
@@ -6,11 +6,14 @@
@DPATCH@
diff -urNad nant-0.85.dfsg1~/Makefile nant-0.85.dfsg1/Makefile
---- nant-0.85.dfsg1~/Makefile 2008-12-31 00:21:18.000000000 +0100
-+++ nant-0.85.dfsg1/Makefile 2008-12-31 00:21:19.000000000 +0100
-@@ -2,6 +2,7 @@
- MONO=mono
- MCS=mcs
+--- nant-0.85.dfsg1~/Makefile 2009-01-05 15:40:11.000000000 +0100
++++ nant-0.85.dfsg1/Makefile 2009-01-05 15:40:13.000000000 +0100
+@@ -1,7 +1,8 @@
+ #NAnt make file for *nix
+-MONO=mono
+-MCS=mcs
++MONO=cli
++MCS=csc
RESGEN=resgen
+DESTDIR=
@@ -45,41 +48,42 @@
run-test: bootstrap
$(NANT) -f:NAnt.build test
diff -urNad nant-0.85.dfsg1~/NAnt.build nant-0.85.dfsg1/NAnt.build
---- nant-0.85.dfsg1~/NAnt.build 2008-12-31 00:21:18.000000000 +0100
-+++ nant-0.85.dfsg1/NAnt.build 2008-12-31 00:21:51.000000000 +0100
-@@ -778,12 +778,27 @@
+--- nant-0.85.dfsg1~/NAnt.build 2009-01-05 15:40:11.000000000 +0100
++++ nant-0.85.dfsg1/NAnt.build 2009-01-05 15:41:00.000000000 +0100
+@@ -774,36 +774,38 @@
+ </target>
+
+ <target name="install-linux" depends="build" if="${platform::is-unix()}">
+- <property name="install.realprefix" value="/usr/local" />
++ <property name="install.realprefix" value="/usr" />
<if test="${property::exists('install.prefix') and string::get-length(install.prefix) != 0}">
<property name="install.realprefix" value="${install.prefix}" />
</if>
-+ <property name="install.destdir.isempty" value="true" />
-+ <if test="${property::exists('install.destdir') and string::get-length(install.destdir) != 0}">
-+ <property name="install.destdir.isempty" value="false" />
-+ </if>
<property name="install.bindir" value="${path::combine(install.realprefix, 'bin')}"/>
<property name="install.share" value="${path::combine(install.realprefix, 'share')}"/>
- <property name="install.copylocation" value="${path::combine (install.share, 'NAnt')}"/>
-+ <property name="install.libdir" value="${path::combine(install.prefix, 'lib')}"/>
++ <property name="install.libdir" value="${path::combine(install.realprefix, 'lib')}"/>
<property name="prefix" value="${pkg-config::get-variable('mono', 'prefix')}"/>
- <echo message="Installing NAnt to '${install.copylocation}' ..." />
-+ <if test="${not install.destdir.isempty}">
-+ <echo message="Using DESTDIR '${install.destdir}'..." />
-+ <!-- TODO FIXME BUG XXX: check why the variables aren't correctly set -- maybe the test? -->
-+ <property name="tmppath" value="${path::combine(install.libdir, 'NAnt')}" />
-+ <property name="install.copylocation" value="${path::combine(install.destdir, tmppath)}" />
-+ <property name="install.realbindir" value="${path::combine(install.destdir, install.bindir)}" />
-+ </if>
-+ <if test="${install.destdir.isempty}">
-+ <property name="install.copylocation" value="${path::combine(install.libdir, 'NAnt')}" />
-+ <property name="install.realbindir" value="${install.bindir}" />
-+ </if>
++ <echo message="Using DESTDIR '${install.destdir}'..." />
++ <property name="tmppath" value="${path::combine(install.libdir, 'NAnt')}" />
++ <property name="install.copylocation" value="${path::combine(install.destdir, path::combine('usr/', path::combine('lib', 'NAnt')))}" />
++ <property name="install.realbindir" value="${path::combine(install.destdir, path::combine('usr/', 'bin'))}" />
+ <echo message="Installing NAnt to '${install.copylocation}' ..." />
<copy todir="${install.copylocation}" overwrite="true">
- <fileset basedir="${build.dir}">
- <include name="bin/**/*" />
-@@ -793,17 +808,17 @@
- <exclude name="bin/*.Tests.*" />
- </fileset>
+- <fileset basedir="${build.dir}">
+- <include name="bin/**/*" />
+- <include name="doc/**/*" />
+-
+- <exclude name="bin/nant.tests.config" />
+- <exclude name="bin/*.Tests.*" />
+- </fileset>
++ <fileset basedir="${path::combine(build.dir, 'bin')}">
++ <include name="*" />
++ <exclude name="nant.tests.config" />
++ <exclude name="*.Tests.*" />
++ </fileset>
</copy>
- <echo message="Installing NAnt wrapper script to '${install.bindir}' ..." />
+ <echo message="Installing NAnt wrapper script to '${install.realbindir}' ..." />
@@ -94,7 +98,7 @@
<echo file="${wrapper}" append="false">#!/bin/sh</echo>
- <echo file="${wrapper}" append="true">exec ${path::combine(prefix, 'bin')}/mono ${path::combine(install.copylocation, 'bin')}/NAnt.exe "$@"</echo>
- <exec program="chmod" commandline="a+x ${path::combine(install.bindir, 'nant')}"/>
-+ <echo file="${wrapper}" append="true">exec ${path::combine(prefix, 'bin')}/cli ${install.libdir}/NAnt.exe "$@"</echo>
++ <echo file="${wrapper}" append="true">exec ${path::combine(prefix, 'bin')}/cli ${install.libdir}/NAnt/NAnt.exe "$@"</echo>
+ <exec program="chmod" commandline="a+x ${path::combine(install.realbindir, 'nant')}"/>
</target>
Modified: packages/nant/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/nant/trunk/debian/rules?rev=4402&op=diff
==============================================================================
--- packages/nant/trunk/debian/rules (original)
+++ packages/nant/trunk/debian/rules Mon Jan 5 15:11:32 2009
@@ -14,15 +14,13 @@
mkdir -p $(MONO_SHARED_DIR)/.wapi
dh build --before dh_auto_build
$(MAKE) MONO=cli MCS=csc prefix=/usr DESTDIR=$(CURDIR)/debian/tmp
- #$(MAKE) prefix=/usr
dh build --after dh_auto_build
touch $@
install: install-stamp
install-stamp: build
dh install --before dh_auto_install
- $(MAKE) MONO=cli MCS=csc DESTDIR=$(CURDIR)/debian/tmp prefix=/usr install
- #$(MAKE) DESTDIR=debian/tmp prefix=/usr install
+ $(MAKE) MONO=cli MCS=csc prefix=/usr DESTDIR=$(CURDIR)/debian/tmp install
dh install --after dh_auto_install
rmdir --ignore-fail-on-non-empty --parents debian/nant
touch $@
More information about the Pkg-cli-apps-commits
mailing list