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

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Tue Apr 7 18:23:19 UTC 2009 

Author: biebl
Date: Tue Apr  7 18:23:19 2009
New Revision: 3018

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3018
Log:
Merged revisions 2529-2530,2554-2557,2971-2972,2974-2978 via svnmerge from 
svn+ssh://biebl@svn.debian.org/svn/pkg-utopia/packages/experimental/gnome-volume-manager

........
  r2529 | biebl | 2008-12-05 19:47:51 +0100 (Fr, 05 Dez 2008) | 2 lines
  
  Update to latest upstream release 2.24.0
........
  r2530 | biebl | 2008-12-05 19:49:37 +0100 (Fr, 05 Dez 2008) | 2 lines
  
  * debian/rules
    - Disable automounting. This is done by nautilus now. Closes: #507736
........
  r2554 | biebl | 2008-12-13 01:58:31 +0100 (Sa, 13 Dez 2008) | 5 lines
  
  * debian/patches/01_set_defaults.patch
    - Update defaults. Remove entries which are no longer handled by g-v-m,
      i.e. autoplay_cda, autoburn_audio_cd, autoplay_dvd, autoplay_vcd and
      autophoto. Also leave the default for autoprinter_command blank, as
      printer configuration is handled by system-config-printer now.
........
  r2555 | biebl | 2008-12-13 02:08:13 +0100 (Sa, 13 Dez 2008) | 2 lines
  
  * debian/gnome-volume-manager-gthumb
    - Drop custom gthumb helper script as it is no longer required.
........
  r2556 | biebl | 2008-12-13 02:19:15 +0100 (Sa, 13 Dez 2008) | 2 lines
  
  Actually leave autoprinter_command blank.
........
  r2557 | biebl | 2008-12-13 02:24:36 +0100 (Sa, 13 Dez 2008) | 2 lines
  
  Upload to experimental
........
  r2971 | biebl | 2009-03-14 16:55:45 +0100 (Sa, 14 Mär 2009) | 1 line
  
  New upstream release.
........
  r2972 | biebl | 2009-03-14 16:56:32 +0100 (Sa, 14 Mär 2009) | 2 lines
  
  * debian/control
    - Bump Standards-Version to 3.8.1. No further changes.
........
  r2974 | biebl | 2009-03-15 19:54:25 +0100 (So, 15 Mär 2009) | 1 line
  
  Supports CK 0.3 API and previous versions. Closes: #519550
........
  r2975 | biebl | 2009-03-15 19:54:45 +0100 (So, 15 Mär 2009) | 1 line
  
  Upload to experimental
........
  r2976 | biebl | 2009-03-15 20:03:35 +0100 (So, 15 Mär 2009) | 1 line
  
  back to UNRELEASED
........
  r2977 | biebl | 2009-03-15 20:04:06 +0100 (So, 15 Mär 2009) | 1 line
  
  Add Build-Depends on intltool (>= 0.35.0).
........
  r2978 | biebl | 2009-03-15 20:16:16 +0100 (So, 15 Mär 2009) | 1 line
  
  Upload to experimental
........

Removed:
    packages/unstable/gnome-volume-manager/debian/gnome-volume-manager-gthumb
Modified:
    packages/unstable/gnome-volume-manager/   (props changed)
    packages/unstable/gnome-volume-manager/debian/changelog
    packages/unstable/gnome-volume-manager/debian/control
    packages/unstable/gnome-volume-manager/debian/patches/01_set_defaults.patch
    packages/unstable/gnome-volume-manager/debian/rules

Propchange: packages/unstable/gnome-volume-manager/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Apr  7 18:23:19 2009
@@ -1,1 +1,1 @@
-/packages/experimental/gnome-volume-manager:1-2528
+/packages/experimental/gnome-volume-manager:1-3017

Modified: packages/unstable/gnome-volume-manager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/gnome-volume-manager/debian/changelog?rev=3018&op=diff
==============================================================================
--- packages/unstable/gnome-volume-manager/debian/changelog (original)
+++ packages/unstable/gnome-volume-manager/debian/changelog Tue Apr  7 18:23:19 2009
@@ -1,4 +1,14 @@
-gnome-volume-manager (2.22.5-1) UNRELEASED; urgency=low
+gnome-volume-manager (2.24.1-1) experimental; urgency=low
+
+  * New upstream release.
+    - Supports CK 0.3 API and previous versions. Closes: #519550
+  * debian/control
+    - Bump Standards-Version to 3.8.1. No further changes.
+    - Add Build-Depends on intltool (>= 0.35.0).
+
+ -- Michael Biebl <biebl at debian.org>  Sun, 15 Mar 2009 20:15:58 +0100
+
+gnome-volume-manager (2.24.0-1) experimental; urgency=low
 
   [ Michael Biebl ]
   * debian/control
