[Pkg-xfce-commits] r8938 - in /goodies/trunk/xfce4-xkb-plugin: ./ debian/changelog debian/patches/01-font_selection.patch debian/patches/git-fix-crash.patch debian/patches/series debian/watch

[Yves-Alexis Perez]

Author: corsac
Date: Sun Mar 15 21:02:34 2015
New Revision: 8938

URL: http://svn.debian.org/wsvn/pkg-xfce/?sc=1&rev=8938
Log:
merge changes from experimental

Added:
    goodies/trunk/xfce4-xkb-plugin/debian/patches/01-font_selection.patch
      - copied unchanged from r8923, goodies/branches/experimental/xfce4-xkb-plugin/debian/patches/01-font_selection.patch
    goodies/trunk/xfce4-xkb-plugin/debian/patches/git-fix-crash.patch
      - copied unchanged from r8923, goodies/branches/experimental/xfce4-xkb-plugin/debian/patches/git-fix-crash.patch
    goodies/trunk/xfce4-xkb-plugin/debian/patches/series
      - copied unchanged from r8923, goodies/branches/experimental/xfce4-xkb-plugin/debian/patches/series
Modified:
    goodies/trunk/xfce4-xkb-plugin/   (props changed)
    goodies/trunk/xfce4-xkb-plugin/debian/changelog
    goodies/trunk/xfce4-xkb-plugin/debian/watch

Propchange: goodies/trunk/xfce4-xkb-plugin/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Sun Mar 15 21:02:34 2015
@@ -1,2 +1,2 @@
-/goodies/branches/experimental/xfce4-xkb-plugin:4344-5314
+/goodies/branches/experimental/xfce4-xkb-plugin:4344-5314,8397-8923
 /goodies/tags/xfce4-xkb-plugin/0.5.3.3-3:3937-4343

Modified: goodies/trunk/xfce4-xkb-plugin/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-xkb-plugin/debian/changelog?rev=8938&op=diff
==============================================================================
--- goodies/trunk/xfce4-xkb-plugin/debian/changelog	(original)
+++ goodies/trunk/xfce4-xkb-plugin/debian/changelog	Sun Mar 15 21:02:34 2015
@@ -1,8 +1,18 @@
-xfce4-xkb-plugin (1:0.5.6-2) UNRELEASED; urgency=low
+xfce4-xkb-plugin (1:0.7.0-1) trusty; urgency=low
 
+  [ Evgeni Golov ]
   * Correct Vcs-* URLs to point to anonscm.debian.org
 
- -- Evgeni Golov <evgeni at debian.org>  Mon, 15 Jul 2013 21:57:48 +0200
+  [ Jackson Doak ]
+  * New upstream release
+  * debian/watch: Track all versions
+  * debian/patches/:
+    - Add 01-font-selection.patch. Closes: #576072 LP: #733563
+      + Makes the xkb plugin change font with the rest of the system
+    - Add git-fix-crash.patch. LP: #978230
+      + Fix crash in xkb_util_normalize_group_name
+
+ -- Jackson Doak <noskcaj at ubuntu.com>  Thu, 10 Apr 2014 07:57:58 +1000
 
 xfce4-xkb-plugin (1:0.5.6-1) unstable; urgency=low
 

Modified: goodies/trunk/xfce4-xkb-plugin/debian/watch
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-xkb-plugin/debian/watch?rev=8938&op=diff
==============================================================================
--- goodies/trunk/xfce4-xkb-plugin/debian/watch	(original)
+++ goodies/trunk/xfce4-xkb-plugin/debian/watch	Sun Mar 15 21:02:34 2015
@@ -1,3 +1,3 @@
 version=3
-http://archive.xfce.org/src/panel-plugins/xfce4-xkb-plugin/0.5/ \
+http://archive.xfce.org/src/panel-plugins/xfce4-xkb-plugin/([\d\.]+)/ \
 	xfce4-xkb-plugin-([\d\.]+)\.tar\.(?:gz|bz2)