Author: adam-guest
Date: 2008-09-21 14:43:40 +0000 (Sun, 21 Sep 2008)
New Revision: 1633
Modified:
trunk/debian/changelog
trunk/debian/postinst
Log:
When upgrading from devscripts 2.10.36, remove the incorrectly
created /etc/devscripts.con if it is present and add the affected
section to /etc/devscripts.conf instead.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-09-21 00:29:53 UTC (rev 1632)
+++ trunk/debian/changelog 2008-09-21 14:43:40 UTC (rev 1633)
@@ -1,8 +1,10 @@
devscripts (2.10.38) UNRELEASED; urgency=low
- * NOT RELEASED YET
+ * When upgrading from devscripts 2.10.36, remove the incorrectly
+ created /etc/devscripts.con if it is present and add the affected
+ section to /etc/devscripts.conf instead.
- -- Mohammed Adnène Trojette <[EMAIL PROTECTED]> Sun, 21 Sep 2008 02:29:40
+0200
+ -- Adam D. Barratt <[EMAIL PROTECTED]> Sun, 21 Sep 2008 15:08:17 +0100
devscripts (2.10.37) unstable; urgency=low
Modified: trunk/debian/postinst
===================================================================
--- trunk/debian/postinst 2008-09-21 00:29:53 UTC (rev 1632)
+++ trunk/debian/postinst 2008-09-21 14:43:40 UTC (rev 1633)
@@ -546,6 +546,26 @@
EOF
fi
+
+ if dpkg --compare-versions "$2" lt 2.10.38
+ then
+ if [ -f "/etc/devscripts.con" ] &&
+ [ "10cabcba2772fc97064bf2f51b39bf25" =
+ "$(md5sum /etc/devscripts.con | cut -d" " -f1)" ]
+ then
+ rm /etc/devscripts.con
+
+ # Added in devscripts 2.10.36 but to the wrong file
+ cat >> /etc/devscripts.conf <<EOF
+##### debdiff option added in version 2.10.36
+#
+# Compare control files in source packages using widff?
+#
+# DEBDIFF_WDIFF_SOURCE_CONTROL=no
+
+EOF
+ fi
+ fi
fi
fi
--
To unsubscribe, send mail to [EMAIL PROTECTED]
