[Pkg-xfce-commits] r6556 - in desktop/branches/experimental/libxfce4ui/debian: . patches

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2012-03-31 12:41:31 +0000 (Sat, 31 Mar 2012)
New Revision: 6556

Modified:
   desktop/branches/experimental/libxfce4ui/debian/changelog
   desktop/branches/experimental/libxfce4ui/debian/control
   desktop/branches/experimental/libxfce4ui/debian/patches/01_replace-ctrl-primary-gtk-shortcuts.patch
Log:
  - use Breaks instead of Conflicts when possible.
  - 01_replace-ctrl-primary-gtk-shortcuts.patch: refreshed to apply cleanly
    and add DEP-3 headers.

Modified: desktop/branches/experimental/libxfce4ui/debian/changelog
===================================================================
--- desktop/branches/experimental/libxfce4ui/debian/changelog	2012-03-31 12:35:49 UTC (rev 6555)
+++ desktop/branches/experimental/libxfce4ui/debian/changelog	2012-03-31 12:41:31 UTC (rev 6556)
@@ -6,8 +6,10 @@
     - add a new binary package libxfce4ui-utils to contain xfce4-about files
     - libxfce4ui-utils breaks/replaces pre 4.10 xfce4-utils package, as it
       previously shipped xfce4-about.
+    - use Breaks instead of Conflicts when possible.
   * debian/patches:
-    - 01_replace-ctrl-primary-gtk-shortcuts.patch: refreshed to apply cleanly.
+    - 01_replace-ctrl-primary-gtk-shortcuts.patch: refreshed to apply cleanly
+      and add DEP-3 headers.
   * debian/libxfce4ui-1-0.shlibs: added.
   * debian/rules: take vendor handling code from xfce4-utils for xfce4-about.
   * debian/vendorinfo: added, taken from xfce4-utils, and renamed from

Modified: desktop/branches/experimental/libxfce4ui/debian/control
===================================================================
--- desktop/branches/experimental/libxfce4ui/debian/control	2012-03-31 12:35:49 UTC (rev 6555)
+++ desktop/branches/experimental/libxfce4ui/debian/control	2012-03-31 12:41:31 UTC (rev 6556)
@@ -66,7 +66,7 @@
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: libxfce4ui-1-0
-Conflicts: libxfcegui4-4 (<< 4.6.1-2)
+Breaks: libxfcegui4-4 (<< 4.6.1-2)
 Description: xfce keyboard shortcuts configuration
  This package only contains the default shortcut configuration for Xfce.
 

Modified: desktop/branches/experimental/libxfce4ui/debian/patches/01_replace-ctrl-primary-gtk-shortcuts.patch
===================================================================
--- desktop/branches/experimental/libxfce4ui/debian/patches/01_replace-ctrl-primary-gtk-shortcuts.patch	2012-03-31 12:35:49 UTC (rev 6555)
+++ desktop/branches/experimental/libxfce4ui/debian/patches/01_replace-ctrl-primary-gtk-shortcuts.patch	2012-03-31 12:41:31 UTC (rev 6556)
@@ -1,3 +1,7 @@
+Description: Control modifier appears as Primary when setting shortcuts with gtk >= 2.24.7
+Author: Yves-Alexis Perez <corsac at debian.org>
+Bug: https://bugzilla.xfce.org/show_bug.cgi?id=8056
+
 Index: libxfce4ui-4.9.0/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml
 ===================================================================
 --- libxfce4ui-4.9.0.orig/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml	2011-01-16 16:01:09.000000000 +0100