[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xorg: Changes to 'debian-unstable'



 debian/changelog      |    2 ++
 debian/xsfbs/xsfbs.sh |   10 ----------
 2 files changed, 2 insertions(+), 10 deletions(-)

New commits:
commit 13cfbc388e1b3e00f6a477d80ce2dab66978d961
Author: Julien Cristau <jcristau@debian.org>
Date:   Wed Jun 3 03:41:27 2009 +0200

    Add changelog entry and bug closer for xsfbs change

diff --git a/debian/changelog b/debian/changelog
index bde20e7..25880f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,8 @@ xorg (1:7.4+2) UNRELEASED; urgency=low
   * xsfbs: don't call dpkg --print-installation-architecture
     (closes: #531294).
   * Add README.source, and bump Standards-Version to 3.8.1.
+  * xsfbs: kill custom readlink function (closes: #498890).  Thanks, Jonas
+    Smedegaard!
 
   [ Debconf translations ]
   * Bengali added

commit 8f72294ada477f003888b6776883c1dd98289f3f
Author: Julien Cristau <jcristau@debian.org>
Date:   Wed Jun 3 03:37:37 2009 +0200

    Kill custom readlink function
    
    This was needed for very, very old versions of debianutils.
    Closes: #498890

diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 197eb74..781826f 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -303,16 +303,6 @@ EOF
   fi
 }
 
-# we require a readlink command or shell function
-if ! which readlink > /dev/null 2>&1; then
-  message "The readlink command was not found.  Please install version" \
-          "1.13.1 or later of the debianutils package."
-  readlink () {
-    # returns what symlink in $1 actually points to
-    perl -e '$l = shift; exit 1 unless -l $l; $r = readlink $l; exit 1 unless $r; print "$r\n"' "$1"
-  }
-fi
-
 check_symlink () {
   # syntax: check_symlink symlink
   #


Reply to: