Author: branden
Date: 2003-05-31 00:49:49 -0500 (Sat, 31 May 2003)
New Revision: 116
Modified:
trunk/debian/rules
Log:
remove obsolete and irrelevant commented-out stuff from rules
Modified: trunk/debian/rules
==============================================================================
--- trunk/debian/rules 2003-05-31 05:31:22 UTC (rev 115)
+++ trunk/debian/rules 2003-05-31 05:49:49 UTC (rev 116)
@@ -199,8 +199,6 @@
# build Debian's X server wrapper
$(CC) -Wall -g -O2 -o debian/local/xserver-wrapper
debian/local/xserver-wrapper.c
endif
-# $(HTML2TEXT) debian/local/XFree86-FAQ.html >
debian/local/XFree86-FAQ.text
-# gzip -9 debian/local/XFree86-FAQ.text
$(HTML2TEXT) debian/local/xterm.faq.html > debian/local/xterm.faq.text
gzip -9 debian/local/xterm.faq.text
ifndef test_rules
@@ -325,31 +323,6 @@
dh_testdir
dh_testroot
dh_install --sourcedir=debian/tmp
-# #dh_movefiles is not idempotent
-# for PACKAGE in $$(dh_listpackages); do \
-# for FILELIST in debian/$$PACKAGE.files; do \
-# if [ -f $$FILELIST.$(ARCH) ]; then \
-# FILELIST=$$FILELIST.$(ARCH); \
-# fi; \
-# if [ -f $$FILELIST ]; then \
-# for FILE in $$(cat $$FILELIST); do \
-# if [ -L $(DEBTREEDIR)/$$FILE ]; then \
-# echo $$FILE is a symlink pointing to $$(readlink $$FILE)\;
put it in $$PACKAGE.links instead >&2; \
-# exit 1; \
-# fi; \
-# install -m 755 -d $$(dirname debian/$$PACKAGE/$$FILE); \
-# cp -f $(DEBTREEDIR)/$$FILE debian/$$PACKAGE/$$FILE; \
-# done; \
-# fi; \
-# done; \
-# done
-# # copy debugging targets so they don't get stripped
-# for PACKAGE in $$(dh_listpackages); do \
-# if [ -f $$PACKAGE.debugfiles ]; then \
-# echo $$PACKAGE has a debug file list but is an
architecture-independent package\; this makes no sense. Please fix. >&2; \
-# exit 1; \
-# fi; \
-# done
dh_installdebconf
dh_installdirs
# copy the fonts.{alias,scale} files into /etc
@@ -364,32 +337,12 @@
dh_installdocs
dh_installexamples
dh_installmenu
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
dh_installinit --noscripts
-# dh_installcron
-# dh_installinfo
dh_installchangelogs
-# # dh_link isn't idempotent for symlinks to directories
-# for PACKAGE in $$(dh_listpackages); do \
-# for LINKSLIST in debian/$$PACKAGE.links; do \
-# if [ -f $$LINKSLIST.$(ARCH) ]; then \
-# LINKSLIST=$$LINKSLIST.$(ARCH); \
-# fi; \
-# if [ -f $$LINKSLIST ]; then \
-# cat $$LINKSLIST | while read SOURCE DEST; do \
-# install -m 755 -d $$(dirname debian/$$PACKAGE/$$DEST); \
-# rm -f debian/$$PACKAGE/$$DEST; \
-# done; \
-# fi; \
-# done; \
-# done
dh_link
dh_compress
dh_fixperms
dh_installdeb
-# dh_perl
dh_gencontrol
dh_md5sums
dh_builddeb
@@ -402,38 +355,6 @@
dh_testdir
dh_testroot
dh_install --sourcedir=debian/tmp
-# #dh_movefiles is not idempotent
-# for PACKAGE in $$(dh_listpackages); do \
-# for FILELIST in debian/$$PACKAGE.files; do \
-# if [ -f $$FILELIST.$(ARCH) ]; then \
-# FILELIST=$$FILELIST.$(ARCH); \
-# fi; \
-# if [ -f $$FILELIST ]; then \
-# for FILE in $$(cat $$FILELIST); do \
-# if [ -L $(DEBTREEDIR)/$$FILE ]; then \
-# echo $$FILE is a symlink pointing to $$(readlink $$FILE)\;
put it in $$PACKAGE.links instead >&2; \
-# exit 1; \
-# fi; \
-# install -m 755 -d $$(dirname debian/$$PACKAGE/$$FILE); \
-# cp -f $(DEBTREEDIR)/$$FILE debian/$$PACKAGE/$$FILE; \
-# done; \
-# fi; \
-# done; \
-# done
-# # copy debugging targets so they don't get stripped
-# for PACKAGE in $$(dh_listpackages); do \
-# for DEBUGFILELIST in debian/$$PACKAGE.debugfiles; do \
-# if [ -f $$DEBUGFILELIST.$(ARCH) ]; then \
-# DEBUGFILELIST=$$DEBUGFILELIST.$(ARCH); \
-# fi; \
-# if [ -f $$DEBUGFILELIST ]; then \
-# cat $$DEBUGFILELIST | while read SOURCE DEST; do \
-# install -m 755 -d $$(dirname debian/$$PACKAGE/$$DEST); \
-# cp -f $(DEBTREEDIR)/$$SOURCE debian/$$PACKAGE/$$DEST; \
-# done; \
-# fi; \
-# done; \
-# done
dh_installdebconf
dh_installdirs
dh_installdocs
@@ -446,13 +367,8 @@
endif
dh_installexamples
dh_installmenu
-# dh_installlogrotate
-# dh_installemacsen
dh_installpam
-# dh_installmime
dh_installinit --noscripts
-# dh_installcron
-# dh_installinfo
dh_installchangelogs
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
dh_strip -Nlibdps1-dbg -Nlibxaw6-dbg -Nlibxaw7-dbg -Nxlibmesa3-dbg \
@@ -461,21 +377,6 @@
xargs --no-run-if-empty \
strip --strip-debug --remove-section=.note --remove-section=.comment
endif
-# # dh_link isn't idempotent for symlinks to directories; clean up the
-# # symlinks so dh_link can run without error
-# for PACKAGE in $$(dh_listpackages); do \
-# for LINKSLIST in debian/$$PACKAGE.links; do \
-# if [ -f $$LINKSLIST.$(ARCH) ]; then \
-# LINKSLIST=$$LINKSLIST.$(ARCH); \
-# fi; \
-# if [ -f $$LINKSLIST ]; then \
-# cat $$LINKSLIST | while read SOURCE DEST; do \
-# install -m 755 -d $$(dirname debian/$$PACKAGE/$$DEST); \
-# rm -f debian/$$PACKAGE/$$DEST; \
-# done; \
-# fi; \
-# done; \
-# done
dh_link
dh_compress
dh_fixperms
@@ -486,8 +387,6 @@
chown :utmp debian/xterm/usr/X11R6/bin/xterm
chmod g+s debian/xterm/usr/X11R6/bin/xterm
dh_installdeb
-# dh_makeshlibs
-# dh_perl
dh_shlibdeps -l$(DEBTREEDIR)/usr/lib -l$(DEBTREEDIR)/usr/X11R6/lib
-Nxlibs --exclude=usr/X11R6/lib/modules
# xlibs needs to be given a special shlibs file so that dpkg-shlibdeps
# doesn't try to make it depend on itself
@@ -586,38 +485,6 @@
dh_testdir
dh_testroot
dh_install --sourcedir=debian/tmp
-# #dh_movefiles is not idempotent
-# for PACKAGE in $$(dh_listpackages); do \
-# for FILELIST in debian/$$PACKAGE.files; do \
-# if [ -f $$FILELIST.$(ARCH) ]; then \
-# FILELIST=$$FILELIST.$(ARCH); \
-# fi; \
-# if [ -f $$FILELIST ]; then \
-# for FILE in $$(cat $$FILELIST); do \
-# if [ -L $(DEBTREEDIR)/$$FILE ]; then \
-# echo $$FILE is a symlink pointing to $$(readlink $$FILE)\;
put it in $$PACKAGE.links instead >&2; \
-# exit 1; \
-# fi; \
-# install -m 755 -d $$(dirname debian/$$PACKAGE/$$FILE); \
-# cp -f $(DEBTREEDIR)/$$FILE debian/$$PACKAGE/$$FILE; \
-# done; \
-# fi; \
-# done; \
-# done
-# # copy debugging targets so they don't get stripped
-# for PACKAGE in $$(dh_listpackages); do \
-# for DEBUGFILELIST in debian/$$PACKAGE.debugfiles; do \
-# if [ -f $$DEBUGFILELIST.$(ARCH) ]; then \
-# DEBUGFILELIST=$$DEBUGFILELIST.$(ARCH); \
-# fi; \
-# if [ -f $$DEBUGFILELIST ]; then \
-# cat $$DEBUGFILELIST | while read SOURCE DEST; do \
-# install -m 755 -d $$(dirname debian/$$PACKAGE/$$DEST); \
-# cp -f $(DEBTREEDIR)/$$SOURCE debian/$$PACKAGE/$$DEST; \
-# done; \
-# fi; \
-# done; \
-# done
dh_installdebconf
dh_installdirs
dh_installdocs
@@ -627,14 +494,7 @@
install -m 755 -d debian/xserver-xfree86-dbg/usr/share/bug
install -m 755 debian/xserver-xfree86.bug
debian/xserver-xfree86-dbg/usr/share/bug/xserver-xfree86-dbg
dh_installexamples
-# dh_installmenu
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
dh_installinit --noscripts
-# dh_installcron
-# dh_installinfo
dh_installchangelogs
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
dh_strip -Nxserver-xfree86-dbg
@@ -642,27 +502,10 @@
xargs --no-run-if-empty \
strip --strip-debug --remove-section=.note --remove-section=.comment
endif
-# # dh_link isn't idempotent for symlinks to directories; clean up the
-# # symlinks so dh_link can run without error
-# for PACKAGE in $$(dh_listpackages); do \
-# for LINKSLIST in debian/$$PACKAGE.links; do \
-# if [ -f $$LINKSLIST.$(ARCH) ]; then \
-# LINKSLIST=$$LINKSLIST.$(ARCH); \
-# fi; \
-# if [ -f $$LINKSLIST ]; then \
-# cat $$LINKSLIST | while read SOURCE DEST; do \
-# install -m 755 -d $$(dirname debian/$$PACKAGE/$$DEST); \
-# rm -f debian/$$PACKAGE/$$DEST; \
-# done; \
-# fi; \
-# done; \
-# done
dh_link
dh_compress
dh_fixperms
dh_installdeb
-# dh_makeshlibs
-# dh_perl
dh_shlibdeps -l$(DEBTREEDIR)/usr/X11R6/lib
--exclude=usr/X11R6/lib/modules
dh_gencontrol
dh_md5sums
