X Strike Force XFree86 SVN commit: r1534 - branches/lintian-cleanup/debian
Author: fabbione
Date: 2004-06-11 16:15:22 -0500 (Fri, 11 Jun 2004)
New Revision: 1534
Modified:
branches/lintian-cleanup/debian/CHANGESETS
branches/lintian-cleanup/debian/MANIFEST.alpha
branches/lintian-cleanup/debian/MANIFEST.arm
branches/lintian-cleanup/debian/MANIFEST.hppa
branches/lintian-cleanup/debian/MANIFEST.hurd-i386
branches/lintian-cleanup/debian/MANIFEST.i386
branches/lintian-cleanup/debian/MANIFEST.ia64
branches/lintian-cleanup/debian/MANIFEST.m68k
branches/lintian-cleanup/debian/MANIFEST.mips
branches/lintian-cleanup/debian/MANIFEST.mipsel
branches/lintian-cleanup/debian/MANIFEST.powerpc
branches/lintian-cleanup/debian/MANIFEST.sparc
branches/lintian-cleanup/debian/TODO
branches/lintian-cleanup/debian/changelog
branches/lintian-cleanup/debian/rules
branches/lintian-cleanup/debian/xserver-xfree86-dbg.install
branches/lintian-cleanup/debian/xserver-xfree86.lintian
Log:
Add workaround for lintian bug to make xserver-xfree86.lintian working.
Create xserver-xfree86-dbg.lintian on the fly from xserver-xfree86.lintian.
Update all related files.
Modified: branches/lintian-cleanup/debian/CHANGESETS
===================================================================
--- branches/lintian-cleanup/debian/CHANGESETS 2004-06-10 20:52:28 UTC (rev 1533)
+++ branches/lintian-cleanup/debian/CHANGESETS 2004-06-11 21:15:22 UTC (rev 1534)
@@ -20,4 +20,7 @@
* Install xterm.lintian, xserver-xfree86.lintian, xserver-common.lintian
1396 1397 1398
+* Create and install xserver-xfree86-dbg.lintian
+ 1534
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: branches/lintian-cleanup/debian/MANIFEST.alpha
===================================================================
--- branches/lintian-cleanup/debian/MANIFEST.alpha 2004-06-10 20:52:28 UTC (rev 1533)
+++ branches/lintian-cleanup/debian/MANIFEST.alpha 2004-06-11 21:15:22 UTC (rev 1534)
@@ -7827,6 +7827,7 @@
usr/share/configlets/xserver-common/xserver.xpm
usr/share/lintian/overrides/xserver-common
usr/share/lintian/overrides/xserver-xfree86
+usr/share/lintian/overrides/xserver-xfree86-dbg
usr/share/lintian/overrides/xterm
usr/share/man/man1/dexconf.1
usr/share/man/man1/xvfb-run.1
Modified: branches/lintian-cleanup/debian/MANIFEST.arm
===================================================================
--- branches/lintian-cleanup/debian/MANIFEST.arm 2004-06-10 20:52:28 UTC (rev 1533)
+++ branches/lintian-cleanup/debian/MANIFEST.arm 2004-06-11 21:15:22 UTC (rev 1534)
@@ -7817,6 +7817,7 @@
usr/share/configlets/xserver-common/xserver.xpm
usr/share/lintian/overrides/xserver-common
usr/share/lintian/overrides/xserver-xfree86
+usr/share/lintian/overrides/xserver-xfree86-dbg
usr/share/lintian/overrides/xterm
usr/share/man/man1/dexconf.1
usr/share/man/man1/xvfb-run.1
Modified: branches/lintian-cleanup/debian/MANIFEST.hppa
===================================================================
--- branches/lintian-cleanup/debian/MANIFEST.hppa 2004-06-10 20:52:28 UTC (rev 1533)
+++ branches/lintian-cleanup/debian/MANIFEST.hppa 2004-06-11 21:15:22 UTC (rev 1534)
@@ -7711,6 +7711,7 @@
usr/share/configlets/xserver-common/xserver.xpm
usr/share/lintian/overrides/xserver-common
usr/share/lintian/overrides/xserver-xfree86
+usr/share/lintian/overrides/xserver-xfree86-dbg
usr/share/lintian/overrides/xterm
usr/share/man/man1/dexconf.1
usr/share/man/man1/xvfb-run.1
Modified: branches/lintian-cleanup/debian/MANIFEST.hurd-i386
===================================================================
--- branches/lintian-cleanup/debian/MANIFEST.hurd-i386 2004-06-10 20:52:28 UTC (rev 1533)
+++ branches/lintian-cleanup/debian/MANIFEST.hurd-i386 2004-06-11 21:15:22 UTC (rev 1534)
@@ -7680,6 +7680,7 @@
usr/share/configlets/xserver-common/xserver.xpm
usr/share/lintian/overrides/xserver-common
usr/share/lintian/overrides/xserver-xfree86
+usr/share/lintian/overrides/xserver-xfree86-dbg
usr/share/lintian/overrides/xterm
usr/share/man/man1/dexconf.1
usr/share/man/man1/xvfb-run.1
Modified: branches/lintian-cleanup/debian/MANIFEST.i386
===================================================================
--- branches/lintian-cleanup/debian/MANIFEST.i386 2004-06-10 20:52:28 UTC (rev 1533)
+++ branches/lintian-cleanup/debian/MANIFEST.i386 2004-06-11 21:15:22 UTC (rev 1534)
@@ -7869,6 +7869,7 @@
usr/share/configlets/xserver-common/xserver.xpm
usr/share/lintian/overrides/xserver-common
usr/share/lintian/overrides/xserver-xfree86
+usr/share/lintian/overrides/xserver-xfree86-dbg
usr/share/lintian/overrides/xterm
usr/share/man/man1/dexconf.1
usr/share/man/man1/xvfb-run.1
Modified: branches/lintian-cleanup/debian/MANIFEST.ia64
===================================================================
--- branches/lintian-cleanup/debian/MANIFEST.ia64 2004-06-10 20:52:28 UTC (rev 1533)
+++ branches/lintian-cleanup/debian/MANIFEST.ia64 2004-06-11 21:15:22 UTC (rev 1534)
@@ -7864,6 +7864,7 @@
usr/share/configlets/xserver-common/xserver.xpm
usr/share/lintian/overrides/xserver-common
usr/share/lintian/overrides/xserver-xfree86
+usr/share/lintian/overrides/xserver-xfree86-dbg
usr/share/lintian/overrides/xterm
usr/share/man/man1/dexconf.1
usr/share/man/man1/xvfb-run.1
Modified: branches/lintian-cleanup/debian/MANIFEST.m68k
===================================================================
--- branches/lintian-cleanup/debian/MANIFEST.m68k 2004-06-10 20:52:28 UTC (rev 1533)
+++ branches/lintian-cleanup/debian/MANIFEST.m68k 2004-06-11 21:15:22 UTC (rev 1534)
@@ -7820,6 +7820,7 @@
usr/share/configlets/xserver-common/xserver.xpm
usr/share/lintian/overrides/xserver-common
usr/share/lintian/overrides/xserver-xfree86
+usr/share/lintian/overrides/xserver-xfree86-dbg
usr/share/lintian/overrides/xterm
usr/share/man/man1/dexconf.1
usr/share/man/man1/xvfb-run.1
Modified: branches/lintian-cleanup/debian/MANIFEST.mips
===================================================================
--- branches/lintian-cleanup/debian/MANIFEST.mips 2004-06-10 20:52:28 UTC (rev 1533)
+++ branches/lintian-cleanup/debian/MANIFEST.mips 2004-06-11 21:15:22 UTC (rev 1534)
@@ -7712,6 +7712,7 @@
usr/share/configlets/xserver-common/xserver.xpm
usr/share/lintian/overrides/xserver-common
usr/share/lintian/overrides/xserver-xfree86
+usr/share/lintian/overrides/xserver-xfree86-dbg
usr/share/lintian/overrides/xterm
usr/share/man/man1/dexconf.1
usr/share/man/man1/xvfb-run.1
Modified: branches/lintian-cleanup/debian/MANIFEST.mipsel
===================================================================
--- branches/lintian-cleanup/debian/MANIFEST.mipsel 2004-06-10 20:52:28 UTC (rev 1533)
+++ branches/lintian-cleanup/debian/MANIFEST.mipsel 2004-06-11 21:15:22 UTC (rev 1534)
@@ -7712,6 +7712,7 @@
usr/share/configlets/xserver-common/xserver.xpm
usr/share/lintian/overrides/xserver-common
usr/share/lintian/overrides/xserver-xfree86
+usr/share/lintian/overrides/xserver-xfree86-dbg
usr/share/lintian/overrides/xterm
usr/share/man/man1/dexconf.1
usr/share/man/man1/xvfb-run.1
Modified: branches/lintian-cleanup/debian/MANIFEST.powerpc
===================================================================
--- branches/lintian-cleanup/debian/MANIFEST.powerpc 2004-06-10 20:52:28 UTC (rev 1533)
+++ branches/lintian-cleanup/debian/MANIFEST.powerpc 2004-06-11 21:15:22 UTC (rev 1534)
@@ -7828,6 +7828,7 @@
usr/share/configlets/xserver-common/xserver.xpm
usr/share/lintian/overrides/xserver-common
usr/share/lintian/overrides/xserver-xfree86
+usr/share/lintian/overrides/xserver-xfree86-dbg
usr/share/lintian/overrides/xterm
usr/share/man/man1/dexconf.1
usr/share/man/man1/xvfb-run.1
Modified: branches/lintian-cleanup/debian/MANIFEST.sparc
===================================================================
--- branches/lintian-cleanup/debian/MANIFEST.sparc 2004-06-10 20:52:28 UTC (rev 1533)
+++ branches/lintian-cleanup/debian/MANIFEST.sparc 2004-06-11 21:15:22 UTC (rev 1534)
@@ -7854,6 +7854,7 @@
usr/share/configlets/xserver-common/xserver.xpm
usr/share/lintian/overrides/xserver-common
usr/share/lintian/overrides/xserver-xfree86
+usr/share/lintian/overrides/xserver-xfree86-dbg
usr/share/lintian/overrides/xterm
usr/share/man/man1/dexconf.1
usr/share/man/man1/xvfb-run.1
Modified: branches/lintian-cleanup/debian/TODO
===================================================================
--- branches/lintian-cleanup/debian/TODO 2004-06-10 20:52:28 UTC (rev 1533)
+++ branches/lintian-cleanup/debian/TODO 2004-06-11 21:15:22 UTC (rev 1534)
@@ -9,11 +9,6 @@
Items for lintian-cleanup branch
--------------------------------
-* Fix xserver-xfree86.lintian or lintian. For some unknown the overrides are
- ignored.
-
-* Create xserver-xfree86-dgb.lintian based on xserver-xfree86.lintian.
-
Post 4.3.0-1
------------
* Re-do migration of /usr/X11R6/lib/X11/{app-defaults,xkb}:
Modified: branches/lintian-cleanup/debian/changelog
===================================================================
--- branches/lintian-cleanup/debian/changelog 2004-06-10 20:52:28 UTC (rev 1533)
+++ branches/lintian-cleanup/debian/changelog 2004-06-11 21:15:22 UTC (rev 1534)
@@ -1,5 +1,9 @@
xfree86 (4.3.0.dfsg.1-1+SVN) unstable; urgency=low
+ * Modify debian/rules to create xserver-xfree86-dbg.lintian dynamically.
+
+ * Fix xserver-xfree86.lintian to workaround a lintian bug.
+
* Install xterm.lintian, xserver-xfree86.lintian and xserver-common.lintian
override files, update MANIFEST.*, xserver-xfree86.install.*, xterm.install
and xserver-common.install.
Modified: branches/lintian-cleanup/debian/rules
===================================================================
--- branches/lintian-cleanup/debian/rules 2004-06-10 20:52:28 UTC (rev 1533)
+++ branches/lintian-cleanup/debian/rules 2004-06-11 21:15:22 UTC (rev 1534)
@@ -130,7 +130,7 @@
# Rule to clean the maintainer scripts.
cleanscripts:
rm -f debian/*.config debian/*.postinst debian/*.postrm debian/*.preinst debian/*.prerm
- rm -f debian/xserver-xfree86-dbg.templates
+ rm -f debian/xserver-xfree86-dbg.{templates,lintian}
rm -f $(STAMP_DIR)/genscripts
clean: cleanscripts
@@ -321,6 +321,9 @@
install -d -m 755 $(DEBTREEDIR)/usr/share/lintian/overrides
install -m 644 debian/xserver-common.lintian $(DEBTREEDIR)/usr/share/lintian/overrides/xserver-common
install -m 644 debian/xserver-xfree86.lintian $(DEBTREEDIR)/usr/share/lintian/overrides/xserver-xfree86
+ cat debian/xserver-xfree86.lintian | \
+ sed -e 's/^xserver-xfree86/xserver-xfree86-dbg/' > debian/xserver-xfree86-dbg.lintian
+ install -m 644 debian/xserver-xfree86-dbg.lintian $(DEBTREEDIR)/usr/share/lintian/overrides/xserver-xfree86-dbg
install -m 644 debian/xterm.lintian $(DEBTREEDIR)/usr/share/lintian/overrides/xterm
# compare manifests
(cd debian/tmp && find -type f | LC_ALL=C sort | cut -c3-) > debian/MANIFEST.$(ARCH).new
Modified: branches/lintian-cleanup/debian/xserver-xfree86-dbg.install
===================================================================
--- branches/lintian-cleanup/debian/xserver-xfree86-dbg.install 2004-06-10 20:52:28 UTC (rev 1533)
+++ branches/lintian-cleanup/debian/xserver-xfree86-dbg.install 2004-06-11 21:15:22 UTC (rev 1534)
@@ -1 +1,2 @@
usr/X11R6/bin/XFree86-debug
+usr/share/lintian/overrides/xserver-xfree86-dbg
Modified: branches/lintian-cleanup/debian/xserver-xfree86.lintian
===================================================================
--- branches/lintian-cleanup/debian/xserver-xfree86.lintian 2004-06-10 20:52:28 UTC (rev 1533)
+++ branches/lintian-cleanup/debian/xserver-xfree86.lintian 2004-06-11 21:15:22 UTC (rev 1534)
@@ -1,5 +1,8 @@
# $Id$
+# temporary workaround for lintian bug #253884
+xserver-xfree86: partially-translated-question
+
# The Choices field for this question does not need to be translated, since
# it is a package name.
xserver-xfree86: partially-translated-question shared/default-x-server
Reply to: