r180 - in mdadm/trunk/debian: . patches

[madduck at users.alioth.debian.org]

Author: madduck
Date: 2006-09-17 17:07:31 +0000 (Sun, 17 Sep 2006)
New Revision: 180

Modified:
   mdadm/trunk/debian/changelog
   mdadm/trunk/debian/patches/50-superblock-partition-limit.dpatch
Log:
removed debugging output; preparing release

Modified: mdadm/trunk/debian/changelog
===================================================================
--- mdadm/trunk/debian/changelog	2006-09-17 11:05:18 UTC (rev 179)
+++ mdadm/trunk/debian/changelog	2006-09-17 17:07:31 UTC (rev 180)
@@ -1,26 +1,13 @@
-mdadm (2.5.3.git200608202239-5~unreleased.4) UNRELEASED; urgency=low
+mdadm (2.5.3.git200608202239-5) unstable; urgency=medium
 
-  * Removed debconf-escape implementation and added code that defers mdadm
-    preconfiguration when the debconf backend is too old (and does not provide
-    debconf-escape). Now configuration is postponed until the postinst is run.
-
- -- martin f. krafft <madduck at debian.org>  Sun, 17 Sep 2006 13:04:07 +0200
-
-mdadm (2.5.3.git200608202239-5~unreleased.3) UNRELEASED; urgency=low
-
-  * Added stripped implementation of debconf-escape to .config file to cater
-    for upgrades from systems with older debconf versions.
-
- -- martin f. krafft <madduck at debian.org>  Sat, 16 Sep 2006 13:01:26 +0200
-
-mdadm (2.5.3.git200608202239-5~unreleased.2) UNRELEASED; urgency=medium
-
+  * Keeping medium urgency due to RC bug.
   * Modified the patch responsible for pruning parent devices so that
     superblocks at the end of a disk do not get interpreted twice. It now
     makes less assumptions about the exact output of /proc/partitions and
     should thus be more robust (now closes: #385951).
-  * Added debugging output.
-  * Keeping medium urgency.
+  * Added code that defers mdadm preconfiguration when the debconf backend is
+    too old (and does not provide debconf-escape). Now configuration is
+    postponed until the postinst is run in this case.
 
  -- martin f. krafft <madduck at debian.org>  Thu, 14 Sep 2006 11:16:39 +0200
 

Modified: mdadm/trunk/debian/patches/50-superblock-partition-limit.dpatch
===================================================================
--- mdadm/trunk/debian/patches/50-superblock-partition-limit.dpatch	2006-09-17 11:05:18 UTC (rev 179)
+++ mdadm/trunk/debian/patches/50-superblock-partition-limit.dpatch	2006-09-17 17:07:31 UTC (rev 180)
@@ -6,9 +6,9 @@
 
 @DPATCH@
 diff -urNad mdadm.git~/config.c mdadm.git/config.c
---- mdadm.git~/config.c	2006-09-14 20:10:13.000000000 +0200
-+++ mdadm.git/config.c	2006-09-14 20:10:24.000000000 +0200
-@@ -222,28 +222,87 @@
+--- mdadm.git~/config.c	2006-09-17 19:06:01.000000000 +0200
++++ mdadm.git/config.c	2006-09-17 19:06:36.000000000 +0200
+@@ -222,28 +222,82 @@
  mddev_dev_t load_partitions(void)
  {
  	FILE *f = fopen("/proc/partitions", "r");
@@ -42,8 +42,6 @@
 +		ptr = strchr(buf, '\n');
 +		if (ptr) *ptr = '\0';
 +
-+    fprintf(stderr, "Read line: %s\n", buf);
-+
 +    /*
 +     * Extract the major and minor numbers and obtain the device node name.
 +     * 10 is the max number of digits expected in a major/minor number
@@ -78,8 +76,6 @@
 +    while (!isspace(*(++mp)));
 +    *mp = '\0';
 +
-+    fprintf(stderr, "Parsed: mj=%lu, mn=%lu, n=%s, k=%s\n", major, minor, name, kernel_name);
-+
 +		/* 
 +		 * Check if this could be a partition of the previous device
 +		 * (the disk _always_ comes just before the first partition, cf.
@@ -94,7 +90,6 @@
 +       * confused when a partition with an md superblock lives very close to
 +       * the end of a disk.
 +			 */
-+      fprintf(stderr, "Pruning: %s\n", last_device_name);
 +			d = rv->next;
 +			free(rv->devname);
 +			free(rv);