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

X Strike Force X.Org X11 SVN commit: r645 - branches/6.9/debian



Author: dnusinow
Date: 2005-09-29 20:41:16 -0500 (Thu, 29 Sep 2005)
New Revision: 645

Modified:
   branches/6.9/debian/changelog
   branches/6.9/debian/rules
Log:
* Don't ship all of xserver-xorg's configuration scripts with xserver-xorg.
  This was an accidental holdover from the old statically linked binary in
  the pre-6.9 series. (closes: #327465)


Modified: branches/6.9/debian/changelog
===================================================================
--- branches/6.9/debian/changelog	2005-09-30 01:31:37 UTC (rev 644)
+++ branches/6.9/debian/changelog	2005-09-30 01:41:16 UTC (rev 645)
@@ -14,8 +14,11 @@
   * Fix typo in xserver-xorg.init. (closes: #327514)
   * Have xserver-xorg-dbg depend on xserver-xorg, since we no longer ship a
     full xserver in the -dbg package.
+  * Don't ship all of xserver-xorg's configuration scripts with xserver-xorg.
+    This was an accidental holdover from the old statically linked binary in
+    the pre-6.9 series. (closes: #327465)
 
- -- David Nusinow <dnusinow@debian.org>  Thu, 29 Sep 2005 21:30:47 -0400
+ -- David Nusinow <dnusinow@debian.org>  Thu, 29 Sep 2005 21:38:46 -0400
 
 xorg-x11 (6.8.99.900.dfsg.1-0pre1) experimental; urgency=low
 

Modified: branches/6.9/debian/rules
===================================================================
--- branches/6.9/debian/rules	2005-09-30 01:31:37 UTC (rev 644)
+++ branches/6.9/debian/rules	2005-09-30 01:41:16 UTC (rev 645)
@@ -302,24 +302,6 @@
 	    rm $$MAINTSCRIPT.tmp; \
 	  fi; \
 	done
-	# Generate xserver-xorg-dbg's maintainer scripts from the scripts for
-	# xserver-xorg.
-	for FILE in debian/xserver-xorg.config \
-	            debian/xserver-xorg.postinst \
-	            debian/xserver-xorg.postrm \
-	            debian/xserver-xorg.preinst \
-	            debian/xserver-xorg.prerm; do \
-	  if [ -e "$$FILE" ]; then \
-	    MAINTSCRIPT=$$(echo $$FILE | sed 's/xserver-xorg/&-dbg/'); \
-	    sed -e 's/^# Debian xserver-xorg/&-dbg/' \
-	        -e 's/^THIS_PACKAGE=xserver-xorg/&-dbg/' \
-	        -e 's#^THIS_SERVER=/usr/bin/X11/Xorg#&-debug#' \
-	        <$$FILE >$$MAINTSCRIPT; \
-	  fi; \
-	done
-	# Reuse xserver-xorg's templates file for xserver-xorg-dbg.
-	ln -f debian/xserver-xorg.templates \
-	   debian/xserver-xorg-dbg.templates
 	# Validate syntax of generated shell scripts.
 	sh debian/scripts/validate-posix-sh debian/*.config \
 	                                    debian/*.postinst \



Reply to: