Author: julien
Date: 2006-11-25 10:44:40 -0500 (Sat, 25 Nov 2006)
New Revision: 4050

Modified:
   trunk/debian/xorg/debian/changelog
   trunk/debian/xorg/debian/rules
   trunk/debian/xorg/debian/x11-common.postinst.in
Log:
* Run invoke-rc.d and update-rc.d only once in postinst (instead of 3
  times), and let debhelper handle it.

Modified: trunk/debian/xorg/debian/changelog
===================================================================
--- trunk/debian/xorg/debian/changelog  2006-11-25 11:04:54 UTC (rev 4049)
+++ trunk/debian/xorg/debian/changelog  2006-11-25 15:44:40 UTC (rev 4050)
@@ -11,8 +11,12 @@
   [ Jurij Smakov ]
   * Add detection of PGX32 framebuffers on sparc.
 
- -- Christian Perrier <[EMAIL PROTECTED]>  Sun, 19 Nov 2006 08:08:44 +0100
+  [ Julien Cristau ]
+  * Run invoke-rc.d and update-rc.d only once in postinst (instead of 3
+    times), and let debhelper handle it.
 
+ -- Julien Cristau <[EMAIL PROTECTED]>  Sat, 25 Nov 2006 16:35:42 +0100
+
 xorg (1:7.1.0-7) unstable; urgency=high
 
   [ Debconf translations added ]

Modified: trunk/debian/xorg/debian/rules
===================================================================
--- trunk/debian/xorg/debian/rules      2006-11-25 11:04:54 UTC (rev 4049)
+++ trunk/debian/xorg/debian/rules      2006-11-25 15:44:40 UTC (rev 4050)
@@ -84,8 +84,6 @@
        dh_installdebconf
        dh_installdirs
        dh_installdocs
-       dh_installinit -Nx11-common
-       dh_installinit -px11-common -u'start 70 S .'
        dh_installchangelogs
        dh_link
        dh_compress
@@ -105,7 +103,7 @@
        dh_installdirs
        dh_installdocs
        dh_installman
-       dh_installinit
+       dh_installinit -px11-common -u'start 70 S .'
        dh_installchangelogs
        dh_link
        dh_compress

Modified: trunk/debian/xorg/debian/x11-common.postinst.in
===================================================================
--- trunk/debian/xorg/debian/x11-common.postinst.in     2006-11-25 11:04:54 UTC 
(rev 4049)
+++ trunk/debian/xorg/debian/x11-common.postinst.in     2006-11-25 15:44:40 UTC 
(rev 4050)
@@ -117,14 +117,8 @@
   fi
 fi
 
-if [ -e /etc/init.d/x11-common ]; then
-  update-rc.d x11-common start 70 S .
-fi
-
 #DEBHELPER#
 
-invoke-rc.d x11-common start || true
-
 exit 0
 
 # vim:set ai et sts=2 sw=2 tw=80:


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to