r103 - mdadm/trunk/debian

[madduck at users.alioth.debian.org]

Author: madduck
Date: 2006-08-10 20:09:44 +0000 (Thu, 10 Aug 2006)
New Revision: 103

Modified:
   mdadm/trunk/debian/changelog
   mdadm/trunk/debian/mdadm.dirs
   mdadm/trunk/debian/mdadm.udev
   mdadm/trunk/debian/rules
Log:
* Improved udev integration.
* Updated debconf translations:
  - French by Florentin Duneau (closes: #382389).

Modified: mdadm/trunk/debian/changelog
===================================================================
--- mdadm/trunk/debian/changelog	2006-08-10 20:09:32 UTC (rev 102)
+++ mdadm/trunk/debian/changelog	2006-08-10 20:09:44 UTC (rev 103)
@@ -1,3 +1,11 @@
+mdadm (2.5.3-1~unreleased.5) UNRELEASED; urgency=low
+
+  * Improved udev integration.
+  * Updated debconf translations:
+    - French by Florentin Duneau (closes: #382389).
+
+ -- martin f. krafft <madduck at debian.org>  Thu, 10 Aug 2006 20:30:51 +0100
+
 mdadm (2.5.3-1~unreleased.4) UNRELEASED; urgency=low
 
   * Readded udev rules, but consult a script now to figure out the name to
@@ -4,10 +12,8 @@
     use. This should address #382263 appropriately. In the long run, I should
     give the user a debconf question to decide which naming scheme to use.
     Thanks to Marco d'Itri for his help.
-  * Updated debconf translations:
-    - French by Florentin Duneau (closes: #382389).
 
- -- martin f. krafft <madduck at debian.org>  Thu, 10 Aug 2006 18:48:53 +0100
+ -- martin f. krafft <madduck at debian.org>  Thu, 10 Aug 2006 20:30:42 +0100
 
 mdadm (2.5.3-1~unreleased.3) UNRELEASED; urgency=low
 

Modified: mdadm/trunk/debian/mdadm.dirs
===================================================================
--- mdadm/trunk/debian/mdadm.dirs	2006-08-10 20:09:32 UTC (rev 102)
+++ mdadm/trunk/debian/mdadm.dirs	2006-08-10 20:09:44 UTC (rev 103)
@@ -5,4 +5,4 @@
 usr/share/initramfs-tools/scripts/local-top
 usr/share/bug/mdadm
 usr/share/lintian/overrides
-etc/udev/scripts
+lib/udev

Modified: mdadm/trunk/debian/mdadm.udev
===================================================================
--- mdadm/trunk/debian/mdadm.udev	2006-08-10 20:09:32 UTC (rev 102)
+++ mdadm/trunk/debian/mdadm.udev	2006-08-10 20:09:44 UTC (rev 103)
@@ -3,7 +3,5 @@
 # sometimes udev needs to create them (#382263), so we now use a script to
 # determine which one to use.
 
-KERNEL=="md[0-9]*", PROGRAM="/etc/udev/scripts/mdadm-name-generator.sh %k", \
+KERNEL=="md[0-9]*|md_d[0-9]*", PROGRAM="mdadm-name-generator.sh %k", \
   NAME="%c", SYMLINK=""
-KERNEL=="md_d[0-9]*", PROGRAM="/etc/udev/scripts/mdadm-name-generator.sh %k", \
-  NAME="%c", SYMLINK=""

Modified: mdadm/trunk/debian/rules
===================================================================
--- mdadm/trunk/debian/rules	2006-08-10 20:09:32 UTC (rev 102)
+++ mdadm/trunk/debian/rules	2006-08-10 20:09:44 UTC (rev 103)
@@ -83,8 +83,7 @@
 	install -m0755 debian/mkconf $(DESTDIR)/usr/share/mdadm
 	install -m0755 debian/checkarray $(DESTDIR)/usr/share/mdadm
 	install -m0755 debian/bugscript $(DESTDIR)/usr/share/bug/mdadm/script
-	install -m0755 debian/mdadm-name-generator.sh \
-		$(DESTDIR)/etc/udev/scripts
+	install -m0755 debian/mdadm-name-generator.sh $(DESTDIR)/lib/udev
 
 	install -m0644 debian/mdadm.lintian-overrides \
 		$(DESTDIR)/usr/share/lintian/overrides/mdadm