r42902 - in /desktop/unstable/d-conf: ./ debian/changelog debian/control debian/control.in debian/dconf-editor.install debian/watch

[laney at users.alioth.debian.org]

Author: laney
Date: Mon Sep 22 16:59:38 2014
New Revision: 42902

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=42902
Log:
Merge exp into sid


Modified:
    desktop/unstable/d-conf/   (props changed)
    desktop/unstable/d-conf/debian/changelog
    desktop/unstable/d-conf/debian/control
    desktop/unstable/d-conf/debian/control.in
    desktop/unstable/d-conf/debian/dconf-editor.install
    desktop/unstable/d-conf/debian/watch

Propchange: desktop/unstable/d-conf/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Mon Sep 22 16:59:38 2014
@@ -1 +1,2 @@
+/desktop/experimental/d-conf:42551-42901
 /desktop/unstable/d-conf:36353

Modified: desktop/unstable/d-conf/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/d-conf/debian/changelog?rev=42902&op=diff
==============================================================================
--- desktop/unstable/d-conf/debian/changelog	[utf-8] (original)
+++ desktop/unstable/d-conf/debian/changelog	[utf-8] Mon Sep 22 16:59:38 2014
@@ -1,3 +1,23 @@
+d-conf (0.22.0-1) UNRELEASED; urgency=medium
+
+  [ Andreas Henriksson ]
+  * debian/watch: only scan for stable releases.
+
+  [ Iain Lane ]
+  * New upstream release
+
+ -- Andreas Henriksson <andreas at fatal.se>  Sat, 06 Sep 2014 13:45:47 -0700
+
+d-conf (0.21.0-1) experimental; urgency=medium
+
+  * New upstream development release.
+  * Preemptively set Vcs-* urls to unstable
+  * debian/dconf-editor.install:
+    change desktop file name to ca.desrt.dconf-editor.desktop to follow
+    upstream change to make application was made DBus-activatable.
+
+ -- Andreas Henriksson <andreas at fatal.se>  Sat, 06 Sep 2014 05:43:34 -0700
+
 d-conf (0.20.0-2) unstable; urgency=medium
 
   * Force strict dependency between dconf-cli and libdconf1.

Modified: desktop/unstable/d-conf/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/d-conf/debian/control?rev=42902&op=diff
==============================================================================
--- desktop/unstable/d-conf/debian/control	[utf-8] (original)
+++ desktop/unstable/d-conf/debian/control	[utf-8] Mon Sep 22 16:59:38 2014
@@ -22,8 +22,8 @@
                libxml2-dev
 Standards-Version: 3.9.4
 Homepage: https://wiki.gnome.org/dconf
-Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/experimental/d-conf
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/experimental/d-conf/
+Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/d-conf
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/d-conf/
 XS-Testsuite: autopkgtest
 
 Package: libdconf1

Modified: desktop/unstable/d-conf/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/d-conf/debian/control.in?rev=42902&op=diff
==============================================================================
--- desktop/unstable/d-conf/debian/control.in	[utf-8] (original)
+++ desktop/unstable/d-conf/debian/control.in	[utf-8] Mon Sep 22 16:59:38 2014
@@ -17,8 +17,8 @@
                libxml2-dev
 Standards-Version: 3.9.4
 Homepage: https://wiki.gnome.org/dconf
-Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/experimental/d-conf
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/experimental/d-conf/
+Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/d-conf
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/d-conf/
 XS-Testsuite: autopkgtest
 
 Package: libdconf1

Modified: desktop/unstable/d-conf/debian/dconf-editor.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/d-conf/debian/dconf-editor.install?rev=42902&op=diff
==============================================================================
--- desktop/unstable/d-conf/debian/dconf-editor.install	[utf-8] (original)
+++ desktop/unstable/d-conf/debian/dconf-editor.install	[utf-8] Mon Sep 22 16:59:38 2014
@@ -1,6 +1,6 @@
 usr/bin/dconf-editor
 usr/share/appdata
-usr/share/applications/dconf-editor.desktop
+usr/share/applications/ca.desrt.dconf-editor.desktop
 usr/share/glib-2.0/schemas/*dconf-editor*
 usr/share/icons
 usr/share/locale

Modified: desktop/unstable/d-conf/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/d-conf/debian/watch?rev=42902&op=diff
==============================================================================
--- desktop/unstable/d-conf/debian/watch	[utf-8] (original)
+++ desktop/unstable/d-conf/debian/watch	[utf-8] Mon Sep 22 16:59:38 2014
@@ -1,3 +1,3 @@
 version=3
-http://ftp.gnome.org/pub/GNOME/sources/dconf/([\d\.]+)/ \
+http://ftp.gnome.org/pub/GNOME/sources/dconf/([\d\.]+[02468])/ \
 	dconf-(.*)\.tar\.xz