[Pkg-xfce-commits] r3631 - desktop/trunk/libxfcegui4/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2009-10-25 22:01:57 +0000 (Sun, 25 Oct 2009)
New Revision: 3631

Modified:
   desktop/trunk/libxfcegui4/debian/control
   desktop/trunk/libxfcegui4/debian/libxfcegui4-4.install
Log:
don't install twice the shortcuts


Modified: desktop/trunk/libxfcegui4/debian/control
===================================================================
--- desktop/trunk/libxfcegui4/debian/control	2009-10-25 20:20:53 UTC (rev 3630)
+++ desktop/trunk/libxfcegui4/debian/control	2009-10-25 22:01:57 UTC (rev 3631)
@@ -61,6 +61,7 @@
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: libxfcegui4-4
+Conflicts: libxfcegui4-4 (<< 4.6.1-2)
 Replaces: libxfcegui4-4 (<< 4.6.1-2)
 Description: xfce keyboard shortcuts configuration
  This package only contains the default shortcut configuration for Xfce.

Modified: desktop/trunk/libxfcegui4/debian/libxfcegui4-4.install
===================================================================
--- desktop/trunk/libxfcegui4/debian/libxfcegui4-4.install	2009-10-25 20:20:53 UTC (rev 3630)
+++ desktop/trunk/libxfcegui4/debian/libxfcegui4-4.install	2009-10-25 22:01:57 UTC (rev 3631)
@@ -2,4 +2,3 @@
 usr/lib/libglade/2.0/libxfce4.so
 usr/share/locale/*
 usr/share/icons/hicolor/*
-etc