@@ -11,7 +21,18 @@
   * New upstream release. Closes: #473808.
   * Launch serpentine with parameters telling it which CD recorder to use.
 
- -- Michael Biebl <biebl at debian.org>  Sat, 12 Jul 2008 03:40:36 +0200
+  [ Michael Biebl ]
+  * debian/rules
+    - Disable automounting. This is done by nautilus now. Closes: #507736
+  * debian/patches/01_set_defaults.patch
+    - Update defaults. Remove entries which are no longer handled by g-v-m,
+      i.e. autoplay_cda, autoburn_audio_cd, autoplay_dvd, autoplay_vcd and
+      autophoto. Also leave the default for autoprinter_command blank, as
+      printer configuration is handled by system-config-printer now.
+  * debian/gnome-volume-manager-gthumb
+    - Drop custom gthumb helper script as it is no longer required.
+
+ -- Michael Biebl <biebl at debian.org>  Sat, 13 Dec 2008 02:23:54 +0100
 
 gnome-volume-manager (2.22.1-1) 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=3018&op=diff
==============================================================================
--- packages/unstable/gnome-volume-manager/debian/control (original)
+++ packages/unstable/gnome-volume-manager/debian/control Tue Apr  7 18:23:19 2009
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Sjoerd Simons <sjoerd 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, pkg-config, 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.8.0
+Build-Depends: cdbs, debhelper (>= 5.0.0), autotools-dev, pkg-config, 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), intltool (>= 0.35.0)
+Standards-Version: 3.8.1
 Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/gnome-volume-manager
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/gnome-volume-manager
 

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=3018&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 Tue Apr  7 18:23:19 2009
@@ -1,68 +1,5 @@
---- gnome-volume-manager.schemas.in.old	2007-12-09 14:40:32.000000000 +0100
-+++ gnome-volume-manager.schemas.in	2007-12-11 10:06:11.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>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>
-@@ -120,7 +120,7 @@
-         <key>/schemas/desktop/gnome/volume_manager/autoburn</key>
- 	<applyto>/desktop/gnome/volume_manager/autoburn</applyto>
- 	<type>bool</type>
--	<default>false</default>
-+	<default>true</default>
- 	<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
-@@ -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 --device %d</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>
--	<default>totem %d</default>
-+	<default>totem %m</default>
- 	<locale name="C">
- 	  <short>DVD play command</short>
- 	  <long>Command to run when a video DVD is inserted.</long>
-@@ -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>
--	<default>totem %d</default>
-+	<default>totem %m</default>
- 	<locale name="C">
- 	  <short>VCD play command</short>
- 	  <long>Command to run when a video VCD is inserted.</long>
-@@ -200,7 +200,7 @@
-         <key>/schemas/desktop/gnome/volume_manager/autophoto</key>
- 	<applyto>/desktop/gnome/volume_manager/autophoto</applyto>
- 	<type>bool</type>
--	<default>false</default>
-+	<default>true</default>
- 	<locale name="C">
- 	  <short>Run photo management command</short>
- 	  <long>Whether, when a digital camera is connected or media from a
-@@ -213,7 +213,7 @@
-         <key>/schemas/desktop/gnome/volume_manager/autophoto_command</key>
- 	<applyto>/desktop/gnome/volume_manager/autophoto_command</applyto>
- 	<type>string</type>
--	<default></default>
-+	<default>gnome-volume-manager-gthumb %h</default>
- 	<locale name="C">
- 	  <short>Photo management command</short>
- 	  <long>Command to run when a digital camera is connected or media 
+--- gnome-volume-manager.schemas.in.old	2008-12-13 02:17:18.000000000 +0100
++++ gnome-volume-manager.schemas.in	2008-12-13 02:17:52.000000000 +0100
 @@ -225,7 +225,7 @@
          <key>/schemas/desktop/gnome/volume_manager/autoipod</key>
  	<applyto>/desktop/gnome/volume_manager/autoipod</applyto>

Modified: packages/unstable/gnome-volume-manager/debian/rules
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/gnome-volume-manager/debian/rules?rev=3018&op=diff
==============================================================================
--- packages/unstable/gnome-volume-manager/debian/rules (original)
+++ packages/unstable/gnome-volume-manager/debian/rules Tue Apr  7 18:23:19 2009
@@ -4,9 +4,5 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/gnome.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS := --disable-multiuser
+DEB_CONFIGURE_EXTRA_FLAGS := --disable-multiuser --disable-automount
 
-common-install-impl::
-	install -m 755 debian/gnome-volume-manager-gthumb \
-		$(DEB_DESTDIR)/usr/bin
-

More information about the Pkg-utopia-commits mailing list