r1316 - in glibc-package/trunk/debian: . control.in debhelper.in
Author: barbier
Date: 2006-04-03 21:50:36 +0000 (Mon, 03 Apr 2006)
New Revision: 1316
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control
glibc-package/trunk/debian/control.in/libc
glibc-package/trunk/debian/control.in/libc0.1
glibc-package/trunk/debian/control.in/main
glibc-package/trunk/debian/debhelper.in/libc.install
glibc-package/trunk/debian/debhelper.in/libc.links
glibc-package/trunk/debian/debhelper.in/libc.postinst
glibc-package/trunk/debian/debhelper.in/libc.preinst
glibc-package/trunk/debian/rules
Log:
Temporarily disable r1302, it will be reapplied after 2.3.6-5 is uploaded.
This patch introduced a new tzdata binary package, and more binary packages
will be added in 2.3.6-6.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-04-03 21:39:50 UTC (rev 1315)
+++ glibc-package/trunk/debian/changelog 2006-04-03 21:50:36 UTC (rev 1316)
@@ -8,8 +8,6 @@
* Add a new /usr/sbin/update-locale program to handle this new file.
[ Aurelien Jarno ]
- * Split out timezone data in a separate package. It's a first step, it
- should finally be built from a separate source package.
* Fix ldconfig multiarch patch for reiserfs filesystems.
* Make ldconfig look into /lib32 and /usr/lib32 on amd64. Add /lib32 ->
/emul/ia32-linux/lib and /usr/lib32 -> /emul/ia32-linux/usr/lib links.
Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control 2006-04-03 21:39:50 UTC (rev 1315)
+++ glibc-package/trunk/debian/control 2006-04-03 21:50:36 UTC (rev 1316)
@@ -8,7 +8,7 @@
kfreebsd-kernel-headers [kfreebsd-i386 kfreebsd-amd64],
gcc-4.0 [!m68k], gcc-3.4 [m68k], binutils (>= 2.16.1cvs20051109-1),
autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 4.1.76),
- libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc], libc6-dev-i386 [amd64] | ia32-libs-dev (<= 1.5) [amd64], libc6-dev-powerpc [ppc64],
+ libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc], libc6-dev-i386 [amd64], libc6-dev-powerpc [ppc64],
quilt
Build-Depends-Indep: perl, po-debconf
Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
@@ -44,15 +44,6 @@
savings over how this package used to be, where all locales were generated
by default. This created a package that unpacked to an excess of 30 megs.
-Package: tzdata
-Architecture: all
-Section: libs
-Priority: required
-Replaces: libc0.1, libc0.3, libc6, libc6.1
-Description: GNU C Library: Timezone data
- This package contains data files with rules for various timezones around
- the world.
-
Package: nscd
Architecture: alpha amd64 arm armeb i386 m68k mips mipsel powerpc ppc64 sparc ia64 hppa s390 sh3 sh4 sh3eb sh4eb kfreebsd-i386 kfreebsd-amd64
Section: admin
@@ -69,11 +60,11 @@
Section: libs
Priority: required
Provides: ${locale-compat:Depends}
-Depends: tzdata
-Description: GNU C Library: Shared libraries
+Description: GNU C Library: Shared libraries and Timezone data
Contains the standard libraries that are used by nearly all programs on
the system. This package includes shared versions of the standard C library
and the standard math library, as well as many others.
+ Timezone data is also included.
Package: libc6-dev
Architecture: amd64 arm armeb i386 m68k mips mipsel powerpc ppc64 sparc s390 hppa sh3 sh4 sh3eb sh4eb
@@ -141,11 +132,11 @@
Section: libs
Priority: required
Provides: ${locale-compat:Depends}
-Depends: tzdata
-Description: GNU C Library: Shared libraries
+Description: GNU C Library: Shared libraries and Timezone data
Contains the standard libraries that are used by nearly all programs on
the system. This package includes shared versions of the standard C library
and the standard math library, as well as many others.
+ Timezone data is also included.
Package: libc6.1-dev
Architecture: alpha ia64
@@ -213,11 +204,11 @@
Section: libs
Priority: required
Provides: ${locale-compat:Depends}
-Depends: tzdata
-Description: GNU C Library: Shared libraries
+Description: GNU C Library: Shared libraries and Timezone data
Contains the standard libraries that are used by nearly all programs on
the system. This package includes shared versions of the standard C library
and the standard math library, as well as many others.
+ Timezone data is also included.
Package: libc0.3-dev
Architecture: hurd-i386
@@ -285,11 +276,11 @@
Section: libs
Priority: required
Provides: ${locale-compat:Depends}
-Depends: tzdata
-Description: GNU C Library: Shared libraries
+Description: GNU C Library: Shared libraries and Timezone data
Contains the standard libraries that are used by nearly all programs on
the system. This package includes shared versions of the standard C library
and the standard math library, as well as many others.
+ Timezone data is also included.
Package: libc0.1-dev
Architecture: kfreebsd-i386 kfreebsd-amd64
Modified: glibc-package/trunk/debian/control.in/libc
===================================================================
--- glibc-package/trunk/debian/control.in/libc 2006-04-03 21:39:50 UTC (rev 1315)
+++ glibc-package/trunk/debian/control.in/libc 2006-04-03 21:50:36 UTC (rev 1316)
@@ -3,11 +3,11 @@
Section: libs
Priority: required
Provides: ${locale-compat:Depends}
-Depends: tzdata
-Description: GNU C Library: Shared libraries
+Description: GNU C Library: Shared libraries and Timezone data
Contains the standard libraries that are used by nearly all programs on
the system. This package includes shared versions of the standard C library
and the standard math library, as well as many others.
+ Timezone data is also included.
Package: @libc@-dev
Architecture: @archs@
Modified: glibc-package/trunk/debian/control.in/libc0.1
===================================================================
--- glibc-package/trunk/debian/control.in/libc0.1 2006-04-03 21:39:50 UTC (rev 1315)
+++ glibc-package/trunk/debian/control.in/libc0.1 2006-04-03 21:50:36 UTC (rev 1316)
@@ -3,11 +3,11 @@
Section: libs
Priority: required
Provides: ${locale-compat:Depends}
-Depends: tzdata
-Description: GNU C Library: Shared libraries
+Description: GNU C Library: Shared libraries and Timezone data
Contains the standard libraries that are used by nearly all programs on
the system. This package includes shared versions of the standard C library
and the standard math library, as well as many others.
+ Timezone data is also included.
Package: libc0.1-dev
Architecture: kfreebsd-i386 kfreebsd-amd64
Modified: glibc-package/trunk/debian/control.in/main
===================================================================
--- glibc-package/trunk/debian/control.in/main 2006-04-03 21:39:50 UTC (rev 1315)
+++ glibc-package/trunk/debian/control.in/main 2006-04-03 21:50:36 UTC (rev 1316)
@@ -44,15 +44,6 @@
savings over how this package used to be, where all locales were generated
by default. This created a package that unpacked to an excess of 30 megs.
-Package: tzdata
-Architecture: all
-Section: libs
-Priority: required
-Replaces: libc0.1, libc0.3, libc6, libc6.1
-Description: GNU C Library: Timezone data
- This package contains data files with rules for various timezones around
- the world.
-
Package: nscd
Architecture: @threads_archs@
Section: admin
Modified: glibc-package/trunk/debian/debhelper.in/libc.install
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.install 2006-04-03 21:39:50 UTC (rev 1315)
+++ glibc-package/trunk/debian/debhelper.in/libc.install 2006-04-03 21:50:36 UTC (rev 1316)
@@ -1,6 +1,7 @@
debian/tmp-libc/lib/*.so* lib
debian/tmp-libc/usr/lib/gconv/*.so usr/lib/gconv
debian/tmp-libc/usr/lib/gconv/gconv-modules usr/lib/gconv
+debian/tmp-libc/usr/share/zoneinfo/* usr/share/zoneinfo
debian/tmp-libc/usr/bin/iconv usr/bin
debian/tmp-libc/usr/bin/locale usr/bin
debian/tmp-libc/usr/bin/localedef usr/bin
Modified: glibc-package/trunk/debian/debhelper.in/libc.links
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.links 2006-04-03 21:39:50 UTC (rev 1315)
+++ glibc-package/trunk/debian/debhelper.in/libc.links 2006-04-03 21:50:36 UTC (rev 1316)
@@ -0,0 +1 @@
+etc/localtime usr/share/zoneinfo/localtime
Modified: glibc-package/trunk/debian/debhelper.in/libc.postinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.postinst 2006-04-03 21:39:50 UTC (rev 1315)
+++ glibc-package/trunk/debian/debhelper.in/libc.postinst 2006-04-03 21:50:36 UTC (rev 1316)
@@ -10,6 +10,29 @@
echo LIBC
}
+zone_banner() {
+ 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."
+ echo "Current default timezone: '$timezone'.$extra_info"
+ echo "Run 'tzconfig' if you wish to change it."
+}
+
+set_timezone() {
+ frontend=`echo "$DEBIAN_FRONTEND" | tr '[:upper:]' '[:lower:]'`
+ if [ "$frontend" = noninteractive ]; then
+ echo "Non-interactive mode, setting timezone to UTC. Run tzconfig to change."
+ echo "UTC" >/etc/timezone
+ ln -sf /usr/share/zoneinfo/UTC /etc/localtime
+ else
+ echo "Running 'tzconfig' to set this system's timezone."
+ /usr/sbin/tzconfig
+ fi
+}
+
# Borrowed from sysvinit's postinst.
# Function like update-rc.d but simpler & faster.
# Usage: updatercd basename start|stop NN runlevel .
@@ -61,6 +84,25 @@
done
}
+realpath()
+{
+ fname=${1%/} # strips trailing '/'
+ while [ -L "$fname" ]; do
+ oldfname="$fname"
+ fname="$(command ls -l $fname)"
+ fname="${fname#*\> }"
+ if [ "$fname" = . ] ; then
+ fname="$(dirname $oldfname)"
+ elif echo $fname | grep -vq '^/' - ; then
+ fname="$(dirname $oldfname)/$fname"
+ fi
+ done
+ pushd $(dirname $fname) > /dev/null
+ fname=$(pwd -P)/$(basename $fname)
+ popd > /dev/null
+ echo $fname
+}
+
# element() is a helper function for file-rc:
element() {
local element list IFS
@@ -336,7 +378,45 @@
fi
fi # end upgrading and $preversion lt 2.3.5-1
fi # Upgrading
-
+ if [ -f /etc/timezone.save ]; then
+ mv -fb /etc/timezone.save /etc/timezone
+ fi
+ if [ -f /etc/timezone ]; then
+ timezone=$(cat /etc/timezone)
+ else
+ timezone=Factory
+ fi
+ if [ "$timezone" = Factory ]; then
+ if [ -L /etc/localtime ]; then
+ localtime_link=$(realpath /etc/localtime)
+ if [ -f "$localtime_link" ]; then
+ link_not_dangling=true
+ fi
+ if [ "$link_not_dangling" = true ]; then
+ timezone=$(echo $localtime_link | sed 's%^/usr/share/zoneinfo/%%')
+ fi
+ fi
+ fi
+ if [ -f /usr/share/zoneinfo/$timezone ] && [ "$timezone" != Factory ]
+ then
+# zic -l $timezone
+ rm -f /etc/localtime && \
+ ln -sf /usr/share/zoneinfo/$timezone /etc/localtime
+ zone_banner
+ # Handle problem caused by lame old tzconfig.
+ elif [ "$timezone" = "US/Pacific-New" ]
+ then
+ echo "US/Pacific" > /etc/timezone
+# zic -l US/Pacific
+ rm -f /etc/localtime && \
+ ln -sf /usr/share/zoneinfo/US/Pacific /etc/localtime
+ zone_banner
+ else
+ set_timezone
+ fi
+ if [ "$(date +%Z)" = "/etc/localtime" ]; then
+ set_timezone
+ fi
# # DO NOT FOLLOW THIS EXAMPLE IN OTHER PACKAGES
updatercd glibc.sh start 01 S .
if [ -x /usr/sbin/invoke-rc.d ]; then
Modified: glibc-package/trunk/debian/debhelper.in/libc.preinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.preinst 2006-04-03 21:39:50 UTC (rev 1315)
+++ glibc-package/trunk/debian/debhelper.in/libc.preinst 2006-04-03 21:50:36 UTC (rev 1316)
@@ -4,6 +4,17 @@
if [ "$1" = upgrade ]
then
+ if [ -f /var/lib/dpkg/info/timezone.postrm ]; then
+ rm -f /var/lib/dpkg/info/timezone.postrm
+ fi
+ if [ -f /var/lib/dpkg/info/timezones.postrm ]; then
+ rm -f /var/lib/dpkg/info/timezones.postrm
+ fi
+ if dpkg --compare-versions "$2" lt 2.1.3-8; then
+ if [ -s /etc/timezone ]; then
+ cp -a /etc/timezone /etc/timezone.save
+ fi
+ fi
if dpkg --compare-versions "$2" le 2.2.2-4 && test -e /lib/libdb.so.3; then
# Make upgrades to newer libdb.so.3 easier
cat /lib/libdb.so.3 > /lib/libdb.so.3.old
Modified: glibc-package/trunk/debian/rules
===================================================================
--- glibc-package/trunk/debian/rules 2006-04-03 21:39:50 UTC (rev 1315)
+++ glibc-package/trunk/debian/rules 2006-04-03 21:50:36 UTC (rev 1316)
@@ -118,7 +118,7 @@
curpass = $(filter-out %_,$(subst _,_ ,$@))
DEB_ARCH_REGULAR_PACKAGES = $(libc) $(libc)-dev $(libc)-dbg $(libc)-prof $(libc)-pic
-DEB_INDEP_REGULAR_PACKAGES = glibc-doc locales tzdata
+DEB_INDEP_REGULAR_PACKAGES = glibc-doc locales
DEB_UDEB_PACKAGES = $(libc)-udeb libnss-dns-udeb libnss-files-udeb
# Generic kernel version check
Reply to: