[Pkg-cli-apps-commits] r4150 - in /packages/nant/trunk/debian: changelog control patches/005-nant-ExternalProgramBase-race.dpatch patches/00list rules
meebey at users.alioth.debian.org
meebey at users.alioth.debian.org
Thu Oct 16 21:22:18 UTC 2008
Author: meebey
Date: Thu Oct 16 21:22:18 2008
New Revision: 4150
URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4150
Log:
[ Mirco Bauer ]
* debian/control:
+ Enhanced package description.
+ Added Vcs-Browser field.
+ Bumped cli-common-dev build-dep to >= 0.5.4 as we are using
dh_clistrip and dh_clifixperms from it.
* debian/rules:
+ Removed -m paramater to dh_clideps call, as it doesn't know such
parameter.
+ Added dh_clistrip and dh_clifixperms calls.
+ Removed find call to fix file permissions, as dh_clifixperms takes now
care of this.
+ Removed dh_shlibdeps call as this package doesn't contain native
binaries or libraries.
* debian/patches/005-nant-ExternalProgramBase-race.dpatch:
+ New patch to prevent Mono detection failure due to a race on SMP
machines. Based on upstream fix for bug 1733671 (Closes: #483073)
(thanks goes to Y Giridhar Appaji Nag <appaji at debian.org> for
investigation and providing the dpatch)
Added:
packages/nant/trunk/debian/patches/005-nant-ExternalProgramBase-race.dpatch
Modified:
packages/nant/trunk/debian/changelog
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=4150&op=diff
==============================================================================
--- packages/nant/trunk/debian/changelog (original)
+++ packages/nant/trunk/debian/changelog Thu Oct 16 21:22:18 2008
@@ -1,9 +1,30 @@
nant (0.85.dfsg1-5) UNRELEASED; urgency=low
+ [ David Paleino ]
* debian/control:
- + removed Dave Beckett <dajobe at debian.org> from Uploaders.
-
- -- David Paleino <d.paleino at gmail.com> Sat, 20 Sep 2008 22:35:38 +0200
+ + Removed Dave Beckett <dajobe at debian.org> from Uploaders.
+
+ [ Mirco Bauer ]
+ * debian/control:
+ + Enhanced package description.
+ + Added Vcs-Browser field.
+ + Bumped cli-common-dev build-dep to >= 0.5.4 as we are using
+ dh_clistrip and dh_clifixperms from it.
+ * debian/rules:
+ + Removed -m paramater to dh_clideps call, as it doesn't know such
+ parameter.
+ + Added dh_clistrip and dh_clifixperms calls.
+ + Removed find call to fix file permissions, as dh_clifixperms takes now
+ care of this.
+ + Removed dh_shlibdeps call as this package doesn't contain native
+ binaries or libraries.
+ * debian/patches/005-nant-ExternalProgramBase-race.dpatch:
+ + New patch to prevent Mono detection failure due to a race on SMP
+ machines. Based on upstream fix for bug 1733671 (Closes: #483073)
+ (thanks goes to Y Giridhar Appaji Nag <appaji at debian.org> for
+ investigation and providing the dpatch)
+
+ -- Mirco Bauer <meebey at debian.org> Thu, 16 Oct 2008 22:50:40 +0200
nant (0.85.dfsg1-4) unstable; urgency=low
Modified: packages/nant/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/nant/trunk/debian/control?rev=4150&op=diff
==============================================================================
--- packages/nant/trunk/debian/control (original)
+++ packages/nant/trunk/debian/control Thu Oct 16 21:22:18 2008
@@ -4,18 +4,23 @@
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)
-Build-Depends-Indep: mono-mcs (>= 1.1.6) | c-sharp-compiler, mono-gmcs, mono-gac, libmono-dev (>= 1.1.6), pkg-config, cli-common-dev (>= 0.4.4), dpatch, libnunit2.4-cil, libndoc1.3-cil, libmono-winforms1.0-cil, libmono-winforms2.0-cil, liblog4net1.2-cil, libmono-sharpzip2.84-cil, libmono-sharpzip0.84-cil
+Build-Depends-Indep: mono-mcs (>= 1.1.6) | c-sharp-compiler, mono-gmcs, mono-gac, libmono-dev (>= 1.1.6), pkg-config, cli-common-dev (>= 0.5.4), dpatch, libnunit2.4-cil, libndoc1.3-cil, libmono-winforms1.0-cil, libmono-winforms2.0-cil, liblog4net1.2-cil, libmono-sharpzip2.84-cil, libmono-sharpzip0.84-cil
Standards-Version: 3.8.0
Homepage: http://nant.sourceforge.net/
Vcs-Svn: svn://svn.debian.org/pkg-cli-apps/packages/nant/trunk
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-cli-apps/packages/nant/trunk/
DM-Upload-Allowed: yes
Package: nant
Architecture: all
-Depends: pkg-config, ${cli:Depends}, libmono-dev (>= 1.1.6), mono-gmcs
-Description: .NET build tool similar to Ant
- NAnt is different. Instead of a model where it is extended with
+Depends: ${cli:Depends}, pkg-config, libmono-dev (>= 1.1.6), mono-gmcs
+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
writing shell commands, the configuration files are XML-based, calling
out a target tree where various tasks get executed. Each task is run
by an object that implements a particular Task interface.
+ .
+ NAnt supports different target frameworks:
+ - Microsoft .NET Framework version 1.0, 1.1 and 2.0
+ - Mono 1.0 and 2.0
Added: packages/nant/trunk/debian/patches/005-nant-ExternalProgramBase-race.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/nant/trunk/debian/patches/005-nant-ExternalProgramBase-race.dpatch?rev=4150&op=file
==============================================================================
--- packages/nant/trunk/debian/patches/005-nant-ExternalProgramBase-race.dpatch (added)
+++ packages/nant/trunk/debian/patches/005-nant-ExternalProgramBase-race.dpatch Thu Oct 16 21:22:18 2008
@@ -1,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 005-nant-ExternalProgramBase-race.dpatch by Y Giridhar Appaji Nag <appaji at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes threading issue in ExternalProgramBase causing a race in SMP env
+## DP: ExternalProgramBase.cs CVS r1.71, upstream #1733671, Debian #483073
+
+ at DPATCH@
+diff -urNad nant-0.85.dfsg1~/src/NAnt.Core/Tasks/ExternalProgramBase.cs nant-0.85.dfsg1/src/NAnt.Core/Tasks/ExternalProgramBase.cs
+--- nant-0.85.dfsg1~/src/NAnt.Core/Tasks/ExternalProgramBase.cs 2008-10-15 22:13:06.000000000 +0530
++++ nant-0.85.dfsg1/src/NAnt.Core/Tasks/ExternalProgramBase.cs 2008-10-15 22:15:35.000000000 +0530
+@@ -452,7 +452,9 @@
+ }
+ }
+ }
+- OutputWriter.Flush();
++ lock (_lockObject) {
++ OutputWriter.Flush();
++ }
+ }
+
/// <summary>
/// Reads from the stream until the external program is ended.
/// </summary>
+ private void StreamReaderThread_Error() {
+@@ -476,7 +478,9 @@
+ }
+ }
+ }
+- ErrorWriter.Flush();
++ lock (_lockObject) {
++ ErrorWriter.Flush();
++ }
+ }
+
+ /// <summary>
Modified: packages/nant/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/nant/trunk/debian/patches/00list?rev=4150&op=diff
==============================================================================
--- packages/nant/trunk/debian/patches/00list (original)
+++ packages/nant/trunk/debian/patches/00list Thu Oct 16 21:22:18 2008
@@ -2,3 +2,4 @@
002-nant-load-partial-name.dpatch
003-nant-use-system-dlls.dpatch
004-nant-nunit_2.4.dpatch
+005-nant-ExternalProgramBase-race.dpatch
Modified: packages/nant/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/nant/trunk/debian/rules?rev=4150&op=diff
==============================================================================
--- packages/nant/trunk/debian/rules (original)
+++ packages/nant/trunk/debian/rules Thu Oct 16 21:22:18 2008
@@ -78,7 +78,6 @@
cp -r build/mono-*/nant-*/bin/* $(CURDIR)/debian/nant/usr/lib/NAnt
rmdir $(CURDIR)/debian/nant/usr/lib/NAnt/lib
- find $(CURDIR)/debian/nant/usr/lib/NAnt -type f -exec chmod a-x {} \;
install -c -m711 debian/nant.sh $(CURDIR)/debian/nant/usr/bin/nant
# Build architecture-independent files here.
@@ -94,14 +93,15 @@
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_clideps -m $(UPVERSION)
dh_installman
dh_link
dh_strip
+ dh_clistrip
dh_compress
dh_fixperms
+ dh_clifixperms
dh_installdeb
- dh_shlibdeps
+ dh_clideps
dh_gencontrol
dh_md5sums
dh_builddeb
More information about the Pkg-cli-apps-commits
mailing list