[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force X.Org X11 SVN commit: r1069 - trunk/debian



Author: dnusinow
Date: 2006-01-12 21:12:07 -0500 (Thu, 12 Jan 2006)
New Revision: 1069

Modified:
   trunk/debian/changelog
   trunk/debian/rules
Log:
* unset DH_OPTIONS for dh_installinit during binary-indep and binary-arch
  targets. There's some bug in dh_installinit that was causing it to ignore
  all the .init scripts when -s or -i was used in it alongside --noscripts
  (closes: #347705)


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-01-11 22:32:07 UTC (rev 1068)
+++ trunk/debian/changelog	2006-01-13 02:12:07 UTC (rev 1069)
@@ -17,6 +17,10 @@
   [ David Nusinow ]
   * MANIFEST updates for mips and mipsel over evdev manpage that was added for
     last upload
+  * unset DH_OPTIONS for dh_installinit during binary-indep and binary-arch
+    targets. There's some bug in dh_installinit that was causing it to ignore
+    all the .init scripts when -s or -i was used in it alongside --noscripts
+    (closes: #347705)
 
   [ Denis Barbier ]
   * Add general/086_enable_ca_variants.diff so that variants of the ca
@@ -28,7 +32,7 @@
   * Add general/087_xkb_ralt_switch_multikey.diff to enable again the
     lv3:ralt_switch_multikey option.  Thanks Klaus Ethgen  (closes: #345409)
 
- -- Denis Barbier <barbier@debian.org>  Wed, 11 Jan 2006 23:07:44 +0100
+ -- David Nusinow <dnusinow@debian.org>  Thu, 12 Jan 2006 21:11:43 -0500
 
 xorg-x11 (6.9.0.dfsg.1-3) unstable; urgency=low
 

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2006-01-11 22:32:07 UTC (rev 1068)
+++ trunk/debian/rules	2006-01-13 02:12:07 UTC (rev 1069)
@@ -530,7 +530,7 @@
 	dh_installdocs
 	dh_installexamples
 	dh_installmenu
-	dh_installinit --noscripts
+	unset DH_OPTIONS; dh_installinit --noscripts
 	dh_installchangelogs
 	dh_link
 	dh_compress -X.xhtml
@@ -572,7 +572,7 @@
 	dh_installexamples
 	dh_installmenu
 	dh_installpam
-	dh_installinit --noscripts
+	unset DH_OPTIONS; dh_installinit --noscripts
 	dh_installlogrotate
 	dh_installchangelogs
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))



Reply to: