[Pkg-cli-apps-commits] [SCM] bareftp branch, master, updated. debian/0.2.3-1-26-gd8625c0

[Stefan Ebner]

The following commit has been merged in the master branch:
commit d8625c0f6688337ea8bc9704019f1f253b21cf2e
Author: Stefan Ebner <sebner at ubuntu.com>
Date:   Fri Jan 8 18:23:00 2010 +0100

    fiXX0ring gnome-keyring-sharp detection

diff --git a/debian/changelog b/debian/changelog
index 9b9ca4f..5dab966 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,14 +5,14 @@ bareftp (0.3.1-1) UNRELEASED; urgency=low
     + Add myself to Uploaders
     + Bump Standards-Version to 3.8.3
     + Change "Architecture: all" to "Architecture: any"
-    + Remove quilt dependency
-    + Add dependency on libgnome-keyring1.0-cil-dev
+    + Add build-dependency on libgnome-keyring1.0-cil-dev and libtool
     + Update dependencies for -cil to -cil-dev transition
   * debian/rules:
-    + Remove quilt and autoreconf references
     + Add workaround to let make find bareFTP.SftpPty.dll at build time
     + Remove useless .a and .la files
   * debian/copyright: Updated
+  * debian/patches: Add 01_fix_configure_finding_gnome-keyring_sharp so
+    configure finds gnome-keyring-sharp at build time
 
  -- Stefan Ebner <sebner at ubuntu.com>  Thu, 31 Dec 2009 12:35:38 +0100
 
diff --git a/debian/control b/debian/control
index afab85c..c039b75 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,9 @@ Build-Depends: debhelper (>= 7.0.50),
  libgnome-vfs2.0-cil-dev (>= 2.12),
  libgconf2.0-cil-dev (>= 2.12),
  libgnome-keyring1.0-cil-dev,
- intltool (>= 0.35)
+ intltool (>= 0.35),
+ quilt (>= 0.46-7~),
+ libtool
 Standards-Version: 3.8.3
 Homepage: http://www.bareftp.org/
 Vcs-Git: git://git.debian.org/git/pkg-cli-apps/packages/bareftp.git
diff --git a/debian/rules b/debian/rules
index 7d17db9..2aa8e08 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,8 +10,10 @@ DEB_VERSION = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^Vers
 VERSION = $(shell echo $(DEB_VERSION) | cut -d"-" -f1 | sed 's/+dfsg.*//')
 
 include /usr/share/cli-common/cli.make
+include /usr/share/quilt/quilt.make
 
 override_dh_auto_configure:
+	autoreconf -f -i -s -I .
 	dh_auto_configure -- MCS=/usr/bin/mono-csc
 
 override_dh_auto_test:
@@ -29,6 +31,11 @@ override_dh_auto_install:
 	rm -f $(CURDIR)/debian/bareftp/usr/lib/bareftp/libsftppty.a
 	rm -f $(CURDIR)/debian/bareftp/usr/lib/bareftp/libsftppty.la
 
+override_dh_clean:
+	dh_clean
+	rm -rf configure config.sub config.guess ltmain.sh aclocal.m4 autom4te.cache/
+	find . -name "Makefile.in" -delete
+
 get-orig-source:
 	uscan \
 		--package $(DEB_SOURCE_NAME) \
@@ -41,6 +48,6 @@ get-orig-source:
 		--repack
 
 %:
-	dh $@
+	dh --with quilt $@
 
 .PHONY: get-orig-source

-- 
bareftp