[Pkg-xfce-commits] r3608 - in desktop/trunk/exo/debian: . patches

Yves-Alexis Perez corsac at alioth.debian.org
Mon Oct 19 11:47:56 UTC 2009 

Author: corsac
Date: 2009-10-19 11:47:56 +0000 (Mon, 19 Oct 2009)
New Revision: 3608

Added:
   desktop/trunk/exo/debian/patches/
   desktop/trunk/exo/debian/patches/01_mount-async.patch
   desktop/trunk/exo/debian/patches/series
Modified:
   desktop/trunk/exo/debian/changelog
   desktop/trunk/exo/debian/control
   desktop/trunk/exo/debian/rules
Log:
* debian/control:
  - add an exo-utils-dbg package containing debug symbols for the exo-utils
    binaries.
* debian/rules:
  - use variables for library name, soversion and version.
* debian/control:
  - add build-dep on quilt
* debian/rules:
  - call {,un}patch targets when needed, include quilt rules.
* debian/patches:
  - 01_mount-async added, don't mount all volumes with sync.

Modified: desktop/trunk/exo/debian/changelog
===================================================================
--- desktop/trunk/exo/debian/changelog	2009-10-19 11:27:30 UTC (rev 3607)
+++ desktop/trunk/exo/debian/changelog	2009-10-19 11:47:56 UTC (rev 3608)
@@ -1,5 +1,26 @@
-exo (0.3.105-1) UNRELEASED; urgency=low
+exo (0.3.105-3) UNRELEASED; urgency=low
 
+  * debian/control:
+    - add an exo-utils-dbg package containing debug symbols for the exo-utils
+      binaries.
+  * debian/rules:
+    - use variables for library name, soversion and version.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Mon, 19 Oct 2009 13:46:56 +0200
+
+exo (0.3.105-2) unstable; urgency=low
+
+  * debian/control:
+    - add build-dep on quilt
+  * debian/rules:
+    - call {,un}patch targets when needed, include quilt rules.
+  * debian/patches:
+    - 01_mount-async added, don't mount all volumes with sync.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 18 Oct 2009 23:20:26 +0200
+
+exo (0.3.105-1) unstable; urgency=low
+
   * New upstream release.
   * add a new libexo-common packages containing mount options file,
     documentation, helper files.
@@ -11,7 +32,7 @@
   * debian/control:
     - drop quilt build-dep.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sat, 17 Oct 2009 22:45:10 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 18 Oct 2009 18:22:22 +0200
 
 exo (0.3.104-2) unstable; urgency=low
 

Modified: desktop/trunk/exo/debian/control
===================================================================
--- desktop/trunk/exo/debian/control	2009-10-19 11:27:30 UTC (rev 3607)
+++ desktop/trunk/exo/debian/control	2009-10-19 11:47:56 UTC (rev 3608)
@@ -5,7 +5,7 @@
 Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>, Michael Casadevall <sonicmctails at gmail.com>
 Build-Depends: debhelper (>= 5.0.0), libxfcegui4-dev (>= 4.6.0),
  liburi-perl, chrpath, libhal-storage-dev [!hurd-i386], libnotify-dev,
- intltool
+ intltool, quilt
 Standards-Version: 3.8.3
 Homepage: http://libexo.os-cillation.com/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/exo/
@@ -62,6 +62,20 @@
  This packages contains the debugging symbols for libexo, additional library 
  for Xfce.
 
+Package: exo-utils-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: ${shlibs:Depends}, exo-utils (= ${binary:Version})
+Conflicts: libexo-0.3-0-dbg (< 0.3.105-3)
+Description: debugging informations for exo-utils
+ This packages contains the debugging symbols for the utilities shipped in
+ exo-utils:
+  - exo-csource
+  - exo-open
+  - exo-desktop-item-edit
+  - exo-mount
+
 Package: libexo-common
 Section: libs
 Priority: extra

