[Pkg-cli-apps-commits] r4366 - in /packages/nant/trunk/debian: changelog control fix_patch.sh manpages nant.manpages nant.sh patches/000-fix_build_system.dpatch patches/000-fix_build_system.dpatch.in rules watch
hanska-guest at users.alioth.debian.org
hanska-guest at users.alioth.debian.org
Tue Dec 30 22:02:02 UTC 2008
Author: hanska-guest
Date: Tue Dec 30 22:02:02 2008
New Revision: 4366
URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4366
Log:
* Packaged from scratch
Added:
packages/nant/trunk/debian/manpages (props changed)
- copied unchanged from r4365, packages/nant/trunk/debian/nant.manpages
packages/nant/trunk/debian/patches/000-fix_build_system.dpatch (with props)
Removed:
packages/nant/trunk/debian/fix_patch.sh
packages/nant/trunk/debian/nant.manpages
packages/nant/trunk/debian/nant.sh
packages/nant/trunk/debian/patches/000-fix_build_system.dpatch.in
Modified:
packages/nant/trunk/debian/changelog
packages/nant/trunk/debian/control
packages/nant/trunk/debian/rules
packages/nant/trunk/debian/watch
Modified: packages/nant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/nant/trunk/debian/changelog?rev=4366&op=diff
==============================================================================
--- packages/nant/trunk/debian/changelog (original)
+++ packages/nant/trunk/debian/changelog Tue Dec 30 22:02:02 2008
@@ -1,16 +1,16 @@
-nant (0.85.dfsg1-7) UNRELEASED; urgency=low
-
- WORK IN PROGRESS.
+nant (0.85.dfsg1-6) UNRELEASED; urgency=low
+
+ * Packaged from scratch
* debian/control:
+ removed 1.0 Build-Dependencies
+ using mono-devel instead of mono-gmcs in runtime Depends
+ debhelper dependency bumped to >= 7
+ + added ${misc:Depends} to nant
* 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
+ + 000-fix_build_system.dpatch added
+ * debian/rules switched to dh7-style
* debian/compat bumped to 7
+ * debian/watch updated to version 3
-- David Paleino <d.paleino at gmail.com> Wed, 03 Dec 2008 17:46:17 +0100
Modified: packages/nant/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/nant/trunk/debian/control?rev=4366&op=diff
==============================================================================
--- packages/nant/trunk/debian/control (original)
+++ packages/nant/trunk/debian/control Tue Dec 30 22:02:02 2008
@@ -2,9 +2,10 @@
Section: devel
Priority: optional
Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
-Uploaders: Jelmer Vernooij <jelmer at samba.org>
+Uploaders: Jelmer Vernooij <jelmer at samba.org>,
+ David Paleino <d.paleino at gmail.com>
Build-Depends: debhelper (>= 7), dpatch
-Build-Depends-Indep: mono-devel,
+Build-Depends-Indep: mono-devel (>= 2.0.1),
libmono-dev (>= 1.1.6),
pkg-config,
cli-common-dev (>= 0.5.4),
@@ -21,7 +22,10 @@
Package: nant
Architecture: all
-Depends: ${cli:Depends}, pkg-config, libmono-dev (>= 1.1.6), mono-devel
+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
shell-based commands, NAnt is extended using task classes. Instead of
Propchange: packages/nant/trunk/debian/manpages
------------------------------------------------------------------------------
svn:mergeinfo =
Added: 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=4366&op=file
==============================================================================
--- packages/nant/trunk/debian/patches/000-fix_build_system.dpatch (added)
+++ packages/nant/trunk/debian/patches/000-fix_build_system.dpatch Tue Dec 30 22:02:02 2008
@@ -1,0 +1,90 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 000-add_DESTDIR_support.dpatch by David Paleino <d.paleino at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: add support for DESTDIR makefile variable.
+
+ at DPATCH@
+diff -urNad nant-0.85~/Makefile nant-0.85/Makefile
+--- nant-0.85~/Makefile 2008-12-30 22:40:45.000000000 +0100
++++ nant-0.85/Makefile 2008-12-30 22:42:26.000000000 +0100
+@@ -1,7 +1,8 @@
+ #NAnt make file for *nix
+-MONO=mono
+-MCS=mcs
++MONO=cli
++MCS=csc
+ RESGEN=resgen
++DESTDIR=
+
+ ifndef DIRSEP
+ ifeq ($(OS),Windows_NT)
+@@ -18,13 +19,8 @@
+ endif
+ endif
+
+-ifeq ($(MONO),mono)
+ FRAMEWORK_DIR = mono
+ DEFINE = MONO
+-else
+-FRAMEWORK_DIR = net
+-DEFINE= NET
+-endif
+
+
+
+@@ -40,7 +36,7 @@
+ rm -fR build bootstrap
+
+ install: bootstrap
+- $(NANT) -f:NAnt.build install -D:install.prefix="$(prefix)"
++ $(NANT) -f:NAnt.build install -D:install.prefix="$(prefix)" -D:install.destdir="$(DESTDIR)"
+
+ run-test: bootstrap
+ $(NANT) -f:NAnt.build test
+diff -urNad nant-0.85~/NAnt.build nant-0.85/NAnt.build
+--- nant-0.85~/NAnt.build 2008-12-30 22:40:45.000000000 +0100
++++ nant-0.85/NAnt.build 2008-12-30 22:40:55.000000000 +0100
+@@ -778,13 +778,14 @@
+ <if test="${property::exists('install.prefix') and string::get-length(install.prefix) != 0}">
+ <property name="install.realprefix" value="${install.prefix}" />
+ </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.bindir" value="${path::combine(install.prefix, 'bin')}"/>
++ <property name="install.share" value="${path::combine(install.prefix, 'share')}"/>
++ <property name="install.libdir" value="${path::combine(install.prefix, 'lib')}"/>
++ <property name="install.copylocation" value="${path::combine(install.libdir, 'NAnt')}"/>
+ <property name="prefix" value="${pkg-config::get-variable('mono', 'prefix')}"/>
+- <echo message="Installing NAnt to '${install.copylocation}' ..." />
++ <echo message="Installing NAnt to '${path::combine(install.destdir, install.copylocation)}' ..." />
+
+- <copy todir="${install.copylocation}" overwrite="true">
++ <copy todir="${path::combine(install.destdir, install.copylocation)}" overwrite="true">
+ <fileset basedir="${build.dir}">
+ <include name="bin/**/*" />
+ <include name="doc/**/*" />
+@@ -793,17 +794,18 @@
+ <exclude name="bin/*.Tests.*" />
+ </fileset>
+ </copy>
+- <echo message="Installing NAnt wrapper script to '${install.bindir}' ..." />
++ <property name="install.destbindir" value="${path::combine(install.destdir, install.bindir)}" />
++ <echo message="Installing NAnt wrapper script to '${path::combine(install.destdir, install.bindir)}' ..." />
+ <!-- store filename of wrapper script in property -->
+- <property name="wrapper" value="${path::combine(install.bindir, 'nant')}" />
++ <property name="wrapper" value="${path::combine(install.destbindir, 'nant')}" />
+ <!--
+ create wrapper file using separate echo tasks for each line to ensure
+ the line endings of the generated file match the platform on which
+ the wrapper is created
+ -->
+ <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>
++ <exec program="chmod" commandline="a+x ${path::combine(install.destbindir, 'nant')}"/>
+ </target>
+
+ <target name="rpm" depends="init, build">
Propchange: packages/nant/trunk/debian/patches/000-fix_build_system.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: packages/nant/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/nant/trunk/debian/rules?rev=4366&op=diff
==============================================================================
--- packages/nant/trunk/debian/rules (original)
+++ packages/nant/trunk/debian/rules Tue Dec 30 22:02:02 2008
@@ -1,117 +1,42 @@
#!/usr/bin/make -f
# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-## for 1.0 ICSharpCode.SharpZipLib.dll
-#libmono-sharpzip0.6-cil
-## for 2.0 ICSharpCode.SharpZipLib.dll
-#libmono-sharpzip2.84-cil
-
export MONO_SHARED_DIR=$(CURDIR)
include /usr/share/dpatch/dpatch.make
+include /usr/share/cli-common/cli.make
-UPVERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\ -f2 | sed 's,-.*,,' | sed 's/.dfsg.*$$//')
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
-
-configure: configure-stamp patch-stamp
-configure-stamp:
- dh_testdir
-
- chmod a+x debian/fix_patch.sh
- debian/fix_patch.sh patch
-
+build: build-stamp
+build-stamp: $(DPATCH_STAMPFN)
mkdir -p $(MONO_SHARED_DIR)/.wapi
-
+ dh build --before dh_auto_build
+ #$(MAKE) MONO=cli MCS=csc prefix=/usr
+ $(MAKE) prefix=/usr
+ dh build --after dh_auto_build
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)
- [ -d ../tarballs ] || mkdir ../tarballs
- mv nant_$(UPVERSION).dfsg1.orig.tar.gz ../tarballs/
-
-build: build-stamp
-
-build-stamp: configure-stamp
- dh_testdir
-
- # force nant to rebuild SimpleExtension.dll (as it's shipped in the tarball)
- rm -f examples/StyleTask/SimpleExtensionObject/SimpleExtension.dll
- MONO_PATH=$(CURDIR)/build/mono-1.0.unix/nant-0.85-debug/bin $(MAKE)
-
+install: install-stamp
+install-stamp: build
+ dh install --before dh_auto_install
+ #$(MAKE) MONO=cli MCS=csc DESTDIR=debian/tmp prefix=/usr install
+ $(MAKE) DESTDIR=debian/tmp prefix=/usr install
+ rmdir --ignore-fail-on-non-empty --parents debian/tmp
+ dh install --after dh_auto_install
touch $@
-clean: realclean unpatch fix-patch
-realclean: patch
- dh_testdir
- dh_testroot
+clean: realclean unpatch
+realclean: $(DPATCH_STAMPFN)
+ rm -rf $(MONO_SHARED_DIR)/.wapi
+ dh clean --before dh_auto_clean
+ dh clean --remaining
- $(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
+binary-arch:
+binary-indep: build
+ dh binary-indep
-fix-patch:
- rm -rf debian/patches/000-fix_build_system.dpatch
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
+binary: binary-arch binary-indep
- cp -r build/mono-*/nant-*/bin/* $(CURDIR)/debian/nant/usr/lib/NAnt
- rmdir $(CURDIR)/debian/nant/usr/lib/NAnt/lib
- install -c -m711 debian/nant.sh $(CURDIR)/debian/nant/usr/bin/nant
-
-# Build architecture-independent files here.
-binary-arch: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_installexamples
- -find $(CURDIR)/debian/nant/usr/share/doc/nant/examples -type f -exec chmod 644 {} \;
- -find $(CURDIR)/debian/nant -name .arch-ids -exec rm -rvf {} \;
- dh_installman
- dh_link
- dh_strip
- dh_clistrip
- dh_compress
- dh_fixperms
- dh_clifixperms
- dh_installdeb
- dh_clideps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure \
- patch unpatch realclean
+.PHONY: build clean binary-indep binary-arch binary install
Modified: packages/nant/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/nant/trunk/debian/watch?rev=4366&op=diff
==============================================================================
--- packages/nant/trunk/debian/watch (original)
+++ packages/nant/trunk/debian/watch Tue Dec 30 22:02:02 2008
@@ -1,3 +1,3 @@
-version=2
+version=3
opts=dversionmangle=s/\.dfsg\d+$// \
http://sf.net/nant/nant-([.0-9]+?)-src.tar.gz
More information about the Pkg-cli-apps-commits
mailing list