[Pkg-cli-apps-commits] [SCM] tangerine branch, master, updated. debian/0.3.2.2-4

[Jo Shields]

The following commit has been merged in the master branch:
commit 85a01ba2a203a68296c53a2c2a6ee3d0df31d8d2
Author: Jo Shields <directhex at apebox.org>
Date:   Tue May 4 13:23:31 2010 +0100

      * debian/patches/kfreebsd_use_assemblyrefs_in_configure.ac.patch,
        debian/rules,
        debian/control:
        + Make sure configure check pulls in assembly refs on things like
          NDesk.Glib on non-Linux platforms (Closes: #580009)

diff --git a/debian/changelog b/debian/changelog
index 8e6feff..1e731f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tangerine (0.3.2.2-4) UNRELEASED; urgency=low
+
+  * debian/patches/kfreebsd_use_assemblyrefs_in_configure.ac.patch,
+    debian/rules,
+    debian/control:
+    + Make sure configure check pulls in assembly refs on things like 
+      NDesk.Glib on non-Linux platforms (Closes: #580009)
+
+ -- Jo Shields <directhex at apebox.org>  Tue, 04 May 2010 12:45:35 +0100
+
 tangerine (0.3.2.2-3) unstable; urgency=low
 
   * debian/control, debian/rules: Drop beagle support as beagle is being
diff --git a/debian/control b/debian/control
index e4e049f..215add6 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,8 @@ Build-Depends: debhelper (>= 7.0.50),
                pkg-config,
                autotools-dev,
                intltool,
+               libtool,
+               quilt (>= 0.46-7~),
                libdb4o-cil-dev,
                libmono-zeroconf-cil-dev,
                libtaglib-cil-dev,
diff --git a/debian/patches/kfreebsd_use_assemblyrefs_in_configure.ac.patch b/debian/patches/kfreebsd_use_assemblyrefs_in_configure.ac.patch
new file mode 100644
index 0000000..a75412e
--- /dev/null
+++ b/debian/patches/kfreebsd_use_assemblyrefs_in_configure.ac.patch
@@ -0,0 +1,70 @@
+Index: tangerine-0.3.2.2/configure.ac
+===================================================================
+--- tangerine-0.3.2.2.orig/configure.ac	2009-08-15 21:56:05.000000000 +0100
++++ tangerine-0.3.2.2/configure.ac	2010-05-04 13:09:48.000000000 +0100
+@@ -117,6 +117,30 @@
+         build_session_plugin="yes"
+         platform="LINUX"
+         ;;
++    *-*-kfreebsd*)
++        PKG_CHECK_MODULES(GLIB_SHARP_20, glib-sharp-2.0)
++        AC_SUBST(GLIB_SHARP_20_LIBS)
++
++        PKG_CHECK_MODULES(GTK_SHARP_20, gtk-sharp-2.0)
++        AC_SUBST(GTK_SHARP_LIBS_20)
++
++        PKG_CHECK_MODULES(GLADE_SHARP_20, glade-sharp-2.0)
++        AC_SUBST(GLADE_SHARP_LIBS_20)
++
++        PKG_CHECK_MODULES(NDESK_DBUS_10, ndesk-dbus-1.0)
++        AC_SUBST([NDESK_DBUS_10_LIBS])
++
++        PKG_CHECK_MODULES(NDESK_DBUS_GLIB_10, ndesk-dbus-glib-1.0)
++        AC_SUBST([NDESK_DBUS_GLIB_10_LIBS])
++
++        PKG_CHECK_MODULES(X_SESSION, sm)
++        AC_SUBST([X_SESSION_LIBS])
++
++        have_inotify="no"
++        build_gui="yes"
++        build_session_plugin="yes"
++        platform="LINUX"
++        ;;
+     *-*-darwin*)
+         have_inotify="no"
+         build_gui="no"
+Index: tangerine-0.3.2.2/configure.ac
+===================================================================
+--- tangerine-0.3.2.2.orig/configure.ac	2009-08-15 21:56:05.000000000 +0100
++++ tangerine-0.3.2.2/configure.ac	2010-05-04 13:09:48.000000000 +0100
+@@ -117,6 +117,30 @@
+         build_session_plugin="yes"
+         platform="LINUX"
+         ;;
++    *-*-kfreebsd*)
++        PKG_CHECK_MODULES(GLIB_SHARP_20, glib-sharp-2.0)
++        AC_SUBST(GLIB_SHARP_20_LIBS)
++
++        PKG_CHECK_MODULES(GTK_SHARP_20, gtk-sharp-2.0)
++        AC_SUBST(GTK_SHARP_LIBS_20)
++
++        PKG_CHECK_MODULES(GLADE_SHARP_20, glade-sharp-2.0)
++        AC_SUBST(GLADE_SHARP_LIBS_20)
++
++        PKG_CHECK_MODULES(NDESK_DBUS_10, ndesk-dbus-1.0)
++        AC_SUBST([NDESK_DBUS_10_LIBS])
++
++        PKG_CHECK_MODULES(NDESK_DBUS_GLIB_10, ndesk-dbus-glib-1.0)
++        AC_SUBST([NDESK_DBUS_GLIB_10_LIBS])
++
++        PKG_CHECK_MODULES(X_SESSION, sm)
++        AC_SUBST([X_SESSION_LIBS])
++
++        have_inotify="no"
++        build_gui="yes"
++        build_session_plugin="yes"
++        platform="LINUX"
++        ;;
+     *-*-darwin*)
+         have_inotify="no"
+         build_gui="no"
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ef170a4
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+kfreebsd_use_assemblyrefs_in_configure.ac.patch
+kfreebsd_use_assemblyrefs_in_configure.ac.patch
diff --git a/debian/rules b/debian/rules
index e728203..2b0d80b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,7 @@ USCAN = uscan \
 			--upstream-version=$(CURVER)
 
 include /usr/share/cli-common/cli.make
+include /usr/share/quilt/quilt.make
 
 get-orig-source:
 	$(USCAN) \
@@ -19,6 +20,7 @@ get-orig-source:
 		--rename
 
 override_dh_auto_configure:
+	autoreconf -f -i -I m4/shamrock
 	dh_auto_configure -- \
 		MCS=/usr/bin/mono-csc \
 		--enable-debug \
@@ -41,4 +43,4 @@ override_dh_auto_install:
 	rm debian/tangerine/usr/share/doc/tangerine/sample.conf
 
 %:
-	dh $@
+	dh --with quilt $@

-- 
tangerine