[maemo-commits] [maemo-commits] r11161 - in projects/haf/trunk/gnomevfs-obex: . debian

From: subversion at stage.maemo.org subversion at stage.maemo.org
Date: Fri Apr 20 10:33:51 EEST 2007 
Author: richard
Date: 2007-04-20 10:33:48 +0300 (Fri, 20 Apr 2007)
New Revision: 11161

Added:
   projects/haf/trunk/gnomevfs-obex/debian/gnomevfs-obex-dev.install
   projects/haf/trunk/gnomevfs-obex/debian/gnomevfs-obex.dirs
   projects/haf/trunk/gnomevfs-obex/debian/gnomevfs-obex.install
   projects/haf/trunk/gnomevfs-obex/debian/gnomevfs-obex.postinst
Removed:
   projects/haf/trunk/gnomevfs-obex/debian/osso-gnomevfs-extra-dev.install
   projects/haf/trunk/gnomevfs-obex/debian/osso-gnomevfs-extra.dirs
   projects/haf/trunk/gnomevfs-obex/debian/osso-gnomevfs-extra.install
   projects/haf/trunk/gnomevfs-obex/debian/osso-gnomevfs-extra.postinst
Modified:
   projects/haf/trunk/gnomevfs-obex/ChangeLog
   projects/haf/trunk/gnomevfs-obex/autogen.sh
   projects/haf/trunk/gnomevfs-obex/configure.in
   projects/haf/trunk/gnomevfs-obex/debian/control
   projects/haf/trunk/gnomevfs-obex/debian/rules
Log:
Rename to gnomevfs-obex.

Modified: projects/haf/trunk/gnomevfs-obex/ChangeLog
===================================================================
--- projects/haf/trunk/gnomevfs-obex/ChangeLog	2007-04-20 07:19:33 UTC (rev 11160)
+++ projects/haf/trunk/gnomevfs-obex/ChangeLog	2007-04-20 07:33:48 UTC (rev 11161)
@@ -1,3 +1,7 @@
+2007-04-20  Richard Hult  <richard at imendio.com>
+
+	* Package renamed from osso-gnomevfs-extra to gnomevfs-obex.
+
 2007-02-15  Richard Hult  <richard at imendio.com>
 
 	* obex-module/src/om-dbus.c (connection_free): Close the private

Modified: projects/haf/trunk/gnomevfs-obex/autogen.sh
===================================================================
--- projects/haf/trunk/gnomevfs-obex/autogen.sh	2007-04-20 07:19:33 UTC (rev 11160)
+++ projects/haf/trunk/gnomevfs-obex/autogen.sh	2007-04-20 07:33:48 UTC (rev 11161)
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-PACKAGE="osso-gnomevfs-extra"
+PACKAGE="gnomevfs-obex"
 
 have_libtool=false
 have_autoconf=false

Modified: projects/haf/trunk/gnomevfs-obex/configure.in
===================================================================
--- projects/haf/trunk/gnomevfs-obex/configure.in	2007-04-20 07:19:33 UTC (rev 11160)
+++ projects/haf/trunk/gnomevfs-obex/configure.in	2007-04-20 07:33:48 UTC (rev 11161)
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
  
-AC_INIT(osso-gnomevfs-extra, 1.9.2)
+AC_INIT(gnomevfs-obex, 1.9.2)
 AC_CONFIG_SRCDIR(obex-module/src/obex-method.c)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 
@@ -30,10 +30,6 @@
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS([memset mkdir strdup strncasecmp opendir closedir readdir_r])
 
