[maemo-commits] [maemo-commits] r10463 - projects/haf/trunk/osso-gnome-vfs2/debian

[From: subversion at stage.maemo.org]

Author: richard
Date: 2007-03-08 14:26:40 +0200 (Thu, 08 Mar 2007)
New Revision: 10463

Added:
   projects/haf/trunk/osso-gnome-vfs2/debian/libosso-gnomevfs2-common.postinst
Modified:
   projects/haf/trunk/osso-gnome-vfs2/debian/changelog
   projects/haf/trunk/osso-gnome-vfs2/debian/control
   projects/haf/trunk/osso-gnome-vfs2/debian/rules
Log:
Cleanup package a bit, fix sardine build, remove old module conf in postinst.

Modified: projects/haf/trunk/osso-gnome-vfs2/debian/changelog
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/debian/changelog	2007-03-08 11:20:57 UTC (rev 10462)
+++ projects/haf/trunk/osso-gnome-vfs2/debian/changelog	2007-03-08 12:26:40 UTC (rev 10463)
@@ -1,3 +1,14 @@
+osso-gnome-vfs2 (2.16.3-1osso10) unstable; urgency=low
+
+  * Don't try to use the ssh binary installed as scratchbox tool
+  * Set ACLOCAL_FLAGS to find the broken libtool in sb 1.0 + sardine
+  * Remove the no longer needed libtool patch for high version numbers
+  * Explicitly disable avahi, fam and howl so it's more clear what is done
+  * Explicitly disable hal until we are supposed to enable it
+  * Remove options for modules that have been removed
+
+ -- Richard Hult <richard at imendio.com>  Thu,  8 Mar 2007 12:41:37 +0100
+
 osso-gnome-vfs2 (2.16.3-1osso9) unstable; urgency=low
 
   * Make a release with samba enabled

Modified: projects/haf/trunk/osso-gnome-vfs2/debian/control
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/debian/control	2007-03-08 11:20:57 UTC (rev 10462)
+++ projects/haf/trunk/osso-gnome-vfs2/debian/control	2007-03-08 12:26:40 UTC (rev 10463)
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: Richard Hult <richard at imendio.com>
-Build-Depends: debhelper (>= 4.0.0), libglib2.0-dev, cdbs, libgconf2-dev (>= 2.6.4), libxml2-dev, gettext, debhelper (>> 4.1.0), zlib1g-dev, intltool, gnome-common, gnome-pkg-tools, libdbus-glib-1-dev (>= 0.60), gtk-doc-tools, libsmbclient-dev
+Build-Depends: debhelper (>= 4.0.0), libglib2.0-dev, cdbs, libgconf2-dev (>= 2.6.4), libxml2-dev, gettext, debhelper (>> 4.1.0), zlib1g-dev, intltool, gnome-common, gnome-pkg-tools, libdbus-glib-1-dev (>= 0.60), gtk-doc-tools, libsmbclient-dev, libtool
 Standards-Version: 3.6.1.0
 
 Package: libosso-gnomevfs2-common

Added: projects/haf/trunk/osso-gnome-vfs2/debian/libosso-gnomevfs2-common.postinst
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/debian/libosso-gnomevfs2-common.postinst	2007-03-08 11:20:57 UTC (rev 10462)
+++ projects/haf/trunk/osso-gnome-vfs2/debian/libosso-gnomevfs2-common.postinst	2007-03-08 12:26:40 UTC (rev 10463)
@@ -0,0 +1,6 @@
+#!/bin/sh -e
+
+if [ "$1" = "configure" ]; then
+	# Clean up old module files that conflict with our new versions
+	rm -f /etc/gnome-vfs-2.0/modules/dbus-module.conf
+fi

Modified: projects/haf/trunk/osso-gnome-vfs2/debian/rules
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/debian/rules	2007-03-08 11:20:57 UTC (rev 10462)
+++ projects/haf/trunk/osso-gnome-vfs2/debian/rules	2007-03-08 12:26:40 UTC (rev 10463)
@@ -2,22 +2,26 @@
 
 #export DH_VERBOSE=1
 
-DH_ALWAYS_EXCLUDE := .svn
-
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-# debug lib
+DEB_DH_ALWAYS_EXCLUDE := .svn
+
+# Debug symbol packages
 DEB_DH_STRIP_ARGS := --dbg-package=libosso-gnomevfs2-0 --dbg-package=libosso-gnomevfs2-common --dbg-package=libosso-gnomevfs2-samba
 
 DEB_CONFIGURE_EXTRA_FLAGS := --enable-samba --disable-gnutls --disable-openssl \
+	--disable-avahi --disable-hal --disable-fam --disable-howl \
 	--disable-gtk-doc --libexecdir=/usr/libexec --enable-more-warnings=no
 
-DEB_DH_INSTALL_ARGS := -Xlibextfs -Xlibnntp -Xlibvfs-pipe -Xlibcomputer -Xlibfile -Xlibvfolder-desktop
+# For the ssh support so it doesn't pick up /scratchbox/tools/bin/ssh
+DEB_CONFIGURE_SCRIPT_ENV += SSH_PROGRAM=/usr/bin/ssh
 
+DEB_DH_INSTALL_ARGS := -Xlibnntp -Xlibcomputer -Xlibfile
+
 DEB_DH_MAKESHLIBS_ARGS_libosso-gnomevfs2-common := --no-act
 
 # Use soft-float and thumb mode if it enabled.
@@ -27,16 +31,10 @@
 
 post-patches:: debian/stamp-autothings-update
 debian/stamp-autothings-update:
-	NOCONFIGURE=1 ./autogen.sh
+	# Set ACLOCAL_FLAGS so that libtool.m4 is picked up in scratchbox 1.0.x + sardine
+	NOCONFIGURE=1 ACLOCAL_FLAGS="-I /targets/links/arch_tools/share/aclocal" ./autogen.sh
 	# Can add things here that need to be ran after autogen.sh
 	touch $@
 
 clean::
 	rm -f debian/stamp-autothings-update
-	rm -f debian/stamp-libtool-patch
-
-common-configure-arch:: debian/stamp-libtool-patch
-debian/stamp-libtool-patch:
-	if [ `./libtool --version | head -1 |cut -d' ' -f4` = '1.5.6' ]; then \
-	    patch -p0 < debian/libtool-long-versions.patch; fi
-	touch $@