Added: desktop/trunk/exo/debian/patches/01_mount-async.patch
===================================================================
--- desktop/trunk/exo/debian/patches/01_mount-async.patch	                        (rev 0)
+++ desktop/trunk/exo/debian/patches/01_mount-async.patch	2009-10-19 11:47:56 UTC (rev 3608)
@@ -0,0 +1,24 @@
+commit 7aad4f152380e1d2edffdc9a2eb15554f042fbad
+Author: Nick Schermer <nick at xfce.org>
+Date:   Mon Oct 19 00:47:32 2009 +0200
+
+    Only sync devices with no volume.
+    
+    If the devices is pollable and we set the sync option, this
+    will slowdown the transfer. I missed that when changing the
+    code.
+
+diff --git a/exo-mount/exo-mount-hal.c b/exo-mount/exo-mount-hal.c
+index bbf9ca3..d09d0db 100644
+--- a/exo-mount/exo-mount-hal.c
++++ b/exo-mount/exo-mount-hal.c
+@@ -741,7 +741,8 @@ exo_mount_hal_device_mount (ExoMountHalDevice *device,
+         {
+           option = NULL;
+ 
+-          if (strcmp (device->fsoptions[m], "sync") == 0)
++          if (strcmp (device->fsoptions[m], "sync") == 0
++              && device->volume == NULL)
+             {
+               /* non-pollable drive... */
+               option = g_strdup ("sync");

Added: desktop/trunk/exo/debian/patches/series
===================================================================
--- desktop/trunk/exo/debian/patches/series	                        (rev 0)
+++ desktop/trunk/exo/debian/patches/series	2009-10-19 11:47:56 UTC (rev 3608)
@@ -0,0 +1 @@
+01_mount-async.patch

Modified: desktop/trunk/exo/debian/rules
===================================================================
--- desktop/trunk/exo/debian/rules	2009-10-19 11:27:30 UTC (rev 3607)
+++ desktop/trunk/exo/debian/rules	2009-10-19 11:47:56 UTC (rev 3608)
@@ -4,14 +4,18 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-#include /usr/share/quilt/quilt.make
+EXO_VERSION=0.3
+EXO_LIBNAME=0.3
+EXO_SOVERSION=0
 
+include /usr/share/quilt/quilt.make
+
 config.status: configure
 	dh_testdir
 	# Add here commands to configure the package.
-	 ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc --libexecdir=/usr/lib/libexo-0.3-0 --enable-final --disable-gtk-doc --disable-python --enable-notifications
+	 ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc --libexecdir=/usr/lib/libexo-$(EXO_VERSION)-$(EXO_SOVERSION) --enable-final --disable-gtk-doc --disable-python --enable-notifications
 
-build: build-stamp
+build: patch build-stamp
 build-stamp:  config.status
 	dh_testdir
 
@@ -20,7 +24,7 @@
 
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp 
@@ -40,8 +44,8 @@
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
 	# delete the unneeded .a and .la files
-	rm -f debian/tmp/usr/lib/libexo-hal-0.3.la
-	rm -f debian/tmp/usr/lib/libexo-0.3.la
+	rm -f debian/tmp/usr/lib/libexo-hal-$(EXO_LIBNAME).la
+	rm -f debian/tmp/usr/lib/libexo-$(EXO_LIBNAME).la
 
 	# Debianise
 	sed -i -e 's/^WebBrowser=.*/WebBrowser=debian-sensible-browser/' \
@@ -52,9 +56,9 @@
 		debian/tmp/usr/bin/exo-desktop-item-edit \
 		debian/tmp/usr/bin/exo-open \
 		debian/tmp/usr/bin/exo-mount \
-		debian/tmp/usr/lib/libexo-0.3-0/exo-helper-0.3 \
-		debian/tmp/usr/lib/libexo-0.3*.so.* \
-		debian/tmp/usr/lib/libexo-hal-0.3*.so.* \
+		debian/tmp/usr/lib/libexo-$(EXO_VERSION)-$(EXO_SOVERSION)/exo-helper-$(EXO_LIBNAME) \
+		debian/tmp/usr/lib/libexo-$(EXO_LIBNAME)*.so.* \
+		debian/tmp/usr/lib/libexo-hal-$(EXO_LIBNAME)*.so.* \
 
 	# Create a muttng helper from the mutt one
 	sed -e 's/utt/uttng/;s/Icon=muttng/Icon=mutt/' \
@@ -76,7 +80,11 @@
 	dh_installexamples
 	dh_install --fail-missing --sourcedir=debian/tmp
 	dh_link
-	dh_strip --dbg-package=libexo-0.3-0-dbg
+	dh_strip -p libexo-$(EXO_LIBNAME)-$(EXO_SOVERSION) \
+		--dbg-package=libexo-$(EXO_LIBNAME)-$(EXO_SOVERSION)-dbg
+	dh_strip -p exo-utils --dbg-package=exo-utils-dbg
+	dh_strip --remaining-packages
+
 	dh_compress
 	dh_fixperms
 	dh_makeshlibs

More information about the Pkg-xfce-commits mailing list