[Pkg-cli-libs-commits] [SCM] semweb branch, master, updated. upstream/1.05+dfsg-14-g67fd4ec

[David Paleino]

The following commit has been merged in the master branch:
commit 67fd4ec6156e463e3fda4a820e65a5543ea6ece2
Author: David Paleino <d.paleino at gmail.com>
Date:   Fri Sep 25 23:32:12 2009 +0200

    debian/patches/: converted patches to quilt (also change debian/rules and debian/control)

diff --git a/debian/changelog b/debian/changelog
index a49b3cb..188cdc0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,10 @@ semweb (1.05+dfsg-3) UNRELEASED; urgency=low
     + move from Section libs to cli-mono
     + bump Build-Depends from libmysql5.0-cil to libmysql6.0-cil
     + added ${misc:Depends} to monodoc-semweb-manual dependencies
+  * debian/patches/: converted patches to quilt (also change
+    debian/rules and debian/control)
 
- -- David Paleino <d.paleino at gmail.com>  Fri, 25 Sep 2009 23:23:18 +0200
+ -- David Paleino <d.paleino at gmail.com>  Fri, 25 Sep 2009 23:31:18 +0200
 
 semweb (1.05+dfsg-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 4df1b5c..6632324 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: cli-mono
 Priority: optional
 Maintainer: Debian CLI Libraries Team <pkg-cli-libs-team at lists.alioth.debian.org>
 Uploaders: Mirco Bauer <meebey at debian.org>
-Build-Depends: debhelper (>= 7.0.50), dpatch
+Build-Depends: debhelper (>= 7.0.50), quilt
 Build-Depends-Indep: cli-common-dev (>= 0.5.7),
  sharutils,
  mono-devel (>= 2.0.1),
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index e92d491..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,4 +0,0 @@
-fix_mysql_linkage
-fix_store_builds
-enable_AssemblyDelaySign
-use_csc_as_compiler
diff --git a/debian/patches/fix_mysql_linkage.dpatch b/debian/patches/01-fix_mysql_linkage.patch
similarity index 100%
rename from debian/patches/fix_mysql_linkage.dpatch
rename to debian/patches/01-fix_mysql_linkage.patch
diff --git a/debian/patches/fix_store_builds.dpatch b/debian/patches/02-fix_store_builds.patch
similarity index 100%
rename from debian/patches/fix_store_builds.dpatch
rename to debian/patches/02-fix_store_builds.patch
diff --git a/debian/patches/enable_AssemblyDelaySign.dpatch b/debian/patches/03-enable_AssemblyDelaySign.patch
similarity index 95%
rename from debian/patches/enable_AssemblyDelaySign.dpatch
rename to debian/patches/03-enable_AssemblyDelaySign.patch
index 2069b50..d672364 100755
--- a/debian/patches/enable_AssemblyDelaySign.dpatch
+++ b/debian/patches/03-enable_AssemblyDelaySign.patch
@@ -2,7 +2,7 @@
 ## enable_AssemblyDelaySign.dpatch by Mirco Bauer <meebey at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Enable delayed signing of the assemblies
 
 @DPATCH@
 diff -urNad semweb-1.05+dfsg~/src/AssemblyInfo.cs semweb-1.05+dfsg/src/AssemblyInfo.cs
diff --git a/debian/patches/use_csc_as_compiler.dpatch b/debian/patches/04-use_csc_as_compiler.patch
similarity index 100%
rename from debian/patches/use_csc_as_compiler.dpatch
rename to debian/patches/04-use_csc_as_compiler.patch
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ca5eef2
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+01-fix_mysql_linkage.patch
+02-fix_store_builds.patch
+03-enable_AssemblyDelaySign.patch
+04-use_csc_as_compiler.patch
diff --git a/debian/rules b/debian/rules
index 2f47168..eafe18d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ LIBS =  bin_generics/SemWeb.dll \
 	bin_generics/SemWeb.SQLServerStore.dll
 
 include /usr/share/cli-common/cli.make
-include /usr/share/dpatch/dpatch.make
+include /usr/share/dpatch/quilt.make
 
 override_dh_auto_build:
 	# unpack signing key
@@ -42,7 +42,7 @@ override_dh_makeclilibs:
 	dh_makeclilibs -i -m $(DEB_CLI_API_VERSION)
 
 build: build-stamp
-build-stamp: $(DPATCH_STAMPFN)
+build-stamp: $(QUILT_STAMPFN)
 	dh build
 
 	# build API docs

-- 
semweb