X Strike Force XFree86 SVN commit: r1782 - branches/debconf-overhaul/debian
Author: branden
Date: 2004-08-31 19:03:28 -0500 (Tue, 31 Aug 2004)
New Revision: 1782
Modified:
branches/debconf-overhaul/debian/CHANGESETS
branches/debconf-overhaul/debian/TODO
branches/debconf-overhaul/debian/changelog
branches/debconf-overhaul/debian/xserver-xfree86.config.in
Log:
Migrate upgraders from previous package versions by automatically adding
v4l to xserver-xfree86/config/modules list.
Modified: branches/debconf-overhaul/debian/CHANGESETS
===================================================================
--- branches/debconf-overhaul/debian/CHANGESETS 2004-08-31 23:45:40 UTC (rev 1781)
+++ branches/debconf-overhaul/debian/CHANGESETS 2004-09-01 00:03:28 UTC (rev 1782)
@@ -580,7 +580,9 @@
+ Include the v4l server module in the list of available (and default)
modules to load. Add description of this module to
xserver-xfree86/config/modules template description. Refer to XVideo
- extension as such instead of "Xv". (Closes: #135768)
+ extension as such instead of "Xv". Migrate upgraders from previous
+ package versions by automatically adding v4l to module list.
+ (Closes: #135768)
[XXX: REPLACE WITH REVISION NUMBER WHEN MERGED TO TRUNK]
vim:set ai et sts=4 sw=4 tw=80:
Modified: branches/debconf-overhaul/debian/TODO
===================================================================
--- branches/debconf-overhaul/debian/TODO 2004-08-31 23:45:40 UTC (rev 1781)
+++ branches/debconf-overhaul/debian/TODO 2004-09-01 00:03:28 UTC (rev 1782)
@@ -35,8 +35,6 @@
port. See <URL: http://lists.debian.org/debian-68k/2004/08/msg00392.html>.
+ Where applicable, use present perfect tense in trace messages so they are
not confused with being in the imperative voice.
- + Migrate users of 4.3.0.dfsg.1-6 and previous to automatically add v4l
- to module list.
* Add FAQ entry describing Debian's plans in the X department.
4.3.0.dfsg.1-8
Modified: branches/debconf-overhaul/debian/changelog
===================================================================
--- branches/debconf-overhaul/debian/changelog 2004-08-31 23:45:40 UTC (rev 1781)
+++ branches/debconf-overhaul/debian/changelog 2004-09-01 00:03:28 UTC (rev 1782)
@@ -416,7 +416,9 @@
+ Include the v4l server module in the list of available (and default)
modules to load. Add description of this module to
xserver-xfree86/config/modules template description. Refer to XVideo
- extension as such instead of "Xv". (Closes: #135768)
+ extension as such instead of "Xv". Migrate upgraders from previous
+ package versions by automatically adding v4l to module list.
+ (Closes: #135768)
Changes by Fabio M. Di Nitto and Branden Robinson:
@@ -528,7 +530,7 @@
missing to enable this feature. No keymaps currently use this feature,
but users may find it useful with broken keymaps.
- -- Branden Robinson <branden@debian.org> Tue, 31 Aug 2004 18:40:15 -0500
+ -- Branden Robinson <branden@debian.org> Tue, 31 Aug 2004 19:02:00 -0500
xfree86 (4.3.0.dfsg.1-6) unstable; urgency=low
Modified: branches/debconf-overhaul/debian/xserver-xfree86.config.in
===================================================================
--- branches/debconf-overhaul/debian/xserver-xfree86.config.in 2004-08-31 23:45:40 UTC (rev 1781)
+++ branches/debconf-overhaul/debian/xserver-xfree86.config.in 2004-09-01 00:03:28 UTC (rev 1782)
@@ -1572,6 +1572,24 @@
trace "new value of template \"xserver-xfree86/config/modules\": \"$RET\""
fi
+# Add automatic loading of the "v4l" (Video4Linux) support module if upgrading
+# from a package version that didn't support it.
+if [ -n "$2" ] && dpkg --compare-versions "$2" lt "4.3.0.dfsg.1-7"; then
+ db_get xserver-xfree86/config/modules
+ # Only add the module if it's not already there.
+ if ! expr "$RET" : ".*v4l.*" >/dev/null 2>&1; then
+ trace "upgrading from package version $2; adding v4l to list of selected" \
+ "modules"
+ trace "old value of template \"xserver-xfree86/config/modules\": \"$RET\""
+ # Add it to the end with a comma and space prepended if there are already
+ # some selected modules. Otherwise, make v4l the only selected module.
+ SELECTED_MODULES="${RET:+$RET, }v4l"
+ db_set xserver-xfree86/config/modules "$SELECTED_MODULES"
+ db_get xserver-xfree86/config/modules
+ trace "new value of template \"xserver-xfree86/config/modules\": \"$RET\""
+ fi
+fi
+
# migrate from ATI driver sub-modules to ATI driver
db_get xserver-xfree86/config/device/driver
case "$RET" in
Reply to: