[Pkg-cli-apps-commits] r4259 - in /packages/nant/trunk/debian: changelog compat control fix_patch.sh patches/000-fix_build_system.dpatch.in patches/00list rules
hanska-guest at users.alioth.debian.org
hanska-guest at users.alioth.debian.org
Wed Dec 3 16:47:07 UTC 2008
Author: hanska-guest
Date: Wed Dec 3 16:47:06 2008
New Revision: 4259
URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4259
Log:
WORK IN PROGRESS.
* debian/control:
+ debhelper dependency bumped to >= 7
* debian/patches/:
+ 000-fix_build_system.dpatch.in updated
* debian/fix_patch.sh added
+ patches debian/patches/000-fix_build_system.dpatch at build-time
* debian/rules updated
* debian/compat bumped to 7
Added:
packages/nant/trunk/debian/fix_patch.sh (with props)
packages/nant/trunk/debian/patches/000-fix_build_system.dpatch.in (with props)
Modified:
packages/nant/trunk/debian/changelog
packages/nant/trunk/debian/compat
packages/nant/trunk/debian/control
packages/nant/trunk/debian/patches/00list
packages/nant/trunk/debian/rules
Modified: packages/nant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/nant/trunk/debian/changelog?rev=4259&op=diff
==============================================================================
--- packages/nant/trunk/debian/changelog (original)
+++ packages/nant/trunk/debian/changelog Wed Dec 3 16:47:06 2008
@@ -1,10 +1,18 @@
nant (0.85.dfsg1-7) UNRELEASED; urgency=low
+ WORK IN PROGRESS.
* debian/control:
+ removed 1.0 Build-Dependencies
+ using mono-devel instead of mono-gmcs in runtime Depends
-
- -- David Paleino <d.paleino at gmail.com> Fri, 28 Nov 2008 11:56:48 +0100
+ + debhelper dependency bumped to >= 7
+ * debian/patches/:
+ + 000-fix_build_system.dpatch.in updated
+ * debian/fix_patch.sh added
+ + patches debian/patches/000-fix_build_system.dpatch at build-time
+ * debian/rules updated
+ * debian/compat bumped to 7
+
+ -- David Paleino <d.paleino at gmail.com> Wed, 03 Dec 2008 17:46:17 +0100
nant (0.85.dfsg1-5) unstable; urgency=low
Modified: packages/nant/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/nant/trunk/debian/compat?rev=4259&op=diff
==============================================================================
--- packages/nant/trunk/debian/compat (original)
+++ packages/nant/trunk/debian/compat Wed Dec 3 16:47:06 2008
@@ -1,1 +1,1 @@
-5
+7
Modified: packages/nant/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/nant/trunk/debian/control?rev=4259&op=diff
==============================================================================
--- packages/nant/trunk/debian/control (original)
+++ packages/nant/trunk/debian/control Wed Dec 3 16:47:06 2008
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
Uploaders: Jelmer Vernooij <jelmer at samba.org>
-Build-Depends: debhelper (>= 5), dpatch
+Build-Depends: debhelper (>= 7), dpatch
Build-Depends-Indep: mono-devel,
libmono-dev (>= 1.1.6),
pkg-config,
Added: packages/nant/trunk/debian/fix_patch.sh
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/nant/trunk/debian/fix_patch.sh?rev=4259&op=file
==============================================================================
--- packages/nant/trunk/debian/fix_patch.sh (added)
+++ packages/nant/trunk/debian/fix_patch.sh Wed Dec 3 16:47:06 2008
@@ -1,0 +1,19 @@
+#!/bin/sh
+CSC=$(grep exec /usr/bin/csc | \
+ tr " " "\n" | \
+ grep lib/mono | \
+ sed -e "s@/usr/lib/@@")
+
+PATCH=debian/patches/000-fix_build_system.dpatch
+
+case "$1" in
+ "patch")
+ if [ ! -f $PATCH.in ]; then
+ mv $PATCH $PATCH.in
+ fi
+ sed -e "s, at CSC@,$CSC," < $PATCH.in > $PATCH
+ ;;
+ "unpatch")
+ rm -rf $PATCH
+ ;;
+esac
Propchange: packages/nant/trunk/debian/fix_patch.sh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: packages/nant/trunk/debian/fix_patch.sh
------------------------------------------------------------------------------
svn:executable = *
Added: packages/nant/trunk/debian/patches/000-fix_build_system.dpatch.in
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/nant/trunk/debian/patches/000-fix_build_system.dpatch.in?rev=4259&op=file
==============================================================================
--- packages/nant/trunk/debian/patches/000-fix_build_system.dpatch.in (added)
+++ packages/nant/trunk/debian/patches/000-fix_build_system.dpatch.in Wed Dec 3 16:47:06 2008
@@ -1,0 +1,82 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 000-fix_build_system.dpatch by David Paleino <d.paleino at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Mono 2.0 transition.
+
+ at DPATCH@
+diff -urNad nant-0.85.dfsg1~/src/NAnt.Console/App.config nant-0.85.dfsg1/src/NAnt.Console/App.config
+--- nant-0.85.dfsg1~/src/NAnt.Console/App.config 2006-08-05 10:44:04.000000000 +0200
++++ nant-0.85.dfsg1/src/NAnt.Console/App.config 2008-11-30 09:57:10.000000000 +0100
+@@ -589,7 +589,7 @@
+ <property name="runtimeEngine" value="${path::combine(frameworkAssemblyDirectory, 'mono.exe')}" />
+ <property name="resgen.tool" value="monoresgen" />
+ <!-- in Mono 1.0.x, only mcs and mbas are located in <install root>\lib\mono\<profile> -->
+- <property name="csc.tool" value="${path::combine(frameworkAssemblyDirectory, 'mono/1.0/mcs.exe')}" />
++ <property name="csc.tool" value="${path::combine(frameworkAssemblyDirectory, '@CSC@')}" />
+ <property name="mbas.tool" value="${path::combine(frameworkAssemblyDirectory, 'mono/1.0/mbas.exe')}" />
+ <!-- /doc is not supported in Mono 1.0.x -->
+ <property name="csc.supportsdocgeneration" value="false" />
+@@ -864,7 +864,7 @@
+ <attribute name="useruntimeengine">true</attribute>
+ </task>
+ <task name="csc">
+- <attribute name="exename">${path::combine(frameworkAssemblyDirectory, 'mono/2.0/gmcs.exe')}</attribute>
++ <attribute name="exename">${path::combine(frameworkAssemblyDirectory, '@CSC@')}</attribute>
+ <attribute name="useruntimeengine">true</attribute>
+ <attribute name="supportspackagereferences">true</attribute>
+ <attribute name="supportsnowarnlist">true</attribute>
+@@ -1043,7 +1043,7 @@
+ <attribute name="useruntimeengine">true</attribute>
+ </task>
+ <task name="csc">
+- <attribute name="exename">${path::combine(frameworkAssemblyDirectory, 'mono/2.0/gmcs.exe')}</attribute>
++ <attribute name="exename">${path::combine(frameworkAssemblyDirectory, '@CSC@')}</attribute>
+ <attribute name="useruntimeengine">true</attribute>
+ <attribute name="supportspackagereferences">true</attribute>
+ <attribute name="supportsnowarnlist">true</attribute>
+@@ -1222,7 +1222,7 @@
+ <attribute name="useruntimeengine">true</attribute>
+ </task>
+ <task name="csc">
+- <attribute name="exename">${path::combine(frameworkAssemblyDirectory, 'mono/2.0/gmcs.exe')}</attribute>
++ <attribute name="exename">${path::combine(frameworkAssemblyDirectory, '@CSC@')}</attribute>
+ <attribute name="useruntimeengine">true</attribute>
+ <attribute name="supportspackagereferences">true</attribute>
+ <attribute name="supportsnowarnlist">true</attribute>
+@@ -1360,7 +1360,7 @@
+ <attribute name="useruntimeengine">true</attribute>
+ </task>
+ <task name="csc">
+- <attribute name="exename">${path::combine(prefix, 'lib/mono/1.0/mcs.exe')}</attribute>
++ <attribute name="exename">${path::combine(frameworkAssemblyDirectory, '@CSC@')}</attribute>
+ <attribute name="useruntimeengine">true</attribute>
+ <attribute name="supportspackagereferences">true</attribute>
+ <attribute name="supportsnowarnlist">true</attribute>
+@@ -1443,7 +1443,7 @@
+ <attribute name="useruntimeengine">true</attribute>
+ </task>
+ <task name="csc">
+- <attribute name="exename">${path::combine(prefix, 'lib/mono/2.0/gmcs.exe')}</attribute>
++ <attribute name="exename">${path::combine(frameworkAssemblyDirectory, '@CSC@')}</attribute>
+ <attribute name="useruntimeengine">true</attribute>
+ <attribute name="supportspackagereferences">true</attribute>
+ <attribute name="supportsnowarnlist">true</attribute>
+@@ -1527,7 +1527,7 @@
+ <attribute name="useruntimeengine">true</attribute>
+ </task>
+ <task name="csc">
+- <attribute name="exename">${path::combine(prefix, 'lib/mono/2.0/gmcs.exe')}</attribute>
++ <attribute name="exename">${path::combine(frameworkAssemblyDirectory, '@CSC@')}</attribute>
+ <attribute name="useruntimeengine">true</attribute>
+ <attribute name="supportspackagereferences">true</attribute>
+ <attribute name="supportsnowarnlist">true</attribute>
+@@ -1611,7 +1611,7 @@
+ <attribute name="useruntimeengine">true</attribute>
+ </task>
+ <task name="csc">
+- <attribute name="exename">${path::combine(prefix, 'lib/mono/2.0/gmcs.exe')}</attribute>
++ <attribute name="exename">${path::combine(frameworkAssemblyDirectory, '@CSC@')}</attribute>
+ <attribute name="useruntimeengine">true</attribute>
+ <attribute name="supportspackagereferences">true</attribute>
+ <attribute name="supportsnowarnlist">true</attribute>
Propchange: packages/nant/trunk/debian/patches/000-fix_build_system.dpatch.in
------------------------------------------------------------------------------
svn:executable = *
Modified: packages/nant/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/nant/trunk/debian/patches/00list?rev=4259&op=diff
==============================================================================
--- packages/nant/trunk/debian/patches/00list (original)
+++ packages/nant/trunk/debian/patches/00list Wed Dec 3 16:47:06 2008
@@ -1,3 +1,4 @@
+000-fix_build_system.dpatch
001-nant-task-cs-InitializeElement.dpatch
002-nant-load-partial-name.dpatch
003-nant-use-system-dlls.dpatch
Modified: packages/nant/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/nant/trunk/debian/rules?rev=4259&op=diff
==============================================================================
--- packages/nant/trunk/debian/rules (original)
+++ packages/nant/trunk/debian/rules Wed Dec 3 16:47:06 2008
@@ -11,8 +11,9 @@
## for 2.0 ICSharpCode.SharpZipLib.dll
#libmono-sharpzip2.84-cil
+export MONO_SHARED_DIR=$(CURDIR)
-export MONO_SHARED_DIR=$(CURDIR)
+include /usr/share/dpatch/dpatch.make
UPVERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\ -f2 | sed 's,-.*,,' | sed 's/.dfsg.*$$//')
@@ -27,28 +28,25 @@
INSTALL_PROGRAM += -s
endif
-patch: patch-stamp
-patch-stamp:
- dpatch apply-all && touch patch-stamp
+configure: configure-stamp patch-stamp
+configure-stamp:
+ dh_testdir
-unpatch:
- dpatch deapply-all
- rm -rf patch-stamp debian/patched
-
-configure: configure-stamp
-configure-stamp: patch-stamp
- dh_testdir
+ chmod a+x debian/fix_patch.sh
+ debian/fix_patch.sh patch
mkdir -p $(MONO_SHARED_DIR)/.wapi
- touch configure-stamp
+ touch $@
get-orig-source:
uscan --upstream-version $(UPVERSION) --rename --force-download --download-version $(UPVERSION) --destdir .
tar xfz nant_$(UPVERSION).orig.tar.gz
rm -f nant_$(UPVERSION).orig.tar.gz
rm -rf nant-$(UPVERSION)/lib
- tar cfz nant_$(UPVERSION).dfsg1.orig.tar.gz nant-$(UPVERSION)
+ tar cfz nant_$(UPVERSION).dfsg1.orig.tar.gz nant-$(UPVERSION)
+ [ -d ../tarballs ] || mkdir ../tarballs
+ mv nant_$(UPVERSION).dfsg1.orig.tar.gz ../tarballs/
build: build-stamp
@@ -59,19 +57,25 @@
rm -f examples/StyleTask/SimpleExtensionObject/SimpleExtension.dll
MONO_PATH=$(CURDIR)/build/mono-1.0.unix/nant-0.85-debug/bin $(MAKE)
- touch build-stamp
+ touch $@
-clean: clean1 unpatch
-clean1:
+clean: realclean unpatch fix-patch
+realclean: patch
dh_testdir
dh_testroot
- rm -f build-stamp configure-stamp
$(MAKE) clean
-rm -rf build installtmp
rm -rf $(MONO_SHARED_DIR)/.wapi
+
+ chmod a+x debian/fix_patch.sh
+ debian/fix_patch.sh patch
+
dh_clean
+fix-patch:
+ rm -rf debian/patches/000-fix_build_system.dpatch
+
install: build
dh_testdir
dh_testroot
@@ -110,4 +114,4 @@
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install configure \
- patch unpatch clean1
+ patch unpatch realclean
More information about the Pkg-cli-apps-commits
mailing list