[Pkg-utopia-commits] r804 - packages/unstable/hal/debian

[Sjoerd Simons]

Author: sjoerd
Date: 2006-05-01 19:21:58 +0000 (Mon, 01 May 2006)
New Revision: 804

Modified:
   packages/unstable/hal/debian/changelog
   packages/unstable/hal/debian/hal.preinst
   packages/unstable/hal/debian/rules
Log:
* Killing hal with brute force in prerm shouldn't be needed anymore
* Don't install hal's default udev rules file, we ship our own

Modified: packages/unstable/hal/debian/changelog
===================================================================
--- packages/unstable/hal/debian/changelog	2006-05-01 19:19:01 UTC (rev 803)
+++ packages/unstable/hal/debian/changelog	2006-05-01 19:21:58 UTC (rev 804)
@@ -3,9 +3,10 @@
   * debian/hal.udev.rules
     + Fix broken udev syntax (Closes: #364324)
   * Bump compat version to 5
-  * Killing hal with brute force in prerm shouldn't be needed anymore 
+  * Killing hal with brute force in prerm shouldn't be needed anymore
+  * Don't install hal's default udev rules file, we ship our own
 
- -- Sjoerd Simons <sjoerd at debian.org>  Mon,  1 May 2006 21:15:20 +0200
+ -- Sjoerd Simons <sjoerd at debian.org>  Mon,  1 May 2006 21:21:35 +0200
 
 hal (0.5.7-1) unstable; urgency=low
 

Modified: packages/unstable/hal/debian/hal.preinst
===================================================================
--- packages/unstable/hal/debian/hal.preinst	2006-05-01 19:19:01 UTC (rev 803)
+++ packages/unstable/hal/debian/hal.preinst	2006-05-01 19:21:58 UTC (rev 804)
@@ -30,6 +30,9 @@
     if dpkg --compare-versions "$2" le "0.5.6-4"; then
         rm_conffile "/etc/hal/fdi/preferences.fdi"
     fi
+    if dpkg --compare-versions "$2" le "0.5.7-2"; then
+        rm_conffile "/etc/udev/rules.d/90-hal.rules"
+    fi
 esac
 
 

Modified: packages/unstable/hal/debian/rules
===================================================================
--- packages/unstable/hal/debian/rules	2006-05-01 19:19:01 UTC (rev 803)
+++ packages/unstable/hal/debian/rules	2006-05-01 19:21:58 UTC (rev 804)
@@ -34,3 +34,5 @@
 	rm -rf $(DEB_DESTDIR)/etc/hotplug.d
 	rm -rf $(DEB_DESTDIR)/etc/dev.d
 	rm -rf $(DEB_DESTDIR)/usr/lib/hal/hal.hotplug
+	# Remove hal's default udev rules files.. We ship our own
+	rm -rf $(DEB_DESTDIR)/etc/udev