xdm: Changes to 'debian-unstable'
debian/changelog | 1
debian/local/Xreset | 2
debian/local/Xsetup | 2
debian/local/Xstartup | 2
debian/local/xdm.options | 2
debian/local/xdm.options.5 | 2
debian/po/ca.po | 1
debian/po/cs.po | 1
debian/po/da.po | 1
debian/po/de.po | 1
debian/po/el.po | 1
debian/po/eu.po | 1
debian/po/fr.po | 1
debian/po/gl.po | 1
debian/po/it.po | 1
debian/po/ja.po | 1
debian/po/nl.po | 1
debian/po/pl.po | 1
debian/po/pothead.in | 1
debian/po/pt.po | 1
debian/po/pt_BR.po | 1
debian/po/ro.po | 1
debian/po/ru.po | 1
debian/po/sk.po | 1
debian/po/sv.po | 1
debian/po/tr.po | 1
debian/po/vi.po | 1
debian/xdm.README.Debian | 2
debian/xdm.config.in | 2
debian/xdm.init | 2
debian/xdm.logrotate | 2
debian/xdm.pam | 2
debian/xdm.postinst.in | 2
debian/xdm.postrm.in | 2
debian/xdm.preinst.in | 2
debian/xdm.prerm.in | 2
debian/xsfbs/xsfbs.mk | 21 ----
debian/xsfbs/xsfbs.sh | 233 ---------------------------------------------
38 files changed, 4 insertions(+), 300 deletions(-)
New commits:
commit 7c8cefa5ac2edfa5b06e7b46a6988ddd5476522a
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Mar 7 13:09:06 2010 +0100
Get rid of obsolete svn $Id$ keywords in the packaging.
diff --git a/debian/changelog b/debian/changelog
index 6a89876..386f5fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ xdm (1:1.1.9-1) UNRELEASED; urgency=low
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
good reason. Thanks, Colin Watson!
* Remove myself from Uploaders
+ * Get rid of obsolete svn $Id$ keywords in the packaging.
[ Brice Goglin ]
* New upstream release.
diff --git a/debian/local/Xreset b/debian/local/Xreset
index eccc019..aafe4ba 100644
--- a/debian/local/Xreset
+++ b/debian/local/Xreset
@@ -1,7 +1,5 @@
#!/bin/sh
#
-# $Id: Xreset 189 2005-06-11 00:04:27Z branden $
-#
# This script is run as root after the user's X session ends.
# Use common Xreset framework if it exist
diff --git a/debian/local/Xsetup b/debian/local/Xsetup
index 81f71a1..5d11100 100644
--- a/debian/local/Xsetup
+++ b/debian/local/Xsetup
@@ -1,7 +1,5 @@
#!/bin/sh
#
-# $Id$
-#
# This script is run as root before showing login widget.
#xsetroot -solid rgb:8/8/8
diff --git a/debian/local/Xstartup b/debian/local/Xstartup
index 8c0c5cb..cd51e52 100644
--- a/debian/local/Xstartup
+++ b/debian/local/Xstartup
@@ -1,7 +1,5 @@
#!/bin/sh
#
-# $Id: Xstartup 189 2005-06-11 00:04:27Z branden $
-#
# This script is run as root after the user logs in. If this script exits with
# a return code other than 0, the user's session will not be started.
diff --git a/debian/local/xdm.options b/debian/local/xdm.options
index 908c62f..0ebb7b2 100644
--- a/debian/local/xdm.options
+++ b/debian/local/xdm.options
@@ -1,5 +1,3 @@
-# $Id: xdm.options 189 2005-06-11 00:04:27Z branden $
-#
# configuration options for xdm
# See xdm.options(5) for an explanation of the available options.
diff --git a/debian/local/xdm.options.5 b/debian/local/xdm.options.5
index c82e5e0..621e8b3 100644
--- a/debian/local/xdm.options.5
+++ b/debian/local/xdm.options.5
@@ -1,5 +1,3 @@
-.\" $Id: xdm.options.5 642 2005-09-30 01:04:37Z dnusinow $
-.\"
.\" Copyright 1998, 2002-2004 Branden Robinson <branden@debian.org>.
.\"
.\" This is free software; you may redistribute it and/or modify
diff --git a/debian/po/ca.po b/debian/po/ca.po
index 7e177fd..1817f7c 100644
--- a/debian/po/ca.po
+++ b/debian/po/ca.po
@@ -1,7 +1,6 @@
# debconf templates for xorg-x11 package
# Catalan translation
#
-# $Id: ca.po 1273 2006-02-21 10:58:12Z ender $
#
# Copyrights:
# Branden Robinson, 2000-2004
diff --git a/debian/po/cs.po b/debian/po/cs.po
index de30ed2..51874a6 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -1,7 +1,6 @@
# debconf templates for xdm package
# Czech translation
#
-# $Id: cs.po 1042 2006-01-09 07:55:08Z ender $
#
# Copyrights:
# Branden Robinson, 2000-2004
diff --git a/debian/po/da.po b/debian/po/da.po
index e60ecce..19b230f 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -1,7 +1,6 @@
# debconf templates for xorg-x11 package
# Danish translation
#
-# $Id: da.po 1042 2006-01-09 07:55:08Z ender $
#
# Copyrights:
# Branden Robinson, 2000-2004
diff --git a/debian/po/de.po b/debian/po/de.po
index ac744b3..a6e902a 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -2,7 +2,6 @@
# debconf templates for xorg-x11 package
# German translation
#
-# $Id: de.po 1042 2006-01-09 07:55:08Z ender $
#
# Copyrights:
#
diff --git a/debian/po/el.po b/debian/po/el.po
index 6ee8c56..0d56cb4 100644
--- a/debian/po/el.po
+++ b/debian/po/el.po
@@ -1,7 +1,6 @@
# debconf templates for xorg-x11 package
# Greek translation
#
-# $Id: el.po 1042 2006-01-09 07:55:08Z ender $
#
# Copyrights:
# Branden Robinson, 2000-2004
diff --git a/debian/po/eu.po b/debian/po/eu.po
index e6e5022..6f89455 100644
--- a/debian/po/eu.po
+++ b/debian/po/eu.po
@@ -2,7 +2,6 @@
# debconf templates for xorg-x11 package
# Euskara translation
#
-# $Id: eu.po 490 2005-08-03 09:59:07Z ender $
#
# Copyright:
#
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 0846844..18a727f 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -2,7 +2,6 @@
# debconf templates for xorg-x11 package
# French translation
#
-# $Id: fr.po 1053 2006-01-10 19:20:06Z ender $
#
# Copyrights:
#
diff --git a/debian/po/gl.po b/debian/po/gl.po
index 888e2a2..042e985 100644
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
@@ -1,7 +1,6 @@
# debconf templates for xorg-x11 package
# Galician translation
#
-# $Id: gl.po 1080 2006-01-14 02:15:39Z ender $
#
# Copyrights:
# Branden Robinson, 2000-2004
diff --git a/debian/po/it.po b/debian/po/it.po
index ef45502..295ba1c 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -1,7 +1,6 @@
# debconf templates for xorg-x11 package
# Italian translation
#
-# $Id: it.po 1042 2006-01-09 07:55:08Z ender $
#
# Copyrights:
# Branden Robinson, 2000-2004
diff --git a/debian/po/ja.po b/debian/po/ja.po
index 7c6162f..ae67704 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -1,7 +1,6 @@
# debconf templates for xorg-x11 package
# Japanese translation
#
-# $Id: ja.po 1063 2006-01-11 10:46:20Z ender $
#
# Copyrights:
# Branden Robinson, 2000-2004
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 669e95b..d739093 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -1,7 +1,6 @@
# debconf templates for xorg-x11 package
# Dutch translation
#
-# $Id: nl.po 1042 2006-01-09 07:55:08Z ender $
#
# Copyrights:
# Branden Robinson, 2000-2004
diff --git a/debian/po/pl.po b/debian/po/pl.po
index 8e98688..3746980 100644
--- a/debian/po/pl.po
+++ b/debian/po/pl.po
@@ -1,7 +1,6 @@
# debconf templates for xdm package
# Polish translation
#
-# $Id: pl.po 1042 2006-01-09 07:55:08Z ender $
#
# Copyrights:
# Branden Robinson, 2000-2004
diff --git a/debian/po/pothead.in b/debian/po/pothead.in
index e4af169..f5fb269 100644
--- a/debian/po/pothead.in
+++ b/debian/po/pothead.in
@@ -1,6 +1,5 @@
# debconf templates for xorg-x11 package
#
-# $Id: pothead.in 498 2005-08-05 01:55:05Z dnusinow $
#
# Copyright:
# Branden Robinson, 2000-2004
diff --git a/debian/po/pt.po b/debian/po/pt.po
index ca52cc6..301119b 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -1,6 +1,5 @@
# debconf templates for xorg-x11 package
# Portuguese translation
-# $Id: pt.po 1042 2006-01-09 07:55:08Z ender $
# Copyright:
# Branden Robinson, 2000-2004
# Eduardo Silva <jobezone@yahoo.com>, 2007
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index bce9be7..c54d2fd 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -1,7 +1,6 @@
# Brazilian Portuguese translation (xdm)
# debconf templates for xdm package
#
-# $Id: pt_BR.po 1042 2006-01-09 07:55:08Z ender $
#
# Copyrights:
#
diff --git a/debian/po/ro.po b/debian/po/ro.po
index 0eec194..d3b0472 100644
--- a/debian/po/ro.po
+++ b/debian/po/ro.po
@@ -1,7 +1,6 @@
# translation of ro.po to Romanian
# debconf templates for xorg-x11 package
#
-# $Id: pothead.in 189 2005-06-11 00:04:27Z branden $
#
# Copyright:
#
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 0ccd9f4..7a1f2eb 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -2,7 +2,6 @@
# debconf templates for xorg-x11 package
# Russian translation
#
-# $Id: ru.po 1042 2006-01-09 07:55:08Z ender $
#
# Copyrights:
# Branden Robinson, 2000-2004
diff --git a/debian/po/sk.po b/debian/po/sk.po
index 6be1041..d4d073e 100644
--- a/debian/po/sk.po
+++ b/debian/po/sk.po
@@ -1,6 +1,5 @@
# debconf templates for xorg-x11 package
# Slovak translation
-# $Id: sk.po 1042 2006-01-09 07:55:08Z ender $
#
# Copyrights:
# Branden Robinson, 2000-2004
diff --git a/debian/po/sv.po b/debian/po/sv.po
index f01d96d..5c99025 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -1,7 +1,6 @@
# debconf templates for xorg-x11 package
# Swedish translation
#
-# $Id: sv.po 1042 2006-01-09 07:55:08Z ender $
#
# Copyrights:
# Branden Robinson, 2000-2004
diff --git a/debian/po/tr.po b/debian/po/tr.po
index 1387d95..74f4aaf 100644
--- a/debian/po/tr.po
+++ b/debian/po/tr.po
@@ -2,7 +2,6 @@
# debconf templates for xorg-x11 package
# Turkish translation
#
-# $Id: tr.po 1061 2006-01-11 10:19:43Z ender $
#
# Copyrights:
# Branden Robinson, 2000-2004
diff --git a/debian/po/vi.po b/debian/po/vi.po
index 2f9332b..4f47930 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -1,7 +1,6 @@
# debconf templates for xorg-x11 package
# Vietnamese translation
#
-# $Id: vi.po 1042 2006-01-09 07:55:08Z ender $
#
# Copyright:
# Branden Robinson, 2000-2004
diff --git a/debian/xdm.README.Debian b/debian/xdm.README.Debian
index ce84c2c..e947369 100644
--- a/debian/xdm.README.Debian
+++ b/debian/xdm.README.Debian
@@ -51,6 +51,4 @@ xdm.options contains configuration options for xdm that are specific to the
Debian GNU/Linux system. See the xdm.options(5) manual page for more
information.
-$Id: xdm.README.Debian 428 2005-07-28 04:30:44Z dnusinow $
-
vim:set ai et sts=4 sw=4 tw=80:
diff --git a/debian/xdm.config.in b/debian/xdm.config.in
index 34a24c3..dd200b8 100644
--- a/debian/xdm.config.in
+++ b/debian/xdm.config.in
@@ -4,8 +4,6 @@
# Licensed under the GNU General Public License, version 2. See the file
# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
-# $Id: xdm.config.in 189 2005-06-11 00:04:27Z branden $
-
set -e
# source debconf library
diff --git a/debian/xdm.init b/debian/xdm.init
index 162fb65..f744708 100644
--- a/debian/xdm.init
+++ b/debian/xdm.init
@@ -1,7 +1,5 @@
#!/bin/sh
-# $Id: xdm.init 996 2006-01-02 19:27:34Z ender $
-
# Copyright 1998-2002, 2004, 2005 Branden Robinson <branden@debian.org>.
# Copyright 2006 Eugene Konev <ejka@imfi.kspu.ru>
#
diff --git a/debian/xdm.logrotate b/debian/xdm.logrotate
index d94c356..5a2b6c7 100644
--- a/debian/xdm.logrotate
+++ b/debian/xdm.logrotate
@@ -1,5 +1,3 @@
-# $Id: xdm.logrotate 189 2005-06-11 00:04:27Z branden $
-
/var/log/xdm.log {
weekly
rotate 52
diff --git a/debian/xdm.pam b/debian/xdm.pam
index 46114ff..c8cf1b4 100644
--- a/debian/xdm.pam
+++ b/debian/xdm.pam
@@ -1,5 +1,3 @@
-# $Id: xdm.pam 189 2005-06-11 00:04:27Z branden $
-
@include common-auth
@include common-account
@include common-session
diff --git a/debian/xdm.postinst.in b/debian/xdm.postinst.in
index 9c8a102..24822d3 100644
--- a/debian/xdm.postinst.in
+++ b/debian/xdm.postinst.in
@@ -5,8 +5,6 @@
# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
# Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava.
-# $Id: xdm.postinst.in 189 2005-06-11 00:04:27Z branden $
-
set -e
# source debconf library
diff --git a/debian/xdm.postrm.in b/debian/xdm.postrm.in
index a6c4315..dd90a63 100644
--- a/debian/xdm.postrm.in
+++ b/debian/xdm.postrm.in
@@ -5,8 +5,6 @@
# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
# Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava.
-# $Id: xdm.postrm.in 189 2005-06-11 00:04:27Z branden $
-
set -e
THIS_PACKAGE=xdm
diff --git a/debian/xdm.preinst.in b/debian/xdm.preinst.in
index 7f34b7d..11b4f9f 100644
--- a/debian/xdm.preinst.in
+++ b/debian/xdm.preinst.in
@@ -5,8 +5,6 @@
# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
# Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava.
-# $Id: xdm.preinst.in 189 2005-06-11 00:04:27Z branden $
-
set -e
THIS_PACKAGE=xdm
diff --git a/debian/xdm.prerm.in b/debian/xdm.prerm.in
index b6aabe5..866dce6 100644
--- a/debian/xdm.prerm.in
+++ b/debian/xdm.prerm.in
@@ -5,8 +5,6 @@
# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
# Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava.
-# $Id: xdm.prerm.in 189 2005-06-11 00:04:27Z branden $
-
set -e
# debconf may not be available if some massive purging is going on
commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Sep 25 16:39:23 2009 +0200
xsfbs.mk: remove more obsolete code
We can use plain debconf-updatepo, and don't need to clean the 'imports'
directory or shlibs.local.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 82eb45f..5e16b10 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -177,19 +177,7 @@ xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
rm -rf $(STAMP_DIR)
- rm -rf imports
- dh_clean debian/shlibs.local \
- debian/po/pothead
-
-# Generate the debconf templates POT file header.
-debian/po/pothead: debian/po/pothead.in
- sed -e 's/SOURCE_VERSION/$(SOURCE_VERSION)/' \
- -e 's/DATE/$(shell date "+%F %X%z"/)' <$< >$@
-
-# Update POT and PO files.
-.PHONY: updatepo
-updatepo: debian/po/pothead
- debian/scripts/debconf-updatepo --pot-header=pothead --verbose
+ dh_clean
# Remove files from the upstream source tree that we don't need, or which have
# licensing problems. It must be run before creating the .orig.tar.gz.
commit 9a4314c976e0d22e8d47f5d86163791e407a6ecc
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Sep 25 15:43:28 2009 +0200
xsfbs.mk: kill obsolete DEFAULT_DCRESOLUTIONS and SOURCE_DIR usage
These variables aren't set anywhere.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 1f86848..82eb45f 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -176,7 +176,7 @@ cleanscripts:
xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
- rm -rf $(STAMP_DIR) $(SOURCE_DIR)
+ rm -rf $(STAMP_DIR)
rm -rf imports
dh_clean debian/shlibs.local \
debian/po/pothead
@@ -252,7 +252,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
| sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \
sed -e 's/@SOURCE_VERSION@/$(SOURCE_VERSION)/' \
-e 's/@OFFICIAL_BUILD@/$(OFFICIAL_BUILD)/' \
- -e 's/@DEFAULT_DCRESOLUTIONS@/$(DEFAULT_DCRESOLUTIONS)/' \
<$$MAINTSCRIPT.tmp >$$MAINTSCRIPT; \
rm $$MAINTSCRIPT.tmp; \
fi; \
commit bda208ec00d0b7b3632f57fb27e014684cdf73ba
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Sep 25 15:33:39 2009 +0200
xsfbs.sh: fix typo and remove svn keyword
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 45acd59..813fd8d 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -1,5 +1,3 @@
-# $Id$
-
# This is the X Strike Force shell library for X Window System package
# maintainer scripts. It serves to define shell functions commonly used by
# such packages, and performs some error checking necessary for proper operation
@@ -8,7 +6,7 @@
# removal tasks.
# If you are reading this within a Debian package maintainer script (e.g.,
-# /var/lib/dpkg)info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can
+# /var/lib/dpkg/info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can
# skip past this library by scanning forward in this file to the string
# "GOBSTOPPER".
commit 5693792171d885769e58dcccc053c08b11acd12a
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 26 18:53:36 2009 +0200
xsfbs.mk: no need for shlibs.local
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index f0f8953..1f86848 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -265,10 +265,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
# debian/*.prerm
>$@
-# Generate the shlibs.local file.
-debian/shlibs.local:
- cat debian/*.shlibs >$@
-
SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null)
VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null)
commit 1f858adff1ce2687cf542dd9b69b81137412f8a4
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 26 18:47:09 2009 +0200
xsfbs.sh: remove unused reject_whitespace function
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index b3f4bbe..45acd59 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -93,22 +93,6 @@ reject_nondigits () {
done
}
-reject_whitespace () {
- # syntax: reject_whitespace [ operand ]
- #
- # scan operand (typically a shell variable whose value cannot be trusted) for
- # whitespace characters and barf if any are found
- if [ -n "$1" ]; then
- # does the operand contain any whitespace?
- if expr "$1" : "[[:space:]]" > /dev/null 2>&1; then
- # can't use die(), because I want to avoid forward references
- echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_whitespace() encountered" \
- "possibly malicious garbage \"$1\"" >&2
- exit $SHELL_LIB_THROWN_ERROR
- fi
- fi
-}
-
reject_unlikely_path_chars () {
# syntax: reject_unlikely_path_chars [ operand ... ]
#
commit 0dd71e12416aa7dc60ed68af8127e04609b125f4
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 26 18:23:53 2009 +0200
xsfbs.sh: remove unused find_culprits function
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 7dbb196..b3f4bbe 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -199,53 +199,6 @@ usage_error () {
exit $SHELL_LIB_USAGE_ERROR
}
-find_culprits () {
- local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \
- msg
-
- reject_whitespace "$1"
- message "Searching for overlapping packages..."
- dpkg_info_dir=/var/lib/dpkg/info
- if [ -d $dpkg_info_dir ]; then
- if [ "$(echo $dpkg_info_dir/*.list)" != "$dpkg_info_dir/*.list" ]; then
- possible_culprits=$(ls -1 $dpkg_info_dir/*.list | egrep -v \
- "(xbase-clients|x11-common|xfs|xlibs)")
- if [ -n "$possible_culprits" ]; then
- smoking_guns=$(grep -l "$1" $possible_culprits || true)
- if [ -n "$smoking_guns" ]; then
- bad_packages=$(printf "\\n")
- for f in $smoking_guns; do
- # too bad you can't nest parameter expansion voodoo
- p=${f%*.list} # strip off the trailing ".list"
- package=${p##*/} # strip off the directories
- bad_packages=$(printf "%s\n%s" "$bad_packages" "$package")
- done
- msg=$(cat <<EOF
-The following packages appear to have file overlaps with the X.Org packages;
-these packages are either very old, or in violation of Debian Policy. Try
-upgrading each of these packages to the latest available version if possible:
-for example, with the command "apt-get install". If no newer version of a
-package is available, you will have to remove it; for example, with the command
-"apt-get remove". If even the latest available version of the package has
-this file overlap, please file a bug against that package with the Debian Bug
-Tracking System. You may want to refer the package maintainer to section 12.8
-of the Debian Policy manual.
-EOF
-)
- message "$msg"
- message "The overlapping packages are: $bad_packages"
- else
- message "no overlaps found."
- fi
- fi
- else
- message "cannot search; no matches for $dpkg_info_dir/*.list."
- fi
- else
- message "cannot search; $dpkg_info_dir does not exist."
- fi
-}
-
font_update () {
# run $UPDATECMDS in $FONTDIRS
commit b6c6eceec66066ebac16c85cc75bfa8a4f6cf58a
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 26 18:23:06 2009 +0200
xsfbs.sh: remove unused maplink function
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index f869274..7dbb196 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -199,37 +199,6 @@ usage_error () {
exit $SHELL_LIB_USAGE_ERROR
}
-
-maplink () {
- # returns what symlink should point to; i.e., what the "sane" answer is
- # Keep this in sync with the debian/*.links files.
- # This is only needed for symlinks to directories.
- #
- # XXX: Most of these look wrong in the X11R7 world and need to be fixed.
- # If we've stopped using this function, fixing it might enable us to re-enable
- # it again and catch more errors.
- case "$1" in
- /etc/X11/xkb/compiled) echo /var/lib/xkb ;;
- /etc/X11/xkb/xkbcomp) echo /usr/X11R6/bin/xkbcomp ;;
- /usr/X11R6/lib/X11/app-defaults) echo /etc/X11/app-defaults ;;
- /usr/X11R6/lib/X11/fs) echo /etc/X11/fs ;;
- /usr/X11R6/lib/X11/lbxproxy) echo /etc/X11/lbxproxy ;;
- /usr/X11R6/lib/X11/proxymngr) echo /etc/X11/proxymngr ;;
- /usr/X11R6/lib/X11/rstart) echo /etc/X11/rstart ;;
- /usr/X11R6/lib/X11/twm) echo /etc/X11/twm ;;
- /usr/X11R6/lib/X11/xdm) echo /etc/X11/xdm ;;
- /usr/X11R6/lib/X11/xinit) echo /etc/X11/xinit ;;
- /usr/X11R6/lib/X11/xkb) echo /etc/X11/xkb ;;
- /usr/X11R6/lib/X11/xserver) echo /etc/X11/xserver ;;
- /usr/X11R6/lib/X11/xsm) echo /etc/X11/xsm ;;
- /usr/bin/X11) echo ../X11R6/bin ;;
- /usr/bin/rstartd) echo ../X11R6/bin/rstartd ;;
- /usr/include/X11) echo ../X11R6/include/X11 ;;
- /usr/lib/X11) echo ../X11R6/lib/X11 ;;
- *) internal_error "maplink() called with unknown path \"$1\"" ;;
- esac
-}
-
find_culprits () {
local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \
msg
commit 8eb3d6a5ce9964876e48ea56048f1a5135ef4f28
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 26 18:21:34 2009 +0200
xsfbs.sh: remove unused analyze_path
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 4461b1a..f869274 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -230,32 +230,6 @@ maplink () {
esac
}
-analyze_path () {
- # given a supplied set of pathnames, break each one up by directory and do an
- # ls -dl on each component, cumulatively; i.e.
- # analyze_path /usr/X11R6/bin -> ls -dl /usr /usr/X11R6 /usr/X11R6/bin
- # Thanks to Randolph Chung for this clever hack.
-
- local f g
-
- while [ -n "$1" ]; do
- reject_whitespace "$1"
- g=
- message "Analyzing $1:"
- for f in $(echo "$1" | tr / \ ); do
- if [ -e /$g$f ]; then
- ls -dl /$g$f /$g$f.dpkg-* 2> /dev/null || true
- g=$g$f/
- else
- message "/$g$f: nonexistent; directory contents of /$g:"
- ls -l /$g
- break
- fi
- done
- shift
- done
-}
-
find_culprits () {
local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \
msg
commit 1d0081bdf60944d8ef0935a531dfbcc5f01739c5
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 26 18:20:11 2009 +0200
xsfbs.sh: remove unused check_symlinks_and_{bomb,warn}
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 781826f..4461b1a 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -303,115 +303,6 @@ EOF
fi
}
-check_symlink () {
- # syntax: check_symlink symlink
- #
- # See if specified symlink points where it is supposed to. Return 0 if it
- # does, and 1 if it does not.
- #
- # Primarily used by check_symlinks_and_warn() and check_symlinks_and_bomb().
-
- local symlink
-
- # validate arguments
- if [ $# -ne 1 ]; then
- usage_error "check_symlink() called with wrong number of arguments;" \
- "expected 1, got $#"
- exit $SHELL_LIB_USAGE_ERROR
- fi
-
- symlink="$1"
-
- if [ "$(maplink "$symlink")" = "$(readlink "$symlink")" ]; then
- return 0
- else
- return 1
- fi
-}
-
-check_symlinks_and_warn () {
- # syntax: check_symlinks_and_warn symlink ...
- #
- # For each argument, check for symlink sanity, and warn if it isn't sane.
- #
- # Call this function from a preinst script in the event $1 is "upgrade" or
- # "install".
-
- local errmsg symlink
-
- # validate arguments
- if [ $# -lt 1 ]; then
- usage_error "check_symlinks_and_warn() called with wrong number of" \
- "arguments; expected at least 1, got $#"
- exit $SHELL_LIB_USAGE_ERROR
- fi
-
- while [ -n "$1" ]; do
- symlink="$1"
- if [ -L "$symlink" ]; then
- if ! check_symlink "$symlink"; then
- observe "$symlink symbolic link points to wrong location" \
- "$(readlink "$symlink"); removing"
- rm "$symlink"
- fi
- elif [ -e "$symlink" ]; then
- errmsg="$symlink exists and is not a symbolic link; this package cannot"
- errmsg="$errmsg be installed until this"
- if [ -f "$symlink" ]; then
- errmsg="$errmsg file"
- elif [ -d "$symlink" ]; then
- errmsg="$errmsg directory"
- else
- errmsg="$errmsg thing"
- fi
- errmsg="$errmsg is removed"
- die "$errmsg"
- fi
- shift
- done
-}
-
-check_symlinks_and_bomb () {
- # syntax: check_symlinks_and_bomb symlink ...
- #
- # For each argument, check for symlink sanity, and bomb if it isn't sane.
- #
- # Call this function from a postinst script.
-
- local problem symlink
-
- # validate arguments
- if [ $# -lt 1 ]; then
- usage_error "check_symlinks_and_bomb() called with wrong number of"
- "arguments; expected at least 1, got $#"
- exit $SHELL_LIB_USAGE_ERROR
- fi
-
- while [ -n "$1" ]; do
- problem=
- symlink="$1"
- if [ -L "$symlink" ]; then
- if ! check_symlink "$symlink"; then
- problem=yes
- warn "$symlink symbolic link points to wrong location" \
- "$(readlink "$symlink")"
- fi
- elif [ -e "$symlink" ]; then
- problem=yes
- warn "$symlink is not a symbolic link"
- else
- problem=yes
- warn "$symlink symbolic link does not exist"
- fi
- if [ -n "$problem" ]; then
- analyze_path "$symlink" "$(readlink "$symlink")"
- find_culprits "$symlink"
- die "bad symbolic links on system"
- fi
- shift
- done
-}
-
font_update () {
# run $UPDATECMDS in $FONTDIRS
Reply to: