[Pkg-xfce-commits] r3725 - goodies/trunk/xfce4-notes-plugin/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2009-12-21 22:42:52 +0000 (Mon, 21 Dec 2009)
New Revision: 3725

Modified:
   goodies/trunk/xfce4-notes-plugin/debian/changelog
   goodies/trunk/xfce4-notes-plugin/debian/control
   goodies/trunk/xfce4-notes-plugin/debian/rules
   goodies/trunk/xfce4-notes-plugin/debian/xfce4-notes.install
Log:
add proper Conflicts/Replaces.

Modified: goodies/trunk/xfce4-notes-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-notes-plugin/debian/changelog	2009-12-21 22:03:22 UTC (rev 3724)
+++ goodies/trunk/xfce4-notes-plugin/debian/changelog	2009-12-21 22:42:52 UTC (rev 3725)
@@ -5,11 +5,12 @@
     - add build-dep on libunique-dev.
     - add a new xfce4-notes binary package so users can run notes without
       needing xfce4-panel.
+    - add proper Conflicts/Replaces.
   * debian/rules rewritten using debhelper 7 because CDBS fails dh_install
     --fail-missing when using multiple packages.
   * bump debhelper build-dep because we use overrides.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Mon, 21 Dec 2009 22:02:45 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Mon, 21 Dec 2009 23:09:46 +0100
 
 xfce4-notes-plugin (1.7.1-1) unstable; urgency=low
 

Modified: goodies/trunk/xfce4-notes-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-notes-plugin/debian/control	2009-12-21 22:03:22 UTC (rev 3724)
+++ goodies/trunk/xfce4-notes-plugin/debian/control	2009-12-21 22:42:52 UTC (rev 3725)
@@ -15,6 +15,8 @@
 Package: xfce4-notes
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: xfce4-notes-plugin (<< 1.7.2-1)
+Conflicts: xfce4-notes-plugin (<< 1.7.2-1)
 Description: Notes application for the Xfce4 desktop
  The notes tool provides you a simple text editor in a little window for the 
  Xfce 4 desktop.  Notes are especially useful for temporary stuff.

Modified: goodies/trunk/xfce4-notes-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-notes-plugin/debian/rules	2009-12-21 22:03:22 UTC (rev 3724)
+++ goodies/trunk/xfce4-notes-plugin/debian/rules	2009-12-21 22:42:52 UTC (rev 3725)
@@ -8,7 +8,7 @@
 override_dh_install:
 	-rm -rf debian/tmp/usr/lib/xfce4/panel-plugins/*.a
 	-rm -rf debian/tmp/usr/lib/xfce4/panel-plugins/*.la
-	dh_install --list-missing
+	dh_install --fail-missing
 
 %:
 	dh $@

Modified: goodies/trunk/xfce4-notes-plugin/debian/xfce4-notes.install
===================================================================
--- goodies/trunk/xfce4-notes-plugin/debian/xfce4-notes.install	2009-12-21 22:03:22 UTC (rev 3724)
+++ goodies/trunk/xfce4-notes-plugin/debian/xfce4-notes.install	2009-12-21 22:42:52 UTC (rev 3725)
@@ -3,4 +3,3 @@
 usr/share/applications
 usr/share/icons
 usr/share/locale
-usr/share