r2056 - in glibc-package/trunk/debian: . debhelper.in local/manpages local/usr_sbin sysdeps
Author: aurel32
Date: 2007-04-13 23:02:47 +0000 (Fri, 13 Apr 2007)
New Revision: 2056
Removed:
glibc-package/trunk/debian/local/manpages/tzconfig.8
glibc-package/trunk/debian/local/usr_sbin/tzconfig
Modified:
glibc-package/trunk/debian/TODO
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/debhelper.in/libc.install
glibc-package/trunk/debian/debhelper.in/libc.manpages
glibc-package/trunk/debian/local/manpages/tzselect.1
glibc-package/trunk/debian/sysdeps/depflags.pl
Log:
* debian/local/usr_sbin/tzconfig: removed.
* debian/local/manpages/tzconfig.8: removed.
* debian/sysdeps/depflags.pl: conflict with tzdata (<< 2007e-2). Older
versions need tzconfig.
Modified: glibc-package/trunk/debian/TODO
===================================================================
--- glibc-package/trunk/debian/TODO 2007-04-13 22:40:14 UTC (rev 2055)
+++ glibc-package/trunk/debian/TODO 2007-04-13 23:02:47 UTC (rev 2056)
@@ -17,9 +17,6 @@
- Check dpkg-shlibdeps for linux-gate.so.1 handling.
- Don't do make install for libc6-i686 if we aren't going to use the
results - it's very slow.
- - Fix /usr/sbin/tzconfig to take a parameter. Right now we set the links
- by hand in libc.postinst in the noninteractive case, but it would be
- better if the tool could just do everything for us.
- Add alpha EV67 opt package support (#229251).
* libc-dev:
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2007-04-13 22:40:14 UTC (rev 2055)
+++ glibc-package/trunk/debian/changelog 2007-04-13 23:02:47 UTC (rev 2056)
@@ -24,8 +24,12 @@
* patches/any/local-notls.diff: also include pthread.h from
linuxthreads/sysdeps/pthread/gai_misc.h.
m68k/cvs-m68k-update.diff: update from CVS. Closes: #418881.
+ * debian/local/usr_sbin/tzconfig: removed.
+ * debian/local/manpages/tzconfig.8: removed.
+ * debian/sysdeps/depflags.pl: conflict with tzdata (<< 2007e-2). Older
+ versions need tzconfig.
- -- Aurelien Jarno <aurel32@debian.org> Fri, 13 Apr 2007 12:49:18 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Sat, 14 Apr 2007 01:01:24 +0200
glibc (2.5-1) unstable; urgency=low
Modified: glibc-package/trunk/debian/debhelper.in/libc.install
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.install 2007-04-13 22:40:14 UTC (rev 2055)
+++ glibc-package/trunk/debian/debhelper.in/libc.install 2007-04-13 23:02:47 UTC (rev 2056)
@@ -19,8 +19,6 @@
debian/tmp-libc/usr/lib/pt_chown usr/lib
-debian/local/usr_sbin/tzconfig usr/sbin
-
debian/tmp-libc/lib/*-*-gnu*/ lib
debian/tmp-libc/usr/lib/*-*-gnu*/ usr/lib
Modified: glibc-package/trunk/debian/debhelper.in/libc.manpages
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.manpages 2007-04-13 22:40:14 UTC (rev 2055)
+++ glibc-package/trunk/debian/debhelper.in/libc.manpages 2007-04-13 23:02:47 UTC (rev 2056)
@@ -9,6 +9,5 @@
debian/local/manpages/localedef.1
debian/local/manpages/rpcinfo.8
debian/local/manpages/tzselect.1
-debian/local/manpages/tzconfig.8
debian/local/manpages/zdump.1
debian/local/manpages/zic.8
Deleted: glibc-package/trunk/debian/local/manpages/tzconfig.8
===================================================================
--- glibc-package/trunk/debian/local/manpages/tzconfig.8 2007-04-13 22:40:14 UTC (rev 2055)
+++ glibc-package/trunk/debian/local/manpages/tzconfig.8 2007-04-13 23:02:47 UTC (rev 2056)
@@ -1,113 +0,0 @@
-.\" Copyright 1998 Marcus Brinkmann (brinkmd@debian.org)
-.\"
-.\" Permission is granted to make and distribute verbatim copies of this
-.\" manual provided the copyright notice and this permission notice are
-.\" preserved on all copies.
-.\"
-.\" Permission is granted to copy and distribute modified versions of this
-.\" manual under the conditions for verbatim copying, provided that the
-.\" entire resulting derived work is distributed under the terms of a
-.\" permission notice identical to this one
-.\"
-.\" Since the Linux kernel and libraries are constantly changing, this
-.\" manual page may be incorrect or out-of-date. The author(s) assume no
-.\" responsibility for errors or omissions, or for damages resulting from
-.\" the use of the information contained herein. The author(s) may not
-.\" have taken the same level of care in the production of this manual,
-.\" which is licensed free of charge, as they might when working
-.\" professionally.
-.\"
-.\" Formatted or processed versions of this manual, if unaccompanied by
-.\" the source, must acknowledge the copyright and authors of this work.
-.\"
-.\" Modified Mon Jul 12 18:40:00 1998 by Marcus Brinkmann <brinkmd@debian.org>
-.TH TZCONFIG 8 "12 June 1998" "Debian" "Debian Timezone Configuration"
-.SH NAME
-tzconfig \- set the local timezone
-.SH SYNOPSIS
-.B tzconfig
-.SH DESCRIPTION
-This manual page explains how you can use the
-.B "tzconfig"
-utility to set the local timezone. This is necessary to let your system know about the
-difference between system time and local time (the time in the real world). It is also
-necessary to make your system behave nicely when your location uses Daylight Savings Time.
-
-A valid system time together with the correct local time zone will give you best performance
-and highest reliability. It is especially important in a network environment, where even small
-time differences can make a mirror refetch a whole ftp site, or where time stamps on
-external file systems are used.
-
-.B tzconfig
-is called without any parameters from the shell. First it presents the current setting and asks
-for verification to change it.
-
-You may press
-.B Ctrl-C
-to interrupt the script at any time.
-
-After you made your choice,
-.B tzconfig
-will try to change the timezone for you. See the
-.B Internals
-section below for technical details. You must have root privileges to actually change
-anything. Please use
-.BR tzselect (1)
-as a user space command to just look at the timezones. It will print the local time in any
-timezone recognized by the system.
-.SH "A WORD OF WARNING"
-What timezone is correct for your system? It depends on the geographical location of the machine.
-Getting the correct location is important, but
-the system must also know how your hardware clock is set. Most DOS based PCs set their hardware
-clock on Local Time, while most UNIX systems set their hardware clock to UTC.
-
-The Debian GNU/Linux system gains its knowledge of this setting
-from the file
-.IR /etc/default/rcS .
-This file contains either the line
-.BR UTC=yes ,
-which indicates that the hardware clock is set to UTC, or it contains the line
-.BR UTC=no ,
-which declares the hardware clock is set to Local Time. If these setting are correct, and the hardware
-clock is truly set as indicated, then configuring the proper timezone for the machine
-will cause the proper date and time to be displayed. If these are not set correctly, the the
-reported time will be quite incorrect. See
-.BR hwclock (8)
-for more details on this topic.
-
-.SH Internals
-The work done by
-.B tzconfig
-is actually pretty simple. It just copies the correct timezone installed in
-.I /usr/share/zoneinfo/
-to
-.I /etc/localtime
-and puts the name of the timezone into
-.IR /etc/timezone .
-
-There is nothing wrong with doing this manually. However, using
-.B tzconfig
-you don't have to remember the path to the timezones.
-.SH FILES
-.I /etc/timezone
-.BR
-.I /etc/localtime
-.BR
-.I /usr/share/zoneinfo
-.SH "SEE ALSO"
-.BR hwclock (8)
-.BR tzselect (1)
-.BR rcS (5)
-.SH AUTHOR
-Copyright 1998 Marcus Brinkmann <brinkmd@debian.org>
-.BR
-Edits Copyright 1998 Dale Scheetz <dwarf@polaris.net>
-
-Please see nroff source for legal notice.
-
-
-
-
-
-
-
Modified: glibc-package/trunk/debian/local/manpages/tzselect.1
===================================================================
--- glibc-package/trunk/debian/local/manpages/tzselect.1 2007-04-13 22:40:14 UTC (rev 2055)
+++ glibc-package/trunk/debian/local/manpages/tzselect.1 2007-04-13 23:02:47 UTC (rev 2056)
@@ -48,14 +48,11 @@
Note that
.B tzselect
-will not actually change the timezone for you. Use the
-.BR tzconfig (8)
-utility to achieve this.
+will not actually change the timezone for you. Use 'dpkg-reconfigure tzdata' to achieve this.
.SH FILES
.I /usr/share/zoneinfo/
.SH "SEE ALSO"
.BR hwclock (8)
-.BR tzconfig (8)
.SH AUTHOR
Copyright 1998 Marcus Brinkmann <brinkmd@debian.org>
Deleted: glibc-package/trunk/debian/local/usr_sbin/tzconfig
===================================================================
--- glibc-package/trunk/debian/local/usr_sbin/tzconfig 2007-04-13 22:40:14 UTC (rev 2055)
+++ glibc-package/trunk/debian/local/usr_sbin/tzconfig 2007-04-13 23:02:47 UTC (rev 2056)
@@ -1,121 +0,0 @@
-#! /bin/sh
-
-# Copyright (C) 2001 Software in the Public Interest
-#
-# Licensed under the GPL v2
-#
-
-show_continents() {
-
-cat <<EOF
-
-Please enter the number of the geographic area in which you live:
-
-
- 1) Africa 7) Australia
-
- 2) America 8) Europe
-
- 3) US time zones 9) Indian Ocean
-
- 4) Canada time zones 10) Pacific Ocean
-
- 5) Asia 11) Use System V style time zones
-
- 6) Atlantic Ocean 12) None of the above
-
-
-Then you will be shown a list of cities which represent the time zone
-in which they are located. You should choose a city in your time zone.
-
-EOF
-
-}
-
-zone_info()
-{
- TZBase=$(LC_ALL=C TZ=UTC0 date)
- UTdate=$(TZ=UTC0 date -d "$TZBase")
- TZdate=$(TZ="$timezone" date -d "$TZBase")
- extra_info="
-Local time is now: $TZdate.
-Universal Time is now: $UTdate."
-}
-
-TIMEZONES=$(tempfile -p time) || TIMEZONES=/etc/timezone.$$
-
-if [ -f /etc/timezone ] || [ -f /etc/localtime ] ; then
- current_timezone="Unknown"
- if [ -L /etc/localtime ] ; then
- current_timezone=$(readlink /etc/localtime | sed 's%^/usr/share/zoneinfo/%%')
- elif [ -f /etc/timezone ] && [ -f /etc/localtime ]; then
- current_timezone=$(cat /etc/timezone)
- fi
-
- echo "Your current time zone is set to $current_timezone"
- echo -n "Do you want to change that? [n]: "
- read ans
- if [ "x$ans" = "x" ] || [ "$ans" = "n" ] || [ "$ans" = "no" ]; then
- echo "Your time zone will not be changed"
- exit 0
- fi
-fi
-
-( cd /usr/share/zoneinfo ; find . -type f | sed -e 's/^.\///' | sort > $TIMEZONES )
-valid=no
-while [ $valid = no ]; do
- show_continents
- echo -n "Number: " ; read area
- case $area in
- 1) continent=Africa ; valid=yes ;;
- 2) continent=America ; valid=yes ;;
- 3) continent=US ; valid=yes ;;
- 4) continent=Canada ; valid=yes ;;
- 5) continent=Asia ; valid=yes ;;
- 6) continent=Atlantic ; valid=yes ;;
- 7) continent=Australia ; valid=yes ;;
- 8) continent=Europe ; valid=yes ;;
- 9) continent=Indian ; valid=yes ;;
- 10) continent=Pacific ; valid=yes ;;
- 11) continent=SystemV ; valid=yes ;;
- 12) continent=Etc ; valid=yes ;;
- esac
-done
-
-if [ -x /usr/bin/fmt ]; then fmt_bin=/usr/bin/fmt
-else fmt_bin=/bin/more ; fi
-
-valid=no
-zone=""
-
-while [ $valid = no ]; do
- if [ -n "$zone" ]; then
- # We accept the zone if either it is an unambiguous prefix, or
- # it is a complete zone name.
- number=`grep -i -c "^$continent/$zone" $TIMEZONES`
- if [ $number -eq 1 ]; then
- timezone=`grep -i "^$continent/$zone" $TIMEZONES`
- else
- timezone=`grep -i -s "^$continent/$zone"'$' $TIMEZONES`
- fi
-
- if [ -n "$timezone" ]; then
- zone_info
- echo "Your default time zone is set to '$timezone'.$extra_info"
- valid=yes
- break
- fi
- fi
- echo
- grep -i "^$continent/$zone" $TIMEZONES | cut -d/ -f2- | $fmt_bin
- echo
- echo "Please enter the name of one of these cities or zones"
- echo "You just need to type enough letters to resolve ambiguities"
- echo "Press Enter to view all of them again"
- echo -n "Name: [$zone] " ; read zone
-done
-
-umask 022
-echo $timezone > /etc/timezone
-rm -f /etc/localtime && cp -f /usr/share/zoneinfo/$timezone /etc/localtime
-trap 'rm -f $TIMEZONES' 0 1 2 3 13 15
Modified: glibc-package/trunk/debian/sysdeps/depflags.pl
===================================================================
--- glibc-package/trunk/debian/sysdeps/depflags.pl 2007-04-13 22:40:14 UTC (rev 2055)
+++ glibc-package/trunk/debian/sysdeps/depflags.pl 2007-04-13 23:02:47 UTC (rev 2056)
@@ -167,6 +167,9 @@
# Conflict with broken libterm-readline-gnu-perl to avoid #326856.
push @{$libc_c{'Conflicts'}}, 'libterm-readline-gnu-perl (<< 1.15-2)';
+# Conflict with older versions of tzdata that need tzconfig.
+push @{$libc_c{'Conflicts'}}, 'tzdata (<< tzdata_2007e-2)';
+
if ($type eq "libc") {
%pkg = %libc_c;
} elsif ($type eq "libc_dev") {
Reply to: