debian/README.source | 73 +++++++ debian/TODO | 4 debian/changelog | 102 ++++++++++ debian/compat | 2 debian/control | 18 - debian/local/Xwrapper.config.5 | 9 debian/local/debian-x11-keymap.fdi | 2 debian/local/xserver-wrapper.c | 74 +------ debian/po/POTFILES.in | 1 debian/po/ar.po | 264 +++++++++++---------------- debian/po/ast.po | 283 ++++++++++++----------------- debian/po/be.po | 266 +++++++++++---------------- debian/po/bg.po | 267 +++++++++++---------------- debian/po/bn.po | 175 ++++++++++++++++++ debian/po/bs.po | 280 +++++++++++------------------ debian/po/ca.po | 281 ++++++++++++----------------- debian/po/cs.po | 272 +++++++++++----------------- debian/po/da.po | 273 +++++++++++----------------- debian/po/de.po | 285 ++++++++++++----------------- debian/po/dz.po | 273 +++++++++++----------------- debian/po/el.po | 296 ++++++++++++------------------ debian/po/eo.po | 277 +++++++++++----------------- debian/po/es.po | 289 ++++++++++++----------------- debian/po/eu.po | 277 +++++++++++----------------- debian/po/fi.po | 277 +++++++++++----------------- debian/po/fr.po | 287 ++++++++++++----------------- debian/po/gl.po | 281 ++++++++++++----------------- debian/po/gu.po | 261 ++++++++++----------------- debian/po/he.po | 259 ++++++++++---------------- debian/po/hr.po | 280 +++++++++++------------------ debian/po/hu.po | 264 +++++++++++---------------- debian/po/id.po | 279 +++++++++++----------------- debian/po/it.po | 282 ++++++++++++----------------- debian/po/ja.po | 277 +++++++++++----------------- debian/po/kk.po | 267 +++++++++++---------------- debian/po/km.po | 261 ++++++++++----------------- debian/po/ko.po | 265 +++++++++++---------------- debian/po/ku.po | 142 -------------- debian/po/lt.po | 262 ++++++++++----------------- debian/po/ml.po | 272 +++++++++++----------------- debian/po/mr.po | 270 +++++++++++---------------- debian/po/nb.po | 269 +++++++++++---------------- debian/po/ne.po | 266 +++++++++++---------------- debian/po/nl.po | 281 ++++++++++++----------------- debian/po/nn.po | 271 +++++++++++----------------- debian/po/pl.po | 275 +++++++++++----------------- debian/po/pt.po | 286 ++++++++++++----------------- debian/po/pt_BR.po | 288 ++++++++++++----------------- debian/po/ro.po | 289 ++++++++++++----------------- debian/po/ru.po | 277 +++++++++++----------------- debian/po/sk.po | 332 ++++++++++++++++++++++++---------- debian/po/sq.po | 274 +++++++++++----------------- debian/po/sv.po | 282 ++++++++++++----------------- debian/po/ta.po | 270 +++++++++++---------------- debian/po/templates.pot | 138 -------------- debian/po/th.po | 261 ++++++++++----------------- debian/po/tr.po | 281 ++++++++++++----------------- debian/po/vi.po | 276 +++++++++++----------------- debian/po/wo.po | 282 ++++++++++++----------------- debian/po/zh_CN.po | 253 ++++++++++---------------- debian/po/zh_TW.po | 254 ++++++++++---------------- debian/rules | 24 +- debian/x11-common.config.in | 77 ------- debian/x11-common.links | 1 debian/x11-common.postinst.in | 37 --- debian/x11-common.preinst.in | 76 ------- debian/x11-common.templates | 44 ---- debian/xbase-clients.postinst.in | 20 ++ debian/xbase-clients.postrm.in | 20 ++ debian/xbase-clients.preinst.in | 20 ++ debian/xserver-xorg.NEWS | 24 ++ debian/xserver-xorg.postinst.in | 357 +------------------------------------ debian/xserver-xorg.postrm.in | 40 ---- debian/xserver-xorg.preinst.in | 77 ------- debian/xserver-xorg.templates | 32 --- debian/xsfbs/repack.sh | 32 +++ debian/xsfbs/xsfbs.mk | 4 debian/xsfbs/xsfbs.sh | 307 ------------------------------- 78 files changed, 6183 insertions(+), 9243 deletions(-)
New commits: commit df2a107f7e4a07e731aabba92172e9833f2d38d2 Author: Julien Cristau <[email protected]> Date: Tue Sep 29 22:17:10 2009 +0200 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index 6c910ea..1a2d83a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -xorg (1:7.5~1) UNRELEASED; urgency=low +xorg (1:7.5~1) experimental; urgency=low * Depend on xserver 1.7 RC. Bump video and input driver ABI. - -- Julien Cristau <[email protected]> Tue, 29 Sep 2009 22:06:28 +0200 + -- Julien Cristau <[email protected]> Tue, 29 Sep 2009 22:17:04 +0200 xorg (1:7.4+5) UNRELEASED; urgency=low commit 2dfe647a810a208511a4004ed2a12631917509b9 Author: Julien Cristau <[email protected]> Date: Tue Sep 29 22:08:16 2009 +0200 Depend on xserver 1.7 RC. Bump video and input driver ABI. diff --git a/debian/changelog b/debian/changelog index 70b0be5..6c910ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xorg (1:7.5~1) UNRELEASED; urgency=low + + * Depend on xserver 1.7 RC. Bump video and input driver ABI. + + -- Julien Cristau <[email protected]> Tue, 29 Sep 2009 22:06:28 +0200 + xorg (1:7.4+5) UNRELEASED; urgency=low * Update xsfbs to 5693792171d885769e58dcccc053c08b11acd12a diff --git a/debian/control b/debian/control index 6f45da2..940bbc2 100644 --- a/debian/control +++ b/debian/control @@ -84,8 +84,8 @@ Conflicts: xserver-xfree86 (<< 6.8.2.dfsg.1-1), xserver-common (<< 7), x11-commo Replaces: xserver-common (<< 7), x11-common (<< 1:7.3+11) Depends: xserver-xorg-core (>= 2:1.5.99.901), - xserver-xorg-video-all | xserver-xorg-video-5, - xserver-xorg-input-all | xserver-xorg-input-4, + xserver-xorg-video-all | xserver-xorg-video-6, + xserver-xorg-input-all | xserver-xorg-input-7, xserver-xorg-input-evdev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc sparc], hal (>= 0.5.12~git20090406), console-setup (>= 1.29) | console-setup-mini (>= 1.29), commit f35f44fdf4e933f3078e09d4862155baa03dbe3e Author: David Nusinow <[email protected]> Date: Thu Sep 3 20:20:29 2009 -0400 Revert dh_clean change from last upload but use dh_prep instead diff --git a/debian/changelog b/debian/changelog index 77cbb7d..70b0be5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,8 @@ xorg (1:7.4+5) UNRELEASED; urgency=low * Update xsfbs to 5693792171d885769e58dcccc053c08b11acd12a - + * Revert dh_clean change from last upload but use dh_prep instead + -- David Nusinow <[email protected]> Wed, 26 Aug 2009 23:27:18 -0400 xorg (1:7.4+4) unstable; urgency=low diff --git a/debian/rules b/debian/rules index 0e86a55..e0902f4 100755 --- a/debian/rules +++ b/debian/rules @@ -76,7 +76,7 @@ install-stamp: build-stamp dh_testdir dh_testroot umask 022 - dh_clean -k + dh_prep chmod 755 debian/local/debian-setup-keyboard touch $@ commit c782fddc35aa8632ea22260b70de05dad00b94ef Author: David Nusinow <[email protected]> Date: Thu Sep 3 20:19:21 2009 -0400 Revert "Remove obsolete and misplaced -k flag on a dh_clean" This reverts commit 554513e48c54e0cd3a2d5dfcae8b770ccfe7b6bd. diff --git a/debian/changelog b/debian/changelog index 78978ac..77cbb7d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,7 +27,6 @@ xorg (1:7.4+4) unstable; urgency=low * Bump debhelper compat to v7. No changes necessary. * Rename stamps to take advantage of dh_clean v7 handling them automatically * Bump standards version to 3.8.2. No changes necessary. - * Remove obsolete and misplaced -k flag on a dh_clean -- David Nusinow <[email protected]> Thu, 13 Aug 2009 21:19:12 -0400 diff --git a/debian/rules b/debian/rules index 5c26be2..0e86a55 100755 --- a/debian/rules +++ b/debian/rules @@ -76,7 +76,7 @@ install-stamp: build-stamp dh_testdir dh_testroot umask 022 - dh_clean + dh_clean -k chmod 755 debian/local/debian-setup-keyboard touch $@ commit 5b5f4fb8982ee7bb7719caaccb08b26c39f7c236 Author: David Nusinow <[email protected]> Date: Wed Aug 26 23:27:18 2009 -0400 Update xsfbs to 5693792171d885769e58dcccc053c08b11acd12a diff --git a/debian/changelog b/debian/changelog index 5ebc662..78978ac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xorg (1:7.4+5) UNRELEASED; urgency=low + + * Update xsfbs to 5693792171d885769e58dcccc053c08b11acd12a + + -- David Nusinow <[email protected]> Wed, 26 Aug 2009 23:27:18 -0400 + xorg (1:7.4+4) unstable; urgency=low [ Timo Aaltonen ] commit 5693792171d885769e58dcccc053c08b11acd12a Author: Julien Cristau <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 commit 4d0132f3a02edac5e64dd84402a450a9052e1da2 Author: David Nusinow <[email protected]> Date: Thu Aug 13 21:33:17 2009 -0400 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index 5dd22bc..5ebc662 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg (1:7.4+4) UNRELEASED; urgency=low +xorg (1:7.4+4) unstable; urgency=low [ Timo Aaltonen ] * debian-x11-keymap.fdi: Check for input.keys from info.capabilities. @@ -23,7 +23,7 @@ xorg (1:7.4+4) UNRELEASED; urgency=low * Bump standards version to 3.8.2. No changes necessary. * Remove obsolete and misplaced -k flag on a dh_clean - -- Timo Aaltonen <[email protected]> Thu, 02 Jul 2009 17:23:57 +0300 + -- David Nusinow <[email protected]> Thu, 13 Aug 2009 21:19:12 -0400 xorg (1:7.4+3) unstable; urgency=low commit 554513e48c54e0cd3a2d5dfcae8b770ccfe7b6bd Author: David Nusinow <[email protected]> Date: Thu Aug 13 20:29:53 2009 -0400 Remove obsolete and misplaced -k flag on a dh_clean diff --git a/debian/changelog b/debian/changelog index f96601d..5dd22bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,7 @@ xorg (1:7.4+4) UNRELEASED; urgency=low * Bump debhelper compat to v7. No changes necessary. * Rename stamps to take advantage of dh_clean v7 handling them automatically * Bump standards version to 3.8.2. No changes necessary. + * Remove obsolete and misplaced -k flag on a dh_clean -- Timo Aaltonen <[email protected]> Thu, 02 Jul 2009 17:23:57 +0300 diff --git a/debian/rules b/debian/rules index 0e86a55..5c26be2 100755 --- a/debian/rules +++ b/debian/rules @@ -76,7 +76,7 @@ install-stamp: build-stamp dh_testdir dh_testroot umask 022 - dh_clean -k + dh_clean chmod 755 debian/local/debian-setup-keyboard touch $@ commit 4c8a446780a327eb3c934af4b2539a9f202b0c15 Author: David Nusinow <[email protected]> Date: Thu Aug 13 20:26:05 2009 -0400 Bump standards version to 3.8.2. No changes necessary. diff --git a/debian/changelog b/debian/changelog index bc55380..f96601d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,7 @@ xorg (1:7.4+4) UNRELEASED; urgency=low [ David Nusinow ] * Bump debhelper compat to v7. No changes necessary. * Rename stamps to take advantage of dh_clean v7 handling them automatically + * Bump standards version to 3.8.2. No changes necessary. -- Timo Aaltonen <[email protected]> Thu, 02 Jul 2009 17:23:57 +0300 diff --git a/debian/control b/debian/control index 14e83d9..6f45da2 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: x11 Priority: optional Maintainer: Debian X Strike Force <[email protected]> Uploaders: David Nusinow <[email protected]>, Branden Robinson <[email protected]>, Drew Parsons <[email protected]>, Julien Cristau <[email protected]> -Standards-Version: 3.8.1 +Standards-Version: 3.8.2 Build-Depends: dpkg (>= 1.7.0), po-debconf, debhelper (>= 7) Package: x11-common commit 34258a4f516104c9d7ef0f9243ccabbb2126948c Author: David Nusinow <[email protected]> Date: Thu Aug 13 20:25:39 2009 -0400 Bump debhelper build-dep version diff --git a/debian/control b/debian/control index 7c3d3e4..14e83d9 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian X Strike Force <[email protected]> Uploaders: David Nusinow <[email protected]>, Branden Robinson <[email protected]>, Drew Parsons <[email protected]>, Julien Cristau <[email protected]> Standards-Version: 3.8.1 -Build-Depends: dpkg (>= 1.7.0), po-debconf, debhelper (>= 4.1.16) +Build-Depends: dpkg (>= 1.7.0), po-debconf, debhelper (>= 7) Package: x11-common Architecture: all commit 42f813b14218f5b2800ea5e763291d8cfbdca534 Author: David Nusinow <[email protected]> Date: Thu Aug 13 20:11:06 2009 -0400 Rename stamps to take advantage of dh_clean v7 handling them automatically diff --git a/debian/changelog b/debian/changelog index 8571362..bc55380 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,7 @@ xorg (1:7.4+4) UNRELEASED; urgency=low [ David Nusinow ] * Bump debhelper compat to v7. No changes necessary. + * Rename stamps to take advantage of dh_clean v7 handling them automatically -- Timo Aaltonen <[email protected]> Thu, 02 Jul 2009 17:23:57 +0300 diff --git a/debian/rules b/debian/rules index 0ede679..0e86a55 100755 --- a/debian/rules +++ b/debian/rules @@ -43,7 +43,7 @@ include debian/scripts/vars.$(ARCH) clean: cleanscripts dh_testdir - dh_clean stamp-* debian/local/X debian/po/pothead + dh_clean debian/local/X debian/po/pothead -rm -rf stampdir -debconf-updatepo @@ -52,17 +52,17 @@ SCRIPTS=$(shell ls debian/*.config.in debian/*.postinst.in debian/*.postrm.in de DEFAULT_DCRESOLUTIONS="1920x1440, 1920x1200, 1856x1392, 1792x1344, 1680x1050, 1600x1200, 1440x900, 1400x1050, 1280x1024, 1280x960, 1280x854, 1280x800, 1280x768, 1200x800, 1152x864, 1152x768, 1024x768, 800x600, 640x480" -scripts: stamp-scripts -stamp-scripts: genscripts validatescripts +scripts: scripts-stamp +scripts-stamp: genscripts validatescripts touch $@ -validatescripts: genscripts stamp-validatescripts -stamp-validatescripts: debian/local/dexconf +validatescripts: genscripts validatescripts-stamp +validatescripts-stamp: debian/local/dexconf sh debian/scripts/validate-posix-sh $< touch $@ -build: stamp-build -stamp-build: stamp-scripts +build: build-stamp +build-stamp: scripts-stamp dh_testdir # build Debian's X server wrapper $(CC) -Wall -g -O2 -o debian/local/X debian/local/xserver-wrapper.c @@ -71,8 +71,8 @@ stamp-build: stamp-scripts build-arch-only: build build-all: -install: stamp-install -stamp-install: stamp-build +install: install-stamp +install-stamp: build-stamp dh_testdir dh_testroot umask 022 @@ -100,7 +100,7 @@ binary-indep: build install dh_gencontrol dh_md5sums dh_builddeb - touch stamp-$@ + touch $...@-stamp binary-arch: DH_OPTIONS=-s binary-arch: build install @@ -125,7 +125,7 @@ binary-arch: build install -VF:XServer-Xorg-Input-Depends=$(XSERVER_XORG_INPUT_DEPENDS) dh_md5sums dh_builddeb - touch stamp-$@ + touch $...@-stamp binary: binary-indep binary-arch commit 57acd667efb2c2ef0c5ca88c62aee8114cdbc72a Author: David Nusinow <[email protected]> Date: Thu Aug 13 20:06:38 2009 -0400 Bump debhelper compat to v7. No changes necessary. diff --git a/debian/changelog b/debian/changelog index 4823e06..8571362 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,9 @@ xorg (1:7.4+4) UNRELEASED; urgency=low Thanks to Pierre-Loup A. Griffais for pointing out the three above items (closes: #540932). + [ David Nusinow ] + * Bump debhelper compat to v7. No changes necessary. + -- Timo Aaltonen <[email protected]> Thu, 02 Jul 2009 17:23:57 +0300 xorg (1:7.4+3) unstable; urgency=low diff --git a/debian/compat b/debian/compat index b8626c4..7f8f011 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -4 +7 commit ac765a310859843c0a6da67e2e6a33194ae2a20a Author: Julien Cristau <[email protected]> Date: Tue Aug 11 15:08:22 2009 +0200 xserver-wrapper: don't check the mode of /dev/dri. It leads to a spurious error message in some cases, and isn't necessary. diff --git a/debian/changelog b/debian/changelog index 53b2f7c..4823e06 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,7 +12,10 @@ xorg (1:7.4+4) UNRELEASED; urgency=low exist. * xserver-wrapper: allow unprivileged -showDefaultModulePath and -showDefaultLibPath options - (closes: #540932). + * xserver-wrapper: don't check the mode of /dev/dri. It leads to a spurious + error message in some cases, and isn't necessary. + Thanks to Pierre-Loup A. Griffais for pointing out the three above items + (closes: #540932). -- Timo Aaltonen <[email protected]> Thu, 02 Jul 2009 17:23:57 +0300 diff --git a/debian/local/xserver-wrapper.c b/debian/local/xserver-wrapper.c index 2630e8f..de040d6 100644 --- a/debian/local/xserver-wrapper.c +++ b/debian/local/xserver-wrapper.c @@ -80,6 +80,8 @@ * (11 Aug 2009) * Julien Cristau: allow unprivileged -showDefaultModulePath and * -showDefaultLibPath options (11 Aug 2009) + * Julien Cristau: don't check the mode of the DRI device directory + * (11 Aug 2009) * * This is free software; you may redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -120,8 +122,6 @@ #define X_SERVER_SYMLINK "/etc/X11/X" #define X_SOCKET_DIR "/tmp/.X11-unix" #define X_SOCKET_DIR_MODE (S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO) -#define X_DRI_DEVICE_DIR "/dev/dri" -#define X_DRI_DEVICE_DIR_MODE (S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) #ifndef FALSE #define FALSE 0 @@ -312,17 +312,6 @@ main(int argc, char **argv) exit(1); } - /* do a check on the directory where the DRI device is created */ - if (stat(X_DRI_DEVICE_DIR, &statbuf)) { - /* do nothing if it doesn't exist -- no problem */ - } else { - if (statbuf.st_mode != (S_IFDIR | X_DRI_DEVICE_DIR_MODE)) { - (void) fprintf(stderr, "X: warning; %s has unusual mode (not %o) or " - "is not a directory.\n", X_DRI_DEVICE_DIR, - X_DRI_DEVICE_DIR_MODE); - } - } - for (i = 1; i < argc; i++) { if (!strcmp(argv[i], "-config") || !strcmp(argv[i], "-xf86config")) { if (setuid(getuid())) { commit a967d578d6c2a8b177eb816d3618a0e41bb8cb04 Author: Julien Cristau <[email protected]> Date: Tue Aug 11 14:40:49 2009 +0200 xserver-wrapper: add missing unprivileged options Allow unprivileged -showDefaultModulePath and -showDefaultLibPath options (closes: #540932). diff --git a/debian/changelog b/debian/changelog index 430a69a..53b2f7c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,9 @@ xorg (1:7.4+4) UNRELEASED; urgency=low * xserver-wrapper: recognize /usr/bin/X as a path to the wrapper. * xserver-wrapper: don't print an error message if Xwrapper.config doesn't exist. + * xserver-wrapper: allow unprivileged -showDefaultModulePath and + -showDefaultLibPath options + (closes: #540932). -- Timo Aaltonen <[email protected]> Thu, 02 Jul 2009 17:23:57 +0300 diff --git a/debian/local/xserver-wrapper.c b/debian/local/xserver-wrapper.c index 40cf518..2630e8f 100644 --- a/debian/local/xserver-wrapper.c +++ b/debian/local/xserver-wrapper.c @@ -78,6 +78,8 @@ * Julien Cristau: recognize /usr/bin/X as a path to this wrapper (6 Jun 2009) * Julien Cristau: don't print an error message if Xwrapper.config doesn't exist * (11 Aug 2009) + * Julien Cristau: allow unprivileged -showDefaultModulePath and + * -showDefaultLibPath options (11 Aug 2009) * * This is free software; you may redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -359,9 +361,11 @@ main(int argc, char **argv) /* DEBUG fprintf(stderr, "strcmp(argv[1], \"-showconfig\") = %d, strcmp(argv[1], \"-version\" = %d\n", (strcmp(argv[1], "-showconfig")), (strcmp(argv[1], "-version"))); */ - if (argc == 2 && ( (strncmp(argv[1], "-help", 5) == 0) || - (strncmp(argv[1], "-showconfig", 11) == 0) || - (strncmp(argv[1], "-version", 8) == 0) ) ) { + if (argc == 2 && ( (strcmp(argv[1], "-help") == 0) || + (strcmp(argv[1], "-showconfig") == 0) || + (strcmp(argv[1], "-version") == 0) || + (strcmp(argv[1], "-showDefaultModulePath") == 0) || + (strcmp(argv[1], "-showDefaultLibPath") == 0) ) ) { if (setuid(getuid())) { perror("X unable to drop setuid privileges"); exit(1); commit b052a682b1a39928f7d73484293ebd3b255b01f1 Author: Julien Cristau <[email protected]> Date: Tue Aug 11 14:34:40 2009 +0200 xserver-wrapper: don't print an error message if Xwrapper.config doesn't exist Thanks, Pierre-Loup Griffais! diff --git a/debian/changelog b/debian/changelog index ad00aef..430a69a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ xorg (1:7.4+4) UNRELEASED; urgency=low [ Julien Cristau ] * xserver-wrapper: recognize /usr/bin/X as a path to the wrapper. + * xserver-wrapper: don't print an error message if Xwrapper.config doesn't + exist. -- Timo Aaltonen <[email protected]> Thu, 02 Jul 2009 17:23:57 +0300 diff --git a/debian/local/xserver-wrapper.c b/debian/local/xserver-wrapper.c index 0e37e68..40cf518 100644 --- a/debian/local/xserver-wrapper.c +++ b/debian/local/xserver-wrapper.c @@ -76,6 +76,8 @@ * minor < 64) as consoles (24 Sep 2008) * Julien Cristau: remove the nice_value option * Julien Cristau: recognize /usr/bin/X as a path to this wrapper (6 Jun 2009) + * Julien Cristau: don't print an error message if Xwrapper.config doesn't exist + * (11 Aug 2009) * * This is free software; you may redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -246,8 +248,8 @@ main(int argc, char **argv) (void) fclose(cf); } else { - (void) fprintf(stderr, "X: unable to open wrapper config file %s\n", - X_WRAPPER_CONFIG_FILE); + /* DEBUG (void) fprintf(stderr, "X: unable to open wrapper config file %s\n", + X_WRAPPER_CONFIG_FILE); */ } if (lstat(X_SERVER_SYMLINK, &statbuf)) { commit 37c5cb9c3c4ecf35f42cec13a009b07b6e8bfb16 Author: Julien Cristau <[email protected]> Date: Sat Jun 6 23:40:42 2009 +0200 xserver-wrapper: recognize /usr/bin/X as a path to the wrapper. diff --git a/debian/changelog b/debian/changelog index 735b9d6..ad00aef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,14 @@ xorg (1:7.4+4) UNRELEASED; urgency=low + [ Timo Aaltonen ] * debian-x11-keymap.fdi: Check for input.keys from info.capabilities. (closes: #535291) * control: Move xserver-xorg dependency on evdev after -input-all. Otherwise only evdev is installed by default. + [ Julien Cristau ] + * xserver-wrapper: recognize /usr/bin/X as a path to the wrapper. + -- Timo Aaltonen <[email protected]> Thu, 02 Jul 2009 17:23:57 +0300 xorg (1:7.4+3) unstable; urgency=low diff --git a/debian/local/xserver-wrapper.c b/debian/local/xserver-wrapper.c index 4a8d7f3..0e37e68 100644 --- a/debian/local/xserver-wrapper.c +++ b/debian/local/xserver-wrapper.c @@ -75,6 +75,7 @@ * Loïc Minier: on Linux, also consider alternate tty devices (major 5 and * minor < 64) as consoles (24 Sep 2008) * Julien Cristau: remove the nice_value option + * Julien Cristau: recognize /usr/bin/X as a path to this wrapper (6 Jun 2009) * * This is free software; you may redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -265,8 +266,9 @@ main(int argc, char **argv) xserver[i] = '\0'; /* readlink() does not null-terminate the string */ - if ((strncmp(xserver, "/usr/bin/X11/X", 1024) == 0) || - (strncmp(xserver, "/usr/X11R6/bin/X", 1024) == 0)) { + if ((strcmp(xserver, "/usr/bin/X11/X") == 0) || + (strcmp(xserver, "/usr/X11R6/bin/X") == 0) || -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
