[Pkg-cli-apps-commits] [SCM] sparkleshare branch, master, updated. debian/0.2.2-1-7-g8d9e218

[Iain Lane]

The following commit has been merged in the master branch:
commit 584cf398f52a469a26f257900bd2639903436d7d
Author: Iain Lane <laney at debian.org>
Date:   Sat Jul 16 18:15:08 2011 +0100

    Remove 0001-Check-for-both-2.0-and-4.0-libs.patch, merged upstream
    
    Also no longer need to reautogen.

diff --git a/debian/autogen.sh b/debian/autogen.sh
deleted file mode 100755
index 7e91990..0000000
--- a/debian/autogen.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/env bash
-
-function error () {
-	echo "Error: $1" 1>&2
-	exit 1
-}
-
-function run () {
-	echo "Running $@ ..."
-	$@ 2>.autogen.log || {
-		cat .autogen.log 1>&2
-		rm .autogen.log
-		error "Could not run $1, which is required to configure $PROJECT"
-	}
-	rm .autogen.log
-}
-
-if [ $(pkg-config --modversion gnome-doc-utils 2> /dev/null) ]; then
-    run gnome-doc-prepare --automake --force
-else
-    echo "gnome-doc-utils not found; user help will not be built"
-    echo "AC_DEFUN([GNOME_DOC_INIT], [AC_MSG_NOTICE([])])" > build/m4/gnome-doc-utils.m4
-    ACLOCAL_FLAGS="-I build/m4 $ACLOCAL_FLAGS"
-    touch gnome-doc-utils.make
-fi
-
-if git --help &>/dev/null; then
-	git submodule update --init
-fi
-
-run intltoolize --force --copy
-run libtoolize --force --copy --automake
-run aclocal -I build/m4/sparkleshare -I build/m4/shamrock -I build/m4/shave $ACLOCAL_FLAGS
-run autoconf
-
-run automake --gnu --add-missing --force --copy \
-	-Wno-portability -Wno-portability
-
-if test -d $srcdir/SmartIrc4net; then
-    echo Running SmartIrc4net/autogen.sh ...
-    (cd $srcdir/SmartIrc4net; NOCONFIGURE=1 ./autogen.sh "$@")
-    echo Done running SmartIrc4net/autogen.sh ...
-fi
-
-exit $?
diff --git a/debian/control b/debian/control
index b2c7590..0fcd654 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,6 @@ Priority: optional
 Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
 Uploaders: Iain Lane <laney at debian.org>
 Build-Depends: debhelper (>= 7.0.50~),
-               dh-autoreconf,
                cli-common-dev (>= 0.5.7~),
                intltool,
                libglib2.0-cil-dev (>= 2.12.2),
diff --git a/debian/patches/0001-Check-for-both-2.0-and-4.0-libs.patch b/debian/patches/0001-Check-for-both-2.0-and-4.0-libs.patch
deleted file mode 100644
index 28fe9f0..0000000
--- a/debian/patches/0001-Check-for-both-2.0-and-4.0-libs.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From: Iain Lane <laney at debian.org>
-Date: Wed, 15 Jun 2011 21:22:19 +0100
-Subject: Check for both 2.0 and 4.0 libs
-
----
- configure.ac |    9 ++++++++-
- 1 files changed, 8 insertions(+), 1 deletions(-)
-
-Index: sparkleshare/configure.ac
-===================================================================
---- sparkleshare.orig/configure.ac	2011-06-15 22:02:40.004654560 +0100
-+++ sparkleshare/configure.ac	2011-06-15 22:22:35.487775586 +0100
-@@ -40,11 +40,18 @@
- SHAMROCK_CHECK_MONO_MODULE(2.2)
- SHAMROCK_FIND_MONO_2_0_COMPILER
- SHAMROCK_FIND_MONO_RUNTIME
-+    
-+PKG_CHECK_EXISTS([mono >= 2.10],
-+SHAMROCK_CHECK_MONO_4_0_GAC_ASSEMBLIES([
-+    System
-+    System.Security
-+    Mono.Posix
-+]),
- SHAMROCK_CHECK_MONO_2_0_GAC_ASSEMBLIES([
-     System
-     System.Security
-     Mono.Posix
--])
-+]))
- 
- SPARKLESHARE_CHECK_NOTIFY_SHARP
- 
-Index: sparkleshare/Makefile.am
-===================================================================
---- sparkleshare.orig/Makefile.am	2011-06-15 22:22:41.347545525 +0100
-+++ sparkleshare/Makefile.am	2011-06-15 22:22:44.217432851 +0100
-@@ -1,6 +1,5 @@
- SUBDIRS =	\
- 	build	\
--	help	\
- 	SmartIrc4net \
- 	SparkleLib \
- 	SparkleShare \
diff --git a/debian/patches/series b/debian/patches/series
index c43ec18..a9872ef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0001-Check-for-both-2.0-and-4.0-libs.patch
 0002-Add-missing-shebang-to-nautilus-extension.patch
diff --git a/debian/rules b/debian/rules
index 838b471..9b60379 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,8 +5,5 @@ include /usr/share/cli-common/cli.make
 override_dh_auto_configure:
 	dh_auto_configure -- MCS=/usr/bin/mono-csc
 
-override_dh_autoreconf:
-	dh_autoreconf $(CURDIR)/debian/autogen.sh
-
 %:
-	dh --with autoreconf $@ 
+	dh $@ 

-- 
sparkleshare