[Pkg-cli-apps-commits] [SCM] bareftp branch, master, updated. debian/0.3.1-1-3-g0521918

[Stefan Ebner]

The following commit has been merged in the master branch:
commit 052191801737c4b9efb8ccdfaaaa2c47ea0126e4
Author: Stefan Ebner <sebner at ubuntu.com>
Date:   Mon Apr 19 13:43:05 2010 +0200

    New upstream 0.3.2 release

diff --git a/debian/changelog b/debian/changelog
index 4110316..365c4bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+bareftp (0.3.2-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * debian/patches/01_fix_gnome-keyring_sharp_detection: Merged upstream
+  * debian/rules: Remove dh_auto_install build workaround
+
+ -- Stefan Ebner <sebner at ubuntu.com>  Mon, 19 Apr 2010 13:38:11 +0200
+
 bareftp (0.3.1-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/patches/01_fix_gnome-keyring_sharp_detection b/debian/patches/01_fix_gnome-keyring_sharp_detection
deleted file mode 100644
index 83d6962..0000000
--- a/debian/patches/01_fix_gnome-keyring_sharp_detection
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: bareftp/configure.ac
-===================================================================
---- bareftp.orig/configure.ac	2010-01-17 16:21:57.940343608 +0100
-+++ bareftp/configure.ac	2010-01-17 16:22:08.421342651 +0100
-@@ -79,7 +79,7 @@
-   [with_keyring=yes])
- 
- if test x"$with_keyring" != xno ; then
--  PKG_CHECK_MODULES([GNOME_KEYRING_SHARP], [gnome-keyring-sharp])
-+  PKG_CHECK_MODULES([GNOME_KEYRING_SHARP], [gnome-keyring-sharp-1.0])
-   AC_SUBST([GNOME_KEYRING_SHARP_LIBS])
-   CSC_DEFINES="$CSC_DEFINES -d:HAVE_GNOME_KEYRING"
- else
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 9e02fc4..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01_fix_gnome-keyring_sharp_detection
diff --git a/debian/rules b/debian/rules
index 2aa8e08..dac7db3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,13 +19,6 @@ override_dh_auto_configure:
 override_dh_auto_test:
 	# disabled
 
-override_dh_auto_build:
-	mkdir -p $(CURDIR)/src/bareFTP.Protocol.Sftp/bin/Release
-	ln -s $(CURDIR)/lib/bareFTP.SftpPty/bin/Release/bareFTP.SftpPty.dll \
-	$(CURDIR)/src/bareFTP.Protocol.Sftp/bin/Release/bareFTP.SftpPty.dll
-	dh_auto_build
-	rm -f $(CURDIR)/src/bareFTP.Protocol.Sftp/bin/Release/bareFTP.SftpPty.dll
-
 override_dh_auto_install:
 	dh_auto_install
 	rm -f $(CURDIR)/debian/bareftp/usr/lib/bareftp/libsftppty.a

-- 
bareftp