[Pkg-xfce-commits] r7872 - in /desktop/branches/experimental/xfce4-settings/debian: changelog copyright patches/01_use-tango-icon-theme.patch

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

Author: noskcaj-guest
Date: Thu Aug 22 20:26:56 2013
New Revision: 7872

URL: http://svn.debian.org/wsvn/pkg-xfce/?sc=1&rev=7872
Log:
xfce4-settings 4.11 is now ready for release

Modified:
    desktop/branches/experimental/xfce4-settings/debian/changelog
    desktop/branches/experimental/xfce4-settings/debian/copyright
    desktop/branches/experimental/xfce4-settings/debian/patches/01_use-tango-icon-theme.patch

Modified: desktop/branches/experimental/xfce4-settings/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/branches/experimental/xfce4-settings/debian/changelog?rev=7872&op=diff
==============================================================================
--- desktop/branches/experimental/xfce4-settings/debian/changelog	(original)
+++ desktop/branches/experimental/xfce4-settings/debian/changelog	Thu Aug 22 20:26:56 2013
@@ -7,6 +7,8 @@
   * Remove redandant "Section" category from debian/control
   * New upstream release
   * 02-Xfsettingsd-Check-for-NoSuchExtension-bug-9390 fixed upstream
+  * debian/changelog: Convert to debian machine readable format
+  * Refresh remaining patch 
 
  -- Jackson Doak <noskcaj at ubuntu.com>  Thu, 22 Aug 2013 18:50:00 +1000
 

Modified: desktop/branches/experimental/xfce4-settings/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/branches/experimental/xfce4-settings/debian/copyright?rev=7872&op=diff
==============================================================================
--- desktop/branches/experimental/xfce4-settings/debian/copyright	(original)
+++ desktop/branches/experimental/xfce4-settings/debian/copyright	Thu Aug 22 20:26:56 2013
@@ -33,7 +33,7 @@
  xfce4-settings-manager/xfce-settings-manager-dialog.c
  xfce4-settings-manager/xfce-settings-manager-dialog.h
 Copyright: 2008, Brian Tarricone <bjt23 at cornell.edu>
-License: GPL-2
+License: GPL-2+
 
 Files: dialogs/appearance-settings/images.h
  dialogs/mouse-settings/main.c
@@ -66,7 +66,7 @@
 Files: dialogs/display-settings/display-name.c
  dialogs/display-settings/edid-parse.c
 Copyright: 2007, Red Hat, Inc
-License: MIT/X11 (BSD like)
+License: MIT/X11
 
 Files: xfce4-settings-helper/clipboard-manager.c
 Copyright: 2007, Anders Carlsson
@@ -132,10 +132,10 @@
  The above copyright notice and this permission notice (including the 
  next paragraph) shall be included in all copies or substantial 
  portions of the Software.
-  
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
-  THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
+ THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Modified: desktop/branches/experimental/xfce4-settings/debian/patches/01_use-tango-icon-theme.patch
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/branches/experimental/xfce4-settings/debian/patches/01_use-tango-icon-theme.patch?rev=7872&op=diff
==============================================================================
--- desktop/branches/experimental/xfce4-settings/debian/patches/01_use-tango-icon-theme.patch	(original)
+++ desktop/branches/experimental/xfce4-settings/debian/patches/01_use-tango-icon-theme.patch	Thu Aug 22 20:26:56 2013
@@ -1,7 +1,9 @@
-diff --git a/xfsettingsd/xsettings.xml b/xfsettingsd/xsettings.xml
-index 049b4ed..0b72294 100644
---- a/xfsettingsd/xsettings.xml
-+++ b/xfsettingsd/xsettings.xml
+Description: Sets the default theme for debian
+
+Index: xfce4-settings/xfsettingsd/xsettings.xml
+===================================================================
+--- xfce4-settings.orig/xfsettingsd/xsettings.xml	2013-08-23 06:21:51.443643142 +1000
++++ xfce4-settings/xfsettingsd/xsettings.xml	2013-08-23 06:21:51.439643130 +1000
 @@ -6,8 +6,8 @@
  <?xml version="1.0" encoding="UTF-8"?>
  <channel name="xsettings" version="1.0">