[Pkg-utopia-commits] r1916 - in /packages/unstable/gnome-volume-manager/debian: changelog control gnome-volume-manager-gthumb patches/01_set_defaults.patch rules

slomo at users.alioth.debian.org slomo at users.alioth.debian.org
Sun Dec 9 13:49:14 UTC 2007 

Author: slomo
Date: Sun Dec  9 13:49:14 2007
New Revision: 1916

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=1916
Log:
* New upstream release.
* debian/gnome-volume-manager-gthumb:
  + Accept arbitrary capitalization of the 'dcim' folder of photo
    volumes (Closes: #452400).
    Taken from the Ubuntu package, change by Martin Pitt.
* debian/rules:
  + Move g-v-m autostart file to the new location /etc/xdg/autostart.
    Also taken from the Ubuntu package.
* debian/control:
  + Suggest wine for the new autorun feature (disabled by default).
* debian/patches/01_set_defaults.patch,
  debian/control:
  + Updated for the new version and use/suggest serpentine as default
    audio burn application.

Modified:
    packages/unstable/gnome-volume-manager/debian/changelog
    packages/unstable/gnome-volume-manager/debian/control
    packages/unstable/gnome-volume-manager/debian/gnome-volume-manager-gthumb
    packages/unstable/gnome-volume-manager/debian/patches/01_set_defaults.patch
    packages/unstable/gnome-volume-manager/debian/rules

Modified: packages/unstable/gnome-volume-manager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/gnome-volume-manager/debian/changelog?rev=1916&op=diff
==============================================================================
--- packages/unstable/gnome-volume-manager/debian/changelog (original)
+++ packages/unstable/gnome-volume-manager/debian/changelog Sun Dec  9 13:49:14 2007
@@ -1,5 +1,6 @@
-gnome-volume-manager (2.17.0-3) UNRELEASED; urgency=low
-
+gnome-volume-manager (2.22.0-1) UNRELEASED; urgency=low
+
+  [ Michael Biebl ]
   * debian/control
     - Add build dependency on autotools-dev for up-to-date config.{guess,sub}
       files.
@@ -7,7 +8,23 @@
   * debian/watch
     - Add a watch file to track upstream releases.
 
- -- Michael Biebl <biebl at debian.org>  Tue, 06 Nov 2007 12:39:30 +0100
+  [ Sebastian Dröge ]
+  * New upstream release.
+  * debian/gnome-volume-manager-gthumb:
+    + Accept arbitrary capitalization of the 'dcim' folder of photo
+      volumes (Closes: #452400).
+      Taken from the Ubuntu package, change by Martin Pitt.
+  * debian/rules:
+    + Move g-v-m autostart file to the new location /etc/xdg/autostart.
+      Also taken from the Ubuntu package.
+  * debian/control:
+    + Suggest wine for the new autorun feature (disabled by default).
+  * debian/patches/01_set_defaults.patch,
+    debian/control:
+    + Updated for the new version and use/suggest serpentine as default
+      audio burn application.
+
+ -- Sebastian Dröge <slomo at debian.org>  Sun, 09 Dec 2007 14:25:31 +0100
 
 gnome-volume-manager (2.17.0-2) unstable; urgency=low
 

Modified: packages/unstable/gnome-volume-manager/debian/control
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/gnome-volume-manager/debian/control?rev=1916&op=diff
==============================================================================
--- packages/unstable/gnome-volume-manager/debian/control (original)
+++ packages/unstable/gnome-volume-manager/debian/control Sun Dec  9 13:49:14 2007
@@ -2,7 +2,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Sjoerd Simons <sjoerd at debian.org>
-Uploaders: Michael Biebl <biebl at debian.org>
+Uploaders: Michael Biebl <biebl at debian.org>, Sebastian Dröge <slomo at debian.org>
 Build-Depends: cdbs, debhelper (>= 5.0.0), autotools-dev, libdbus-glib-1-dev (>=0.60), libhal-dev (>=0.5.4), libglade2-dev, libgnomeui-dev, libxml-parser-perl, libgtk2.0-dev (>= 2.6.0), libnotify-dev (>= 0.3.0)
 Standards-Version: 3.7.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/gnome-volume-manager
@@ -13,6 +13,7 @@
 Conflicts: magicdev
 Depends: ${shlibs:Depends}, ${misc:Depends}, hal (>= 0.5.5.1), gnome-mount
 Recommends: nautilus-cd-burner, totem, gnome-media, gthumb
+Suggests: wine
 Description: GNOME daemon to auto-mount and manage media devices
  gnome-volume-manager is a GNOME daemon that acts as a policy agent in
  top of the kernel, udev, d-bus and HAL. It listens to HAL events and

Modified: packages/unstable/gnome-volume-manager/debian/gnome-volume-manager-gthumb
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/gnome-volume-manager/debian/gnome-volume-manager-gthumb?rev=1916&op=diff
==============================================================================
--- packages/unstable/gnome-volume-manager/debian/gnome-volume-manager-gthumb (original)
+++ packages/unstable/gnome-volume-manager/debian/gnome-volume-manager-gthumb Sun Dec  9 13:49:14 2007
@@ -4,8 +4,9 @@
   gthumb --import-photos
 else
   ROOT=${MOUNT_POINT}
-  if test -d "$ROOT/dcim"; then
-    ROOT="${ROOT}/dcim/"
+  dcim=$(ls "${ROOT}" | grep -i dcim)
+  if [ $? -eq 0 ]; then
+    ROOT="${ROOT}/$dcim"
     # if there is only one dir in the dcim directory, enter it
     if test $(/bin/ls -1 "${ROOT}" | wc -l)  -eq 1; then
       ROOT="${ROOT}/$(ls -1 "${ROOT}" | head -n 1)"

Modified: packages/unstable/gnome-volume-manager/debian/patches/01_set_defaults.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/gnome-volume-manager/debian/patches/01_set_defaults.patch?rev=1916&op=diff
==============================================================================
--- packages/unstable/gnome-volume-manager/debian/patches/01_set_defaults.patch (original)
+++ packages/unstable/gnome-volume-manager/debian/patches/01_set_defaults.patch Sun Dec  9 13:49:14 2007
@@ -1,16 +1,15 @@
-diff -Naur gnome-volume-manager-2.15.0.vanilla/gnome-volume-manager.schemas.in gnome-volume-manager-2.15.0/gnome-volume-manager.schemas.in
---- gnome-volume-manager-2.15.0.vanilla/gnome-volume-manager.schemas.in	2006-09-27 21:52:23.000000000 +0200
-+++ gnome-volume-manager-2.15.0/gnome-volume-manager.schemas.in	2006-09-27 21:52:31.000000000 +0200
-@@ -98,7 +98,7 @@
+--- gnome-volume-manager.schemas.in.old	2007-12-09 14:40:32.000000000 +0100
++++ gnome-volume-manager.schemas.in	2007-12-09 14:47:24.000000000 +0100
+@@ -109,7 +109,7 @@
          <key>/schemas/desktop/gnome/volume_manager/autoplay_cda_command</key>
  	<applyto>/desktop/gnome/volume_manager/autoplay_cda_command</applyto>
  	<type>string</type>
--	<default>totem %d</default>
+-	<default>gnome-cd --unique --play --device=%d</default>
 +	<default>sound-juicer -d %d</default>
  	<locale name="C">
  	  <short>CD play command</short>
  	  <long>Command to run when an audio CD is inserted.</long>
-@@ -109,7 +109,7 @@
+@@ -120,7 +120,7 @@
          <key>/schemas/desktop/gnome/volume_manager/autoburn</key>
  	<applyto>/desktop/gnome/volume_manager/autoburn</applyto>
  	<type>bool</type>
@@ -19,7 +18,16 @@
  	<locale name="C">
  	  <short>Run a program to burn CDs/DVDs</short>
  	  <long>Whether, when a blank CD or DVD is inserted, gnome-volume-manager
-@@ -155,7 +155,7 @@
+@@ -132,7 +132,7 @@
+         <key>/schemas/desktop/gnome/volume_manager/autoburn_audio_cd_command</key>
+ 	<applyto>/desktop/gnome/volume_manager/autoburn_audio_cd_command</applyto>
+ 	<type>string</type>
+-	<default>nautilus --no-desktop burn:</default>
++	<default>serpentine</default>
+ 	<locale name="C">
+ 	  <short>Audio CD burn command</short>
+ 	  <long>Command to run when the user wishes to burn an Audio CD.</long>
+@@ -166,7 +166,7 @@
          <key>/schemas/desktop/gnome/volume_manager/autoplay_dvd_command</key>
  	<applyto>/desktop/gnome/volume_manager/autoplay_dvd_command</applyto>
  	<type>string</type>
@@ -28,7 +36,7 @@
  	<locale name="C">
  	  <short>DVD play command</short>
  	  <long>Command to run when a video DVD is inserted.</long>
-@@ -178,7 +178,7 @@
+@@ -189,7 +189,7 @@
          <key>/schemas/desktop/gnome/volume_manager/autoplay_vcd_command</key>
  	<applyto>/desktop/gnome/volume_manager/autoplay_vcd_command</applyto>
  	<type>string</type>
@@ -37,7 +45,7 @@
  	<locale name="C">
  	  <short>VCD play command</short>
  	  <long>Command to run when a video VCD is inserted.</long>
-@@ -189,7 +189,7 @@
+@@ -200,7 +200,7 @@
          <key>/schemas/desktop/gnome/volume_manager/autophoto</key>
  	<applyto>/desktop/gnome/volume_manager/autophoto</applyto>
  	<type>bool</type>
@@ -46,7 +54,7 @@
  	<locale name="C">
  	  <short>Run photo management command</short>
  	  <long>Whether, when a digital camera is connected or media from a
-@@ -202,7 +202,7 @@
+@@ -213,7 +213,7 @@
          <key>/schemas/desktop/gnome/volume_manager/autophoto_command</key>
  	<applyto>/desktop/gnome/volume_manager/autophoto_command</applyto>
  	<type>string</type>
@@ -55,7 +63,7 @@
  	<locale name="C">
  	  <short>Photo management command</short>
  	  <long>Command to run when a digital camera is connected or media 
-@@ -214,7 +214,7 @@
+@@ -225,7 +225,7 @@
          <key>/schemas/desktop/gnome/volume_manager/autoipod</key>
  	<applyto>/desktop/gnome/volume_manager/autoipod</applyto>
  	<type>bool</type>
@@ -64,7 +72,7 @@
  	<locale name="C">
  	  <short>Run iPod program</short>
  	  <long>Whether, when an iPod is connected, gnome-volume-manager should run
-@@ -226,7 +226,7 @@
+@@ -237,7 +237,7 @@
          <key>/schemas/desktop/gnome/volume_manager/autoipod_command</key>
  	<applyto>/desktop/gnome/volume_manager/autoipod_command</applyto>
  	<type>string</type>
@@ -73,7 +81,7 @@
  	<locale name="C">
  	  <short>iPod sync command</short>
  	  <long>Command to run when an iPod is connected.</long>
-@@ -237,7 +237,7 @@
+@@ -248,7 +248,7 @@
          <key>/schemas/desktop/gnome/volume_manager/autoprinter</key>
  	<applyto>/desktop/gnome/volume_manager/autoprinter</applyto>
  	<type>bool</type>
@@ -82,7 +90,7 @@
  	<locale name="C">
  	  <short>Run printer program</short>
  	  <long>Whether, when a printer is connected, gnome-volume-manager should run
-@@ -249,7 +249,7 @@
+@@ -260,7 +260,7 @@
          <key>/schemas/desktop/gnome/volume_manager/autoprinter_command</key>
  	<applyto>/desktop/gnome/volume_manager/autoprinter_command</applyto>
  	<type>string</type>
@@ -91,7 +99,7 @@
  	<locale name="C">
  	  <short>printer command</short>
  	  <long>Command to run when a printer is connected.</long>
-@@ -260,7 +260,7 @@
+@@ -271,7 +271,7 @@
          <key>/schemas/desktop/gnome/volume_manager/autoscanner</key>
  	<applyto>/desktop/gnome/volume_manager/autoscanner</applyto>
  	<type>bool</type>
@@ -100,7 +108,7 @@
  	<locale name="C">
  	  <short>Run scanner program</short>
  	  <long>Whether, when a scanner is connected, gnome-volume-manager should run
-@@ -272,7 +272,7 @@
+@@ -283,7 +283,7 @@
          <key>/schemas/desktop/gnome/volume_manager/autoscanner_command</key>
  	<applyto>/desktop/gnome/volume_manager/autoscanner_command</applyto>
  	<type>string</type>

Modified: packages/unstable/gnome-volume-manager/debian/rules
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/gnome-volume-manager/debian/rules?rev=1916&op=diff
==============================================================================
--- packages/unstable/gnome-volume-manager/debian/rules (original)
+++ packages/unstable/gnome-volume-manager/debian/rules Sun Dec  9 13:49:14 2007
@@ -9,3 +9,7 @@
 common-install-impl::
 	install -m 755 debian/gnome-volume-manager-gthumb \
 		$(DEB_DESTDIR)/usr/bin
+	mkdir -p $(DEB_DESTDIR)/etc/xdg/autostart
+	mv $(DEB_DESTDIR)/usr/share/gnome/autostart/gnome-volume-manager.desktop \
+		$(DEB_DESTDIR)/etc/xdg/autostart
+	rmdir --ignore-fail-on-non-empty -p $(DEB_DESTDIR)/usr/share/gnome/autostart

More information about the Pkg-utopia-commits mailing list