Author: branden Date: 2004-09-23 11:50:08 -0500 (Thu, 23 Sep 2004) New Revision: 1860
Modified: branches/debconf-overhaul/debian/CHANGESETS branches/debconf-overhaul/debian/rules branches/debconf-overhaul/debian/xserver-xfree86.bug Log: Update the xserver-xfree86{,-dbg} packages' bug scripts to include their corresponding config logs, if they are available. Since the bug script now has to be aware of its own package's name, generate the xserver-xfree86-dbg bug script from xserver-xfree86's with a sed substitution in debian/rules instead of simply copying it, and remove this generated file in the clean rule. Wrap some long lines in debian/rules. Update Vim modeline in debian/xserver-xfree86.bug. Modified: branches/debconf-overhaul/debian/CHANGESETS =================================================================== --- branches/debconf-overhaul/debian/CHANGESETS 2004-09-22 23:48:09 UTC (rev 1859) +++ branches/debconf-overhaul/debian/CHANGESETS 2004-09-23 16:50:08 UTC (rev 1860) @@ -21,6 +21,12 @@ /var/log/xserver-xfree86{,-dbg}.config.log. Eliminate debug_echo() function in favor of trace(), and update all calls to the former to use the latter instead. ++ Update the xserver-xfree86{,-dbg} packages' bug scripts to include their + corresponding config logs, if they are available. Since the bug script now + has to be aware of its own package's name, generate the xserver-xfree86-dbg + bug script from xserver-xfree86's with a sed substitution in debian/rules + instead of simply copying it, and remove this generated file in the clean + rule. + Rename priority_ceil() to set_db_priority() make it actually change the $PRIORITY global variable instead of just returning a value. Upgrade a couple of debugging statements in this function which are issued under Modified: branches/debconf-overhaul/debian/rules =================================================================== --- branches/debconf-overhaul/debian/rules 2004-09-22 23:48:09 UTC (rev 1859) +++ branches/debconf-overhaul/debian/rules 2004-09-23 16:50:08 UTC (rev 1860) @@ -142,7 +142,7 @@ dh_clean debian/local/xserver-wrapper debian/local/FAQ.gz \ debian/local/xterm.faq.gz debian/shlibs.local \ debian/MANIFEST.$(ARCH) debian/MANIFEST.$(ARCH).new \ - debian/po/pothead + debian/po/pothead debian/xserver-xfree86-dbg.bug # All 'important' targets have 2 lines. The one that is run by # dpkg-buildpackage or the user, and the one that does the actual work. This @@ -445,9 +445,14 @@ # how about a dh_installbug? :) ifndef NOT_BUILDING_XFREE86_X_SERVER install -m 755 -d debian/xserver-xfree86/usr/share/bug - install -m 755 debian/xserver-xfree86.bug debian/xserver-xfree86/usr/share/bug/xserver-xfree86 + install -m 755 debian/xserver-xfree86.bug \ + debian/xserver-xfree86/usr/share/bug/xserver-xfree86 + # Generate xserver-xfree86-dbg's bug script from xserver-xfree86's. + sed -e 's/^THIS_PACKAGE=xserver-xfree86/&-dbg/' \ + <debian/xserver-xfree86.bug >debian/xserver-xfree86-dbg.bug 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 + install -m 755 debian/xserver-xfree86-dbg.bug \ + debian/xserver-xfree86-dbg/usr/share/bug/xserver-xfree86-dbg endif # (Crudely) test to see if we're shipping xlibmesa-dri for the architecture being built. ifneq (,$(findstring xlibmesa-dri,$(XLIBMESA_GL_SPECIAL_DEPENDS))) Modified: branches/debconf-overhaul/debian/xserver-xfree86.bug =================================================================== --- branches/debconf-overhaul/debian/xserver-xfree86.bug 2004-09-22 23:48:09 UTC (rev 1859) +++ branches/debconf-overhaul/debian/xserver-xfree86.bug 2004-09-23 16:50:08 UTC (rev 1860) @@ -12,6 +12,12 @@ XF86CONFIG_CHECKSUM="$CONFIG_AUX_DIR/${XF86CONFIG##*/}.md5sum" XF86CONFIG_ROSTER="$CONFIG_AUX_DIR/${XF86CONFIG##*/}.roster" +# The following may look like needless indirection, but don't fiddle with it. +# The debian/rules file runs a sed operation on the next line to generate +# xserver-xfree86-dbg's bug script. +THIS_PACKAGE=xserver-xfree86 +CONFIG_LOG="/var/log/$THIS_PACKAGE.config.log" + if [ -e "$SERVER_SYMLINK_ROSTER" ]; then printf "Contents of $SERVER_SYMLINK_ROSTER:\n" >&3 cat "$SERVER_SYMLINK_ROSTER" >&3 @@ -117,4 +123,12 @@ printf "\n" >&3 -# vim:set ai et sts=4 sw=4 tw=0: +if [ -e "$CONFIG_LOG" ]; then + cat "$CONFIG_LOG" >&3 +else + printf "No $CONFIG_LOG file on system.\n" >&3 +fi + +printf "\n" >&3 + +# vim:set ai et sts=4 sw=4 tw=80: