[Pkg-cli-apps-commits] [fsgateway] 01/02: Use standalone npgsql, not Mono-bundled

[Jo Shields]

This is an automated email from the git hooks/post-receive script.

directhex pushed a commit to annotated tag debian/0.1.1-5
in repository fsgateway.

commit 207fe1cfb2896bda207135301ef588d30cca4381
Author: Jo Shields <jo.shields at xamarin.com>
Date:   Mon Dec 14 11:16:15 2015 +0000

    Use standalone npgsql, not Mono-bundled
---
 debian/control                             |  4 +++-
 debian/patches/series                      |  1 +
 debian/patches/use_standalone_npgsql.patch | 13 +++++++++++++
 debian/rules                               |  2 +-
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index e9cd5b3..3ae2670 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,10 @@ Uploaders: Marco Nenciarini <mnencia at debian.org>
 Build-Depends: debhelper (>= 7.0.50~),
  cli-common-dev (>= 0.7),
  mono-devel (>= 2.4.2.3),
+ dh-autoreconf,
  libmono-fuse-cil,
- libmysql-cil-dev
+ libmysql-cil-dev,
+ libnpgsql-cil-dev
 Standards-Version: 3.8.4
 Vcs-Git: git://git.debian.org/git/pkg-cli-apps/packages/fsgateway.git
 Vcs-Browser: http://git.debian.org/?p=pkg-cli-apps/packages/fsgateway.git
diff --git a/debian/patches/series b/debian/patches/series
index 0f33dc7..f53b1c2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+use_standalone_npgsql.patch
 fix_assemblyversion.patch
diff --git a/debian/patches/use_standalone_npgsql.patch b/debian/patches/use_standalone_npgsql.patch
new file mode 100644
index 0000000..679a8f3
--- /dev/null
+++ b/debian/patches/use_standalone_npgsql.patch
@@ -0,0 +1,13 @@
+Index: fsgateway/src/Makefile.am
+===================================================================
+--- fsgateway.orig/src/Makefile.am
++++ fsgateway/src/Makefile.am
+@@ -29,7 +29,7 @@ fsgateway_sources = AssemblyInfo.cs \
+ fsgateway_libs = \
+ 	-r:System \
+ 	-r:System.Data \
+-	-r:Npgsql \
++	-pkg:npgsql \
+ 	-r:Mono.Posix \
+ 	-r:System.Xml \
+ 	-r:Mono.Data.Sqlite \
diff --git a/debian/rules b/debian/rules
index 61540ed..e0c5138 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ DEB_VERSION = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^Vers
 VERSION = $(shell echo $(DEB_VERSION) | cut -d"-" -f1 | sed 's/+dfsg.*//')
 
 %:
-	dh  $@ --with cli
+	dh  $@ --with cli,autoreconf
 
 override_dh_auto_configure:
 	dh_auto_configure -- MCS=/usr/bin/mono-csc

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/fsgateway.git