-AC_CHECK_FUNCS(getdtablesize open64 lseek64 statfs statvfs seteuid setegid setresuid setresgid readdir_r mbrtowc inet_pton getdelim sysctlbyname poll posix_fadvise fchmod atoll)
-AC_CHECK_MEMBERS([struct stat.st_blksize, struct stat.st_rdev])
-AC_STRUCT_ST_BLOCKS
-
 # Needed to build the obex module.
 AC_CACHE_CHECK([for off64_t],
 	ac_cv_have_off64_t,

Modified: projects/haf/trunk/gnomevfs-obex/debian/control
===================================================================
--- projects/haf/trunk/gnomevfs-obex/debian/control	2007-04-20 07:19:33 UTC (rev 11160)
+++ projects/haf/trunk/gnomevfs-obex/debian/control	2007-04-20 07:33:48 UTC (rev 11161)
@@ -1,33 +1,33 @@
-Source: osso-gnomevfs-extra 
+Source: gnomevfs-obex 
 Section: libs
 Priority: optional
 Maintainer: Richard Hult <richard at imendio.com>
 Build-Depends: debhelper (>= 4.0.0), libglib2.0-dev (>= 2.8), libopenobex1-dev, libgwobex-dev (>= 0.47), libosso-gnomevfs2-dev (>= 2.16.3), libdbus-glib-1-dev, osso-gwconnect-dev (>=0.93.2), libexpat1-dev
 Standards-Version: 3.6.1.0
 
-Package: osso-gnomevfs-extra
+Package: gnomevfs-obex
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
 Replaces: osso-gnomevfs-backend
 Conflicts: osso-gnomevfs-backend
 Provides: osso-gnomevfs-backend
-Description: OSSO GnomeVFS Extra
- This package contains extra parts to GnomeVFS developed for Nokia. 
+Description: GnomeVFS OBEX
+ This package contains OBEX related extentions for GnomeVFS.
   * An OBEX GnomeVFS module
   * Small library to retrieve the capabilities object from a remote devices.
 
-Package: osso-gnomevfs-extra-dev
+Package: gnomevfs-obex-dev
 Section: devel
 Architecture: any
-Depends: osso-gnomevfs-extra (= ${Source-Version}), libosso-gnomevfs2-dev (>= 2.8.4.7), libglib2.0-dev
-Description: OSSO GnomeVFS Extra Development files
- Development files for the osso-gnome-vfs-extra package.
+Depends: gnomevfs-obex (= ${Source-Version}), libosso-gnomevfs2-dev (>= 2.16.3), libglib2.0-dev
+Description: GnomeVFS OBEX Development files
+ Development files for the gnomevfs-obex package.
 
-Package: osso-gnomevfs-extra-dbg
+Package: gnomevfs-obex-dbg
 Section: devel
 Priority: extra
 Architecture: any
-Depends: osso-gnomevfs-extra (= ${Source-Version})
-Description: OSSO GnomeVFS Extra debugging symbols
- Development files for the osso-gnome-vfs-extra package.
+Depends: gnomevfs-obex (= ${Source-Version})
+Description: GnomeVFS OBEX debugging symbols
+ Development files for the gnomevfs-obex package.

Copied: projects/haf/trunk/gnomevfs-obex/debian/gnomevfs-obex-dev.install (from rev 11119, projects/haf/trunk/gnomevfs-obex/debian/osso-gnomevfs-extra-dev.install)

Copied: projects/haf/trunk/gnomevfs-obex/debian/gnomevfs-obex.dirs (from rev 11119, projects/haf/trunk/gnomevfs-obex/debian/osso-gnomevfs-extra.dirs)

Copied: projects/haf/trunk/gnomevfs-obex/debian/gnomevfs-obex.install (from rev 11119, projects/haf/trunk/gnomevfs-obex/debian/osso-gnomevfs-extra.install)

Copied: projects/haf/trunk/gnomevfs-obex/debian/gnomevfs-obex.postinst (from rev 11119, projects/haf/trunk/gnomevfs-obex/debian/osso-gnomevfs-extra.postinst)

Deleted: projects/haf/trunk/gnomevfs-obex/debian/osso-gnomevfs-extra-dev.install
===================================================================
--- projects/haf/trunk/gnomevfs-obex/debian/osso-gnomevfs-extra-dev.install	2007-04-20 07:19:33 UTC (rev 11160)
+++ projects/haf/trunk/gnomevfs-obex/debian/osso-gnomevfs-extra-dev.install	2007-04-20 07:33:48 UTC (rev 11161)
@@ -1,2 +0,0 @@
-usr/include/obex-vfs-utils-1/obex-vfs-utils/*.h
-usr/lib/pkgconfig/obex-vfs-utils.pc

Deleted: projects/haf/trunk/gnomevfs-obex/debian/osso-gnomevfs-extra.dirs
===================================================================
--- projects/haf/trunk/gnomevfs-obex/debian/osso-gnomevfs-extra.dirs	2007-04-20 07:19:33 UTC (rev 11160)
+++ projects/haf/trunk/gnomevfs-obex/debian/osso-gnomevfs-extra.dirs	2007-04-20 07:33:48 UTC (rev 11161)
@@ -1,3 +0,0 @@
-usr/lib
-usr/lib/gnome-vfs-2.0/modules
-etc/gnome-vfs-2.0/modules

Deleted: projects/haf/trunk/gnomevfs-obex/debian/osso-gnomevfs-extra.install
===================================================================
--- projects/haf/trunk/gnomevfs-obex/debian/osso-gnomevfs-extra.install	2007-04-20 07:19:33 UTC (rev 11160)
+++ projects/haf/trunk/gnomevfs-obex/debian/osso-gnomevfs-extra.install	2007-04-20 07:33:48 UTC (rev 11161)
@@ -1,3 +0,0 @@
-etc/gnome-vfs-2.0/modules/*.conf
-usr/lib/libobex-vfs-utils.so
-usr/lib/gnome-vfs-2.0/modules/*.so

Deleted: projects/haf/trunk/gnomevfs-obex/debian/osso-gnomevfs-extra.postinst
===================================================================
--- projects/haf/trunk/gnomevfs-obex/debian/osso-gnomevfs-extra.postinst	2007-04-20 07:19:33 UTC (rev 11160)
+++ projects/haf/trunk/gnomevfs-obex/debian/osso-gnomevfs-extra.postinst	2007-04-20 07:33:48 UTC (rev 11161)
@@ -1,6 +0,0 @@
-#!/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-file-module.conf
-fi

Modified: projects/haf/trunk/gnomevfs-obex/debian/rules
===================================================================
--- projects/haf/trunk/gnomevfs-obex/debian/rules	2007-04-20 07:19:33 UTC (rev 11160)
+++ projects/haf/trunk/gnomevfs-obex/debian/rules	2007-04-20 07:33:48 UTC (rev 11161)
@@ -31,13 +31,10 @@
 	NOCONFIGURE=1 ./autogen.sh
 
 	./configure $(confflags) \
-		--prefix=/usr --sysconfdir=/etc \
-		--localstatedir=/var \
-		--with-doc-dir=$(CURDIR)/debian/tmp/usr/share/doc
+		--prefix=/usr --sysconfdir=/etc --localstatedir=/var
 
 	touch configure-stamp
 
-
 build: build-stamp
 build-stamp: configure-stamp 
 	dh_testdir
@@ -71,7 +68,7 @@
 	dh_installchangelogs 
 	dh_installdocs README obex-module/README.unsupported obex-module/docs/*.txt
 	dh_link
-	dh_strip --dbg-package=osso-gnomevfs-extra
+	dh_strip --dbg-package=gnomevfs-obex
 	dh_compress
 	dh_fixperms
 	dh_makeshlibs -V
More information about the maemo-commits mailing list