[Pkg-amule-commits] [amule] 03/03: migrate from GConf to GSettings; Closes: #699014

Sandro Tosi morph at moszumanska.debian.org
Fri Sep 19 13:01:56 UTC 2014


This is an automated email from the git hooks/post-receive script.

morph pushed a commit to branch master
in repository amule.

commit 411c0033d7a90b0ba056b5e4879980fb09c9bf3b
Author: Sandro Tosi <morph at debian.org>
Date:   Fri Sep 19 14:01:28 2014 +0100

    migrate from GConf to GSettings; Closes: #699014
---
 debian/amule-gnome-support.install             |  2 +-
 debian/rules                                   |  2 +-
 debian/schemas/amule-gnome-support.gschema.xml | 19 +++++++++
 debian/schemas/amule-gnome-support.schemas     | 54 --------------------------
 4 files changed, 21 insertions(+), 56 deletions(-)

diff --git a/debian/amule-gnome-support.install b/debian/amule-gnome-support.install
index 7ca9e67..4990cfa 100644
--- a/debian/amule-gnome-support.install
+++ b/debian/amule-gnome-support.install
@@ -1 +1 @@
-../../debian/schemas/amule-gnome-support.schemas /usr/share/gconf/schemas
+../../debian/schemas/amule-gnome-support.gschema.xml /usr/share/gconf/schemas
diff --git a/debian/rules b/debian/rules
index 40ec18f..5b3adba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -123,7 +123,7 @@ binary-common:
 	dh_installman
 	dh_lintian
 	dh_icons
-	dh_gconf -pamule-gnome-support
+	dh_installgsettings -pamule-gnome-support
 	dh_link
 	dh_strip --dbg-package=amule-dbg
 	dh_compress
diff --git a/debian/schemas/amule-gnome-support.gschema.xml b/debian/schemas/amule-gnome-support.gschema.xml
new file mode 100644
index 0000000..e824314
--- /dev/null
+++ b/debian/schemas/amule-gnome-support.gschema.xml
@@ -0,0 +1,19 @@
+<schemalist>
+  <schema id="org.gnome.aMule" path="/desktop/gnome/url-handlers/ed2k/">
+    <key name="command" type="s">
+      <default>'ed2k "%s"'</default>
+      <summary>The command to handle ed2k URLs</summary>
+      <description>The command to handle ed2k URLs.</description>
+    </key>
+    <key name="needs-terminal" type="b">
+      <default>false</default>
+      <summary>Whether command to handle ed2k URLs needs a terminal</summary>
+      <description>Whether command to handle ed2k URLs needs a terminal.</description>
+    </key>
+    <key name="enabled" type="b">
+      <default>true</default>
+      <summary>Whether command to handle ed2k URLs is enabled</summary>
+      <description>Whether command to handle ed2k URLs is enabled.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/debian/schemas/amule-gnome-support.schemas b/debian/schemas/amule-gnome-support.schemas
deleted file mode 100644
index 21ff91e..0000000
--- a/debian/schemas/amule-gnome-support.schemas
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-<gconfschemafile>
-  <schemalist>
-
-     <schema>
-       <key>/schemas/desktop/gnome/url-handlers/ed2k/command</key>
-       <applyto>/desktop/gnome/url-handlers/ed2k/command</applyto>
-       <owner>amule</owner>
-       <type>string</type>
-       <default>ed2k "%s"</default>
-       <locale name="C">
-	 <short>The command to handle ed2k URLs</short>
-	 <long>The command to handle ed2k URLs.</long>
-       </locale>
-       <locale name="es">
-	 <short>El comando para capturar enlaces ed2k.</short>
-	 <long>El comando para capturar enlaces ed2k.</long>
-       </locale>
-     </schema>
-
-     <schema>
-       <key>/schemas/desktop/gnome/url-handlers/ed2k/needs_terminal</key>
-       <applyto>/desktop/gnome/url-handlers/ed2k/needs_terminal</applyto>
-       <owner>amule</owner>
-       <type>bool</type>
-       <default>false</default>
-       <locale name="C">
-	 <short>Whether command to handle ed2k URLs needs a terminal</short>
-	 <long>Whether command to handle ed2k URLs needs a terminal.</long>
-       </locale>
-       <locale name="es">
-	 <short>El comando necesita una terminal para capturar enlaces ed2k.</short>
-	 <long>El comando necesita una terminal para capturar enlaces ed2k.</long>
-       </locale>
-     </schema>
-
-     <schema>
-       <key>/schemas/desktop/gnome/url-handlers/ed2k/enabled</key>
-       <applyto>/desktop/gnome/url-handlers/ed2k/enabled</applyto>
-       <owner>amule</owner>
-       <type>bool</type>
-       <default>true</default>
-       <locale name="C">
-	 <short>Whether command to handle ed2k URLs is enabled</short>
-	 <long>Whether command to handle ed2k URLs is enabled.</long>
-       </locale>
-       <locale name="es">
-	 <short>El comando para capturar enlaces ed2k está habilitado.</short>
-	 <long>El comando para capturar enlaces ed2k está habilitado.</long>
-       </locale>
-     </schema>
-
-   </schemalist>
-</gconfschemafile>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-amule/amule.git



More information about the Pkg-amule-commits mailing list