Author: aurel32 Date: 2007-07-31 13:29:48 +0000 (Tue, 31 Jul 2007) New Revision: 2484
Added: tzdata/branches/glibc-branch-etch/ tzdata/branches/glibc-branch-etch/debian/ tzdata/branches/glibc-branch-etch/debian/changelog tzdata/branches/glibc-branch-etch/debian/compat tzdata/branches/glibc-branch-etch/debian/control tzdata/branches/glibc-branch-etch/debian/copyright tzdata/branches/glibc-branch-etch/debian/files tzdata/branches/glibc-branch-etch/debian/install tzdata/branches/glibc-branch-etch/debian/links tzdata/branches/glibc-branch-etch/debian/patches/ tzdata/branches/glibc-branch-etch/debian/patches/quiltrc tzdata/branches/glibc-branch-etch/debian/patches/series tzdata/branches/glibc-branch-etch/debian/patches/systemv.diff tzdata/branches/glibc-branch-etch/debian/postinst tzdata/branches/glibc-branch-etch/debian/rules tzdata/branches/glibc-branch-etch/debian/watch Log: Create an Etch branch for tzdata Added: tzdata/branches/glibc-branch-etch/debian/changelog =================================================================== --- tzdata/branches/glibc-branch-etch/debian/changelog (rev 0) +++ tzdata/branches/glibc-branch-etch/debian/changelog 2007-07-31 13:29:48 UTC (rev 2484) @@ -0,0 +1,110 @@ +tzdata (2007f-1etch1) stable; urgency=low + + * New upstream release for Etch: + - Includes new DST rules for New Zealand (closes: bug#433869). + * Only the timezone definitions have been changed, all scripts are left + unchanged. + + -- Aurelien Jarno <[EMAIL PROTECTED]> Tue, 31 Jul 2007 13:13:50 +0000 + +tzdata (2007b-1) unstable; urgency=low + + * New upstream release. + + -- Aurelien Jarno <[EMAIL PROTECTED]> Sun, 18 Feb 2007 19:10:15 +0100 + +tzdata (2007a-3) unstable; urgency=low + + * Make tzdata an Essential package. + * Fix postinst script with broken /etc/localtime file (closes: bug#409419). + + -- Aurelien Jarno <[EMAIL PROTECTED]> Fri, 2 Feb 2007 22:37:36 +0100 + +tzdata (2007a-2) unstable; urgency=low + + * Generate and ship /usr/share/zoneinfo/posixrules (closes: bug#409275). + + -- Aurelien Jarno <[EMAIL PROTECTED]> Thu, 1 Feb 2007 18:39:05 +0100 + +tzdata (2007a-1) unstable; urgency=low + + * New upstream release. + + -- Aurelien Jarno <[EMAIL PROTECTED]> Sun, 21 Jan 2007 22:28:24 +0100 + +tzdata (2006p-1) unstable; urgency=low + + [ Aurelien Jarno ] + * New upstream release. + - Includes DST rules for West Australia. + + -- Aurelien Jarno <[EMAIL PROTECTED]> Tue, 28 Nov 2006 10:58:53 +0100 + +tzdata (2006n-1) unstable; urgency=low + + [ Aurelien Jarno ] + * New upstream release. + + -- Aurelien Jarno <[EMAIL PROTECTED]> Sat, 21 Oct 2006 22:51:50 +0200 + +tzdata (2006m-1) unstable; urgency=low + + [ Aurelien Jarno ] + * New upstream release. + + -- Aurelien Jarno <[EMAIL PROTECTED]> Sun, 8 Oct 2006 19:39:42 +0200 + +tzdata (2006l-1) unstable; urgency=low + + [ Denis Barbier ] + * New upstream release. + * debian/rules: Use debian/patches/quiltrc for quilt global settings. + + -- Denis Barbier <[EMAIL PROTECTED]> Tue, 19 Sep 2006 22:26:27 +0200 + +tzdata (2006k-1) unstable; urgency=low + + [ Aurelien Jarno ] + * New upstream release. + + -- Aurelien Jarno <[EMAIL PROTECTED]> Tue, 29 Aug 2006 22:53:57 +0200 + +tzdata (2006g-2) unstable; urgency=low + + * patches/systemv.diff: As Indianapolis use DST since 2006, it can no + more be an alias for SystemV/EST5, replace it with Panama. + Closes: #367025 + * debian/watch: New file. + + -- Denis Barbier <[EMAIL PROTECTED]> Fri, 2 Jun 2006 23:44:21 +0200 + +tzdata (2006g-1) unstable; urgency=low + + [ Denis Barbier ] + * New upstream release. + * debian/control: Bump Standards-Version: 3.7.2 (no changes needed) + * debian/control: quilt is not run by the 'clean' target, so move it + into Build-Depends-Indep. + + -- Denis Barbier <[EMAIL PROTECTED]> Thu, 1 Jun 2006 22:19:57 +0200 + +tzdata (2006c-2) unstable; urgency=low + + * Put a copy of the current timezone into /etc/localtime instead of a + symlink. + * Add a patching system. + * patches/systemv.diff: create the SystemV links for compatibility reasons. + * Drop the dependency on libc-bin. + * Drop the preinst script, we don't support upgrades from Potato :-) + + -- Aurelien Jarno <[EMAIL PROTECTED]> Mon, 10 Apr 2006 09:13:04 +0200 + +tzdata (2006c-1) unstable; urgency=low + + * Initial release. + * For easy updating, this package has been splitted out of the GNU C + Library. + * Thanks to the authors of the langpack-locales Ubuntu package, which has + been used to understand how to process source timezone files. + + -- Aurelien Jarno <[EMAIL PROTECTED]> Sat, 8 Apr 2006 19:00:31 +0200 Added: tzdata/branches/glibc-branch-etch/debian/compat =================================================================== --- tzdata/branches/glibc-branch-etch/debian/compat (rev 0) +++ tzdata/branches/glibc-branch-etch/debian/compat 2007-07-31 13:29:48 UTC (rev 2484) @@ -0,0 +1 @@ +4 Added: tzdata/branches/glibc-branch-etch/debian/control =================================================================== --- tzdata/branches/glibc-branch-etch/debian/control (rev 0) +++ tzdata/branches/glibc-branch-etch/debian/control 2007-07-31 13:29:48 UTC (rev 2484) @@ -0,0 +1,18 @@ +Source: tzdata +Section: libs +Essential: yes +Priority: required +Build-Depends: debhelper (>= 4.0.0) +Build-Depends-Indep: quilt +Maintainer: GNU Libc Maintainers <[email protected]> +Uploaders: Ben Collins <[EMAIL PROTECTED]>, GOTO Masanori <[EMAIL PROTECTED]>, Philip Blundell <[EMAIL PROTECTED]>, Jeff Bailey <[EMAIL PROTECTED]>, Daniel Jacobowitz <[EMAIL PROTECTED]>, Clint Adams <[EMAIL PROTECTED]>, Aurelien Jarno <[EMAIL PROTECTED]> +Standards-Version: 3.7.2 + +Package: tzdata +Architecture: all +Replaces: libc0.1, libc0.3, libc6, libc6.1 +Description: Time Zone and Daylight Saving Time Data + This package contains data that represent the history of local time for many + representative locations around the globe. It is updated periodically to + reflect changes made by political bodies to time zone boundaries, UTC offsets, + and daylight-saving rules Added: tzdata/branches/glibc-branch-etch/debian/copyright =================================================================== --- tzdata/branches/glibc-branch-etch/debian/copyright (rev 0) +++ tzdata/branches/glibc-branch-etch/debian/copyright 2007-07-31 13:29:48 UTC (rev 2484) @@ -0,0 +1,10 @@ +This is the Debian prepackaged version of the Time Zone and Daylight +Saving Time Data. + +It was downloaded from ftp://elsie.nci.nih.gov/pub/ + +Upstream Authors: Arthur David Olson et.al. +Commentary should be addressed to [EMAIL PROTECTED] + +Copyright: This database is in the public domain. + Added: tzdata/branches/glibc-branch-etch/debian/files =================================================================== --- tzdata/branches/glibc-branch-etch/debian/files (rev 0) +++ tzdata/branches/glibc-branch-etch/debian/files 2007-07-31 13:29:48 UTC (rev 2484) @@ -0,0 +1 @@ +tzdata_2007f-1etch1_all.deb libs required Added: tzdata/branches/glibc-branch-etch/debian/install =================================================================== --- tzdata/branches/glibc-branch-etch/debian/install (rev 0) +++ tzdata/branches/glibc-branch-etch/debian/install 2007-07-31 13:29:48 UTC (rev 2484) @@ -0,0 +1,3 @@ +tzgen/* usr/share/zoneinfo/ +tzsource/iso3166.tab usr/share/zoneinfo/ +tzsource/zone.tab usr/share/zoneinfo/ Added: tzdata/branches/glibc-branch-etch/debian/links =================================================================== --- tzdata/branches/glibc-branch-etch/debian/links (rev 0) +++ tzdata/branches/glibc-branch-etch/debian/links 2007-07-31 13:29:48 UTC (rev 2484) @@ -0,0 +1 @@ +etc/localtime usr/share/zoneinfo/localtime Added: tzdata/branches/glibc-branch-etch/debian/patches/quiltrc =================================================================== --- tzdata/branches/glibc-branch-etch/debian/patches/quiltrc (rev 0) +++ tzdata/branches/glibc-branch-etch/debian/patches/quiltrc 2007-07-31 13:29:48 UTC (rev 2484) @@ -0,0 +1,2 @@ +QUILT_PATCHES="../debian/patches" +QUILT_NO_DIFF_TIMESTAMPS=0 Added: tzdata/branches/glibc-branch-etch/debian/patches/series =================================================================== --- tzdata/branches/glibc-branch-etch/debian/patches/series (rev 0) +++ tzdata/branches/glibc-branch-etch/debian/patches/series 2007-07-31 13:29:48 UTC (rev 2484) @@ -0,0 +1 @@ +systemv.diff -p0 Added: tzdata/branches/glibc-branch-etch/debian/patches/systemv.diff =================================================================== --- tzdata/branches/glibc-branch-etch/debian/patches/systemv.diff (rev 0) +++ tzdata/branches/glibc-branch-etch/debian/patches/systemv.diff 2007-07-31 13:29:48 UTC (rev 2484) @@ -0,0 +1,21 @@ +Create the SystemV links, for compatibility with previous versions. + +--- systemv 2006-04-10 11:36:52.455402059 +0200 ++++ systemv 2006-04-10 11:37:12.684500320 +0200 +@@ -34,3 +34,16 @@ + ## Zone SystemV/PST8 -8:00 - PST + ## Zone SystemV/YST9 -9:00 - YST + ## Zone SystemV/HST10 -10:00 - HST ++Link America/Halifax SystemV/AST4ADT ++Link America/New_York SystemV/EST5EDT ++Link America/Chicago SystemV/CST6CDT ++Link America/Denver SystemV/MST7MDT ++Link America/Los_Angeles SystemV/PST8PDT ++Link America/Anchorage SystemV/YST9YDT ++Link America/Puerto_Rico SystemV/AST4 ++Link America/Panama SystemV/EST5 ++Link America/Regina SystemV/CST6 ++Link America/Phoenix SystemV/MST7 ++Link Pacific/Pitcairn SystemV/PST8 ++Link Pacific/Gambier SystemV/YST9 ++Link Pacific/Honolulu SystemV/HST10 Added: tzdata/branches/glibc-branch-etch/debian/postinst =================================================================== --- tzdata/branches/glibc-branch-etch/debian/postinst (rev 0) +++ tzdata/branches/glibc-branch-etch/debian/postinst 2007-07-31 13:29:48 UTC (rev 2484) @@ -0,0 +1,93 @@ +#!/bin/bash +set -e +export LC_ALL=C + +type=$1 +preversion=$2 + +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 +} + +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 +} + +if [ "$type" = "configure" ] +then + if [ -f /etc/timezone ]; then + timezone=$(head -n 1 /etc/timezone | sed -e "s/ .*//") + 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 && \ + cp -f /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 && \ + cp -f /usr/share/zoneinfo/US/Pacific /etc/localtime + zone_banner + else + set_timezone + fi + if [ "$(date +%Z)" = "/etc/localtime" ]; then + set_timezone + fi +fi + + +#DEBHELPER# + +exit 0 Added: tzdata/branches/glibc-branch-etch/debian/rules =================================================================== --- tzdata/branches/glibc-branch-etch/debian/rules (rev 0) +++ tzdata/branches/glibc-branch-etch/debian/rules 2007-07-31 13:29:48 UTC (rev 2484) @@ -0,0 +1,98 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 +export LC_ALL=C + +TZGEN := $(CURDIR)/tzgen +TZSOURCE := $(CURDIR)/tzsource +TIMEZONES := africa \ + antarctica \ + asia \ + australasia \ + europe \ + northamerica \ + southamerica \ + etcetera \ + factory \ + solar87 \ + solar88 \ + solar89 \ + backward \ + systemv + +QUILT := quilt --quiltrc ../debian/patches/quiltrc + +build: build-stamp +build-stamp: + dh_testdir + + # Unpack the sources + mkdir $(TZSOURCE) + for x in $$(ls tzdata*.tar.gz); do \ + tar -xzvC $(TZSOURCE) -f $${x} ;\ + done + + # Apply patches + @cd $(TZSOURCE); \ + if $(QUILT) next >/dev/null 2>&1; then \ + echo -n "Applying patches..."; \ + if $(QUILT) push -a -v > $(CURDIR)/patch-log 2>&1; then \ + echo "successful."; \ + else \ + echo "failed! (check $(CURDIR)/patch-log for details)"; \ + exit 1; \ + fi; \ + else \ + echo "No patches to apply"; \ + fi + + # Build + for zone in $(TIMEZONES); do \ + /usr/sbin/zic -d $(TZGEN) -L /dev/null -y $(TZSOURCE)/yearistype.sh $(TZSOURCE)/$${zone} ; \ + /usr/sbin/zic -d $(TZGEN)/posix -L /dev/null -y $(TZSOURCE)/yearistype.sh $(TZSOURCE)/$${zone} ; \ + /usr/sbin/zic -d $(TZGEN)/right -L $(TZSOURCE)/leapseconds -y $(TZGEN)/yearistype.sh $(TZSOURCE)/$${zone} ; \ + done + + # Generate a posixrules file + /usr/sbin/zic -d $(TZGEN) -p America/New_York + + touch $@ + +clean: + dh_testdir + dh_testroot + -rm -rf $(TZSOURCE) $(TZGEN) .pc + rm -f build-stamp + rm -f patch-log + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + # Do nothing + +# Build architecture-dependent files here. +binary-arch: build install +# We have nothing to do by default. + +# Build architecture-independent files here. +binary-indep: build install + dh_testdir + dh_testroot + dh_installdirs + dh_install + dh_installchangelogs + dh_link + dh_installdocs + dh_installinfo + dh_compress + dh_fixperms + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install Property changes on: tzdata/branches/glibc-branch-etch/debian/rules ___________________________________________________________________ Name: svn:executable + * Added: tzdata/branches/glibc-branch-etch/debian/watch =================================================================== --- tzdata/branches/glibc-branch-etch/debian/watch (rev 0) +++ tzdata/branches/glibc-branch-etch/debian/watch 2007-07-31 13:29:48 UTC (rev 2484) @@ -0,0 +1,4 @@ +version=3 +ftp://elsie.nci.nih.gov/pub/tzdata(\w+)\.tar\.gz \ + debian uupdate + -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
