[Pkg-xfce-commits] r7869 - in /desktop/branches/experimental/xfce4-settings: ./ debian/changelog debian/control debian/patches/series debian/watch

[pkg-xfce-devel at lists.alioth.debian.org]

Author: noskcaj-guest
Date: Thu Aug 22 09:03:26 2013
New Revision: 7869

URL: http://svn.debian.org/wsvn/pkg-xfce/?sc=1&rev=7869
Log:
Upstream merge into experimental, in progress

Added:
    desktop/branches/experimental/xfce4-settings/
      - copied from r7868, desktop/tags/xfce4-settings/4.10.1-2/
Modified:
    desktop/branches/experimental/xfce4-settings/debian/changelog
    desktop/branches/experimental/xfce4-settings/debian/control
    desktop/branches/experimental/xfce4-settings/debian/patches/series
    desktop/branches/experimental/xfce4-settings/debian/watch

Modified: desktop/branches/experimental/xfce4-settings/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/branches/experimental/xfce4-settings/debian/changelog?rev=7869&op=diff
==============================================================================
--- desktop/branches/experimental/xfce4-settings/debian/changelog	(original)
+++ desktop/branches/experimental/xfce4-settings/debian/changelog	Thu Aug 22 09:03:26 2013
@@ -1,3 +1,15 @@
+xfce4-settings (4.11.0-1) UNRELEASED; urgency=low
+
+  [ Evgeni Golov ]
+  * Correct Vcs-* URLs to point to anonscm.debian.org
+  
+  [ Jackson Doak ]
+  * Remove redandant "Section" category from debian/control
+  * New upstream release
+  * 02-Xfsettingsd-Check-for-NoSuchExtension-bug-9390 fixed upstream
+
+ -- Jackson Doak <noskcaj at ubuntu.com>  Thu, 22 Aug 2013 18:50:00 +1000
+
 xfce4-settings (4.10.1-2) unstable; urgency=low
 
   * debian/patches:

Modified: desktop/branches/experimental/xfce4-settings/debian/control
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/branches/experimental/xfce4-settings/debian/control?rev=7869&op=diff
==============================================================================
--- desktop/branches/experimental/xfce4-settings/debian/control	(original)
+++ desktop/branches/experimental/xfce4-settings/debian/control	Thu Aug 22 09:03:26 2013
@@ -12,11 +12,10 @@
 Build-Conflicts: libxfcegui4-dev (<< 4.7.0)
 Standards-Version: 3.9.4
 Homepage: http://www.xfce.org
-Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-settings
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-settings/
+Vcs-Svn: svn://anonscm.debian.org/pkg-xfce/desktop/trunk/xfce4-settings
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-xfce/desktop/trunk/xfce4-settings/
 
 Package: xfce4-settings
-Section: xfce
 Architecture: any
 Depends: ${shlibs:Depends}, xfconf, libgarcon-common (>= 0.2.0), ${misc:Depends}
 Recommends: xfce4-volumed, x11-utils

Modified: desktop/branches/experimental/xfce4-settings/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/branches/experimental/xfce4-settings/debian/patches/series?rev=7869&op=diff
==============================================================================
--- desktop/branches/experimental/xfce4-settings/debian/patches/series	(original)
+++ desktop/branches/experimental/xfce4-settings/debian/patches/series	Thu Aug 22 09:03:26 2013
@@ -1,2 +1 @@
-01_use-tango-icon-theme.patch
-02-Xfsettingsd-Check-for-NoSuchExtension-bug-9390.patch
+01_use-tango-icon-theme.patch

Modified: desktop/branches/experimental/xfce4-settings/debian/watch
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/branches/experimental/xfce4-settings/debian/watch?rev=7869&op=diff
==============================================================================
--- desktop/branches/experimental/xfce4-settings/debian/watch	(original)
+++ desktop/branches/experimental/xfce4-settings/debian/watch	Thu Aug 22 09:03:26 2013
@@ -1,3 +1,3 @@
 version=3
-http://archive.xfce.org/src/xfce/xfce4-settings/([\d\.]+[02468])/ \
+http://archive.xfce.org/src/xfce/xfce4-settings/([\d\.]*)/ \
 	xfce4-settings-([\d\.]+)\.tar\.(?:gz|bz2)