[Pkg-utopia-commits] r172 - in packages/gnome-volume-manager/trunk/debian: . patches
Sjoerd Simons
sjoerd@costa.debian.org
Tue, 08 Feb 2005 13:49:43 +0100
Author: sjoerd
Date: 2005-02-08 13:49:43 +0100 (Tue, 08 Feb 2005)
New Revision: 172
Modified:
packages/gnome-volume-manager/trunk/debian/changelog
packages/gnome-volume-manager/trunk/debian/patches/03_browse_fixup.patch
packages/gnome-volume-manager/trunk/debian/patches/08_fr.patch
packages/gnome-volume-manager/trunk/debian/patches/30_26_kernel_hint.patch
packages/gnome-volume-manager/trunk/debian/rules
Log:
Updated everything for the new upstream release
Modified: packages/gnome-volume-manager/trunk/debian/changelog
===================================================================
--- packages/gnome-volume-manager/trunk/debian/changelog 2005-01-25 15:59:43 UTC (rev 171)
+++ packages/gnome-volume-manager/trunk/debian/changelog 2005-02-08 12:49:43 UTC (rev 172)
@@ -1,3 +1,14 @@
+gnome-volume-manager (1.1.3-1) unstable; urgency=low
+
+ * New upstream release
+ * Updates patches to work with the new release
+ + debian/patches/03_browse_fixup.patch
+ + debian/patches/08_fr.patch
+ + debian/patches/30_26_kernel_hint.patch
+
+
+ -- Sjoerd Simons <sjoerd@debian.org> Tue, 8 Feb 2005 13:34:41 +0100
+
gnome-volume-manager (1.1.2-5) unstable; urgency=low
* debian/patches/20_specify_programs.patch
Modified: packages/gnome-volume-manager/trunk/debian/patches/03_browse_fixup.patch
===================================================================
--- packages/gnome-volume-manager/trunk/debian/patches/03_browse_fixup.patch 2005-01-25 15:59:43 UTC (rev 171)
+++ packages/gnome-volume-manager/trunk/debian/patches/03_browse_fixup.patch 2005-02-08 12:49:43 UTC (rev 172)
@@ -1,7 +1,7 @@
-diff -ruN gnome-volume-manager-old/src/manager.c gnome-volume-manager/src/manager.c
---- gnome-volume-manager-old/src/manager.c 2004-10-25 21:12:11.000000000 +0200
-+++ gnome-volume-manager/src/manager.c 2004-11-18 15:04:07.353196661 +0100
-@@ -246,31 +246,32 @@
+diff -ruN gnome-volume-manager-1.1.3-old/src/manager.c gnome-volume-manager-1.1.3/src/manager.c
+--- gnome-volume-manager-1.1.3-old/src/manager.c 2005-02-01 07:01:05.000000000 +0100
++++ gnome-volume-manager-1.1.3/src/manager.c 2005-02-08 13:13:08.139265849 +0100
+@@ -256,31 +256,32 @@
/*
* gvm_check_dvd - is this a Video DVD? If so, do something about it.
*
@@ -41,8 +41,8 @@
+ return FALSE;
}
- #define ASK_PHOTOS_MSG "There are photographs on this device.\n\n" \
-@@ -282,7 +283,8 @@
+ /*
+@@ -288,7 +289,8 @@
* unit from a digital camera (e.g., a compact flash card). If it is, then
* ask the user if he wants to import the photos.
*
@@ -52,7 +52,7 @@
*
* FIXME: Should probably not prompt the user and just do it automatically.
* This now makes sense, as gphoto added an import mode.
-@@ -300,7 +302,6 @@
+@@ -306,7 +308,6 @@
if (!g_file_test (dcim_path, G_FILE_TEST_IS_DIR))
goto out;
@@ -60,11 +60,11 @@
dbg ("Photos detected: %s\n", dcim_path);
/* add the "content.photos" capability to this device */
-@@ -308,6 +309,7 @@
+@@ -314,6 +315,7 @@
warn ("failed to set content.photos on %s\n", device);
if (config.autophoto) {
-+ retval = TRUE;
- askme = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_QUESTION,
++ retval=TRUE;
+ askme = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_WARNING,
GTK_BUTTONS_NONE,
- _(ASK_PHOTOS_MSG));
+ _("Import photos from device?"));
Modified: packages/gnome-volume-manager/trunk/debian/patches/08_fr.patch
===================================================================
--- packages/gnome-volume-manager/trunk/debian/patches/08_fr.patch 2005-01-25 15:59:43 UTC (rev 171)
+++ packages/gnome-volume-manager/trunk/debian/patches/08_fr.patch 2005-02-08 12:49:43 UTC (rev 172)
@@ -1,6 +1,6 @@
-diff -ruN gnome-volume-manager-old/po/fr.po gnome-volume-manager/po/fr.po
---- gnome-volume-manager-old/po/fr.po 2004-10-30 17:09:30.000000000 +0200
-+++ gnome-volume-manager/po/fr.po 2004-11-17 15:56:39.625725390 +0100
+diff -ruN gnome-volume-manager-1.1.3-old/po/fr.po gnome-volume-manager-1.1.3/po/fr.po
+--- gnome-volume-manager-1.1.3-old/po/fr.po 2005-02-01 17:49:16.000000000 +0100
++++ gnome-volume-manager-1.1.3/po/fr.po 2005-02-08 13:23:48.167625211 +0100
@@ -32,9 +32,8 @@
msgstr "Montage automatique des média amovibles"
@@ -36,14 +36,36 @@
#: gnome-volume-manager.schemas.in.h:16
msgid "Perform autorun"
-@@ -207,9 +205,8 @@
- msgstr "<b>Stockage amovible</b>"
-
- #: gnome-volume-properties.glade.h:9
--#, fuzzy
+@@ -210,7 +208,7 @@
+ #: gnome-volume-properties.glade.h:8
+ #, fuzzy
msgid "Browse _removable media when inserted"
-msgstr "Monter les média amovibles lors de l'_insertion"
+msgstr "Parcourir les média _amovibles lors de l'insertion"
- #: gnome-volume-properties.glade.h:10
- msgid "Command:"
+ #: gnome-volume-properties.glade.h:9
+ #, fuzzy
+diff -ruN gnome-volume-manager-1.1.3-old/po/fr.po.rej gnome-volume-manager-1.1.3/po/fr.po.rej
+--- gnome-volume-manager-1.1.3-old/po/fr.po.rej 1970-01-01 01:00:00.000000000 +0100
++++ gnome-volume-manager-1.1.3/po/fr.po.rej 2005-02-08 13:21:33.138603300 +0100
+@@ -0,0 +1,20 @@
++***************
++*** 207,215 ****
++ msgstr "<b>Stockage amovible</b>"
++
++ #: gnome-volume-properties.glade.h:9
++- #, fuzzy
++ msgid "Browse _removable media when inserted"
++- msgstr "Monter les média amovibles lors de l'_insertion"
++
++ #: gnome-volume-properties.glade.h:10
++ msgid "Command:"
++--- 205,212 ----
++ msgstr "<b>Stockage amovible</b>"
++
++ #: gnome-volume-properties.glade.h:9
++ msgid "Browse _removable media when inserted"
+++ msgstr "Parcourir les média _amovibles lors de l'insertion"
++
++ #: gnome-volume-properties.glade.h:10
++ msgid "Command:"
Modified: packages/gnome-volume-manager/trunk/debian/patches/30_26_kernel_hint.patch
===================================================================
--- packages/gnome-volume-manager/trunk/debian/patches/30_26_kernel_hint.patch 2005-01-25 15:59:43 UTC (rev 171)
+++ packages/gnome-volume-manager/trunk/debian/patches/30_26_kernel_hint.patch 2005-02-08 12:49:43 UTC (rev 172)
@@ -1,13 +1,13 @@
-diff -ruN gnome-volume-manager-old/src/properties.c gnome-volume-manager/src/properties.c
---- gnome-volume-manager-old/src/properties.c 2004-08-13 21:49:44.000000000 +0200
-+++ gnome-volume-manager/src/properties.c 2004-11-29 16:58:34.000000000 +0100
+diff -ruN gnome-volume-manager-1.1.3-old/src/properties.c gnome-volume-manager-1.1.3/src/properties.c
+--- gnome-volume-manager-1.1.3-old/src/properties.c 2005-01-23 23:11:02.000000000 +0100
++++ gnome-volume-manager-1.1.3/src/properties.c 2005-02-08 13:27:04.838032975 +0100
@@ -376,7 +376,8 @@
- "</span>\n\n"
- "The \"hald\" service is required but not currently "
- "running. Enable the service and rerun this applet, "
-- "or contact your system administrator.");
-+ "or contact your system administrator. Note: You "
-+ "need Linux kernel 2.6 for volume management to work.");
+ gtk_message_dialog_format_secondary_text (GTK_DIALOG (dialog),
+ _("The \"hald\" service is required but not currently "
+ "running. Enable the service and rerun this applet, "
+- "or contact your system administrator."));
++ "or contact your system administrator. Note: You "
++ "need Linux kernel 2.6 for volume management to work."));
+
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
- exit (EXIT_FAILURE);
Modified: packages/gnome-volume-manager/trunk/debian/rules
===================================================================
--- packages/gnome-volume-manager/trunk/debian/rules 2005-01-25 15:59:43 UTC (rev 171)
+++ packages/gnome-volume-manager/trunk/debian/rules 2005-02-08 12:49:43 UTC (rev 172)
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
-DEB_TAR_SRCDIR=gnome-volume-manager
+DEB_TAR_SRCDIR=gnome-volume-manager-1.1.3
include /usr/share/cdbs/1/rules/tarball.mk
include /usr/share/cdbs/1/rules/debhelper.mk