Author: aurel32 Date: 2011-08-13 13:52:08 +0000 (Sat, 13 Aug 2011) New Revision: 4881
Added: tzdata/trunk/debian/tzdata.config tzdata/trunk/debian/tzdata.install tzdata/trunk/debian/tzdata.links tzdata/trunk/debian/tzdata.postinst tzdata/trunk/debian/tzdata.templates Removed: tzdata/trunk/debian/config tzdata/trunk/debian/install tzdata/trunk/debian/links tzdata/trunk/debian/postinst tzdata/trunk/debian/templates Log: Prefix all debhelper files with the package name for consistency Deleted: tzdata/trunk/debian/config =================================================================== --- tzdata/trunk/debian/config 2011-08-13 13:50:46 UTC (rev 4880) +++ tzdata/trunk/debian/config 2011-08-13 13:52:08 UTC (rev 4881) @@ -1,423 +0,0 @@ -#! /bin/sh -set -e - -. /usr/share/debconf/confmodule -db_version 2.0 -db_capb backup - -convert_timezone() -{ - case "$1" in - (right/*|posix/*) - convert_timezone "${1#*/}" - ;; - ("Africa/Asmera") - echo "Africa/Asmara" - ;; - ("America/Argentina/ComodRivadavia"|"America/Catamarca") - echo "America/Argentina/Catamarca" - ;; - ("America/Buenos_Aires") - echo "America/Argentina/Buenos_Aires" - ;; - ("America/Cordoba"|"America/Rosario") - echo "America/Argentina/Cordoba" - ;; - ("America/Jujuy") - echo "America/Argentina/Jujuy" - ;; - ("America/Mendoza") - echo "America/Argentina/Mendoza" - ;; - ("Antarctica/South_Pole") - echo "Antarctica/McMurdo" - ;; - "Asia/Ashkhabad") - echo "Asia/Ashgabat" - ;; - ("Asia/Calcutta") - echo "Asia/Kolkata" - ;; - "Asia/Chungking") - echo "Asia/Chongqing" - ;; - "Asia/Dacca") - echo "Asia/Dhaka" - ;; - ("Asia/Katmandu") - echo "Asia/Kathmandu" - ;; - "Asia/Macao") - echo "Asia/Macau" - ;; - ("Asia/Saigon") - echo "Asia/Ho_Chi_Minh" - ;; - "Asia/Thimbu") - echo "Asia/Thimphu" - ;; - "Asia/Ulan_Bator") - echo "Asia/Ulaanbaatar" - ;; - "Atlantic/Faeroe") - echo "Atlantic/Faroe" - ;; - "Australia/ACT" | "Australia/NSW") - echo "Australia/Sydney" - ;; - "Australia/LHI") - echo "Australia/Lord_Howe" - ;; - "Australia/North") - echo "Australia/Darwin" - ;; - "Australia/Queensland") - echo "Australia/Brisbane" - ;; - "Australia/South") - echo "Australia/Adelaide" - ;; - "Australia/Tasmania") - echo "Australia/Hobart" - ;; - "Australia/Victoria") - echo "Australia/Melbourne" - ;; - "Australia/West") - echo "Australia/Perth" - ;; - "Brazil/Acre") - echo "America/Rio_Branco" - ;; - "Brazil/DeNoronha") - echo "America/Noronha" - ;; - "Brazil/East") - echo "America/Sao_Paulo" - ;; - "Brazil/West") - echo "America/Manaus" - ;; - "Canada/Atlantic") - echo "America/Halifax" - ;; - "Canada/Central") - echo "America/Winnipeg" - ;; - "Canada/East-Saskatchewan") - echo "America/Regina" - ;; - "Canada/Eastern") - echo "America/Toronto" - ;; - "Canada/Mountain") - echo "America/Edmonton" - ;; - "Canada/Newfoundland") - echo "America/St_Johns" - ;; - "Canada/Pacific") - echo "America/Vancouver" - ;; - "Canada/Saskatchewan") - echo "America/Regina" - ;; - "Canada/Yukon") - echo "America/Whitehorse" - ;; - "CET") - echo "Europe/Paris" - ;; - "Chile/Continental") - echo "America/Santiago" - ;; - "Chile/EasterIsland") - echo "Pacific/Easter" - ;; - "CST6CDT") - echo "SystemV/CST6CDT" - ;; - "Cuba") - echo "America/Havana" - ;; - "EET") - echo "Europe/Helsinki" - ;; - "Egypt") - echo "Africa/Cairo" - ;; - "Eire") - echo "Europe/Dublin" - ;; - "EST") - echo "SystemV/EST5" - ;; - "EST5EDT") - echo "SystemV/EST5EDT" - ;; - "GB") - echo "Europe/London" - ;; - "GB-Eire") - echo "Europe/London" - ;; - "GMT") - echo "Etc/GMT" - ;; - "GMT0") - echo "Etc/GMT0" - ;; - "GMT-0") - echo "Etc/GMT-0" - ;; - "GMT+0") - echo "Etc/GMT+0" - ;; - "Greenwich") - echo "Etc/Greenwich" - ;; - "Hongkong") - echo "Asia/Hong_Kong" - ;; - "HST") - echo "Pacific/Honolulu" - ;; - "Iceland") - echo "Atlantic/Reykjavik" - ;; - "Iran") - echo "Asia/Tehran" - ;; - "Israel") - echo "Asia/Tel_Aviv" - ;; - "Jamaica") - echo "America/Jamaica" - ;; - "Japan") - echo "Asia/Tokyo" - ;; - "Kwajalein") - echo "Pacific/Kwajalein" - ;; - "Libya") - echo "Africa/Tripoli" - ;; - "MET") - echo "Europe/Paris" - ;; - "Mexico/BajaNorte") - echo "America/Tijuana" - ;; - "Mexico/BajaSur") - echo "America/Mazatlan" - ;; - "Mexico/General") - echo "America/Mexico_City" - ;; - "Mideast/Riyadh87") - echo "Asia/Riyadh87" - ;; - "Mideast/Riyadh88") - echo "Asia/Riyadh88" - ;; - "Mideast/Riyadh89") - echo "Asia/Riyadh89" - ;; - "MST") - echo "SystemV/MST7" - ;; - "MST7MDT") - echo "SystemV/MST7MDT" - ;; - "Navajo") - echo "America/Denver" - ;; - "NZ") - echo "Pacific/Auckland" - ;; - "NZ-CHAT") - echo "Pacific/Chatham" - ;; - "Poland") - echo "Europe/Warsaw" - ;; - "Portugal") - echo "Europe/Lisbon" - ;; - "PRC") - echo "Asia/Shanghai" - ;; - "PST8PDT") - echo "SystemV/PST8PDT" - ;; - "ROC") - echo "Asia/Taipei" - ;; - "ROK") - echo "Asia/Seoul" - ;; - "Singapore") - echo "Asia/Singapore" - ;; - "Turkey") - echo "Europe/Istanbul" - ;; - "UCT") - echo "Etc/UCT" - ;; - "Universal") - echo "Etc/UTC" - ;; - "US/Alaska") - echo "America/Anchorage" - ;; - "US/Aleutian") - echo "America/Adak" - ;; - "US/Arizona") - echo "America/Phoenix" - ;; - "US/Central") - echo "America/Chicago" - ;; - "US/East-Indiana") - echo "America/Indianapolis" - ;; - "US/Eastern") - echo "America/New_York" - ;; - "US/Hawaii") - echo "Pacific/Honolulu" - ;; - "US/Indiana-Starke") - echo "America/Indianapolis" - ;; - "US/Michigan") - echo "America/Detroit" - ;; - "US/Mountain") - echo "America/Denver" - ;; - "US/Pacific") - echo "America/Los_Angeles" - ;; - "US/Samoa") - echo "Pacific/Pago_Pago" - ;; - "UTC") - echo "Etc/UTC" - ;; - "WET") - echo "Europe/Lisbon" - ;; - "W-SU") - echo "Europe/Moscow" - ;; - "Zulu") - echo "Etc/UTC" - ;; - *) - echo "$1" - ;; - esac -} - -# If /etc/localtime is a link, update /etc/timezone -if [ -L /etc/localtime ] ; then - TIMEZONE="$(readlink /etc/localtime)" - TIMEZONE="${TIMEZONE#/usr/share/zoneinfo/}" - if [ -f "/usr/share/zoneinfo/$TIMEZONE" ] ; then - echo ${TIMEZONE} > /etc/timezone - fi -fi - -# Read /etc/timezone -if [ -e /etc/timezone ]; then - TIMEZONE="$(head -n 1 /etc/timezone)" - TIMEZONE="${TIMEZONE%% *}" - TIMEZONE="${TIMEZONE##/}" - TIMEZONE="${TIMEZONE%%/}" - TIMEZONE="$(convert_timezone $TIMEZONE)" - if [ -f "/usr/share/zoneinfo/$TIMEZONE" ] ; then - AREA="${TIMEZONE%%/*}" - ZONE="${TIMEZONE#*/}" - else - rm -f /etc/timezone - fi -fi - -# The timezone is already configured -if [ -e /etc/timezone ] && [ -e /etc/localtime ] ; then - # Don't ask the user, except if he/she explicitely asked that - if [ -z "$DEBCONF_RECONFIGURE" ] ; then - db_fset tzdata/Areas seen true - db_fset tzdata/Zones/$AREA seen true - fi -# The timezone has never been configured or is falsely configured -elif ! [ -e /etc/localtime ] || [ -n "$DEBCONF_RECONFIGURE" ] ; then - if [ -z "$AREA" ] || [ -z "$ZONE" ] ; then - RET="" - db_get tzdata/Areas || true - if [ -n "$RET" ] ; then - AREA=$RET - else - AREA="Etc" - fi - - RET="" - db_get tzdata/Zones/$AREA || RET=true - if [ -n "$RET" ] ; then - ZONE=$RET - else - ZONE="UTC" - fi - - echo "$AREA/$ZONE" > /etc/timezone - fi - db_fset tzdata/Areas seen false - db_fset tzdata/Zones/$AREA seen false -# The user want to handle the timezone by him/herself -else - exit 0 -fi - -# Initializes debconf default values from the ones found in -# configuration files -db_set tzdata/Areas "$AREA" -db_set tzdata/Zones/$AREA "$ZONE" - -STATE=1 -while [ "$STATE" -ge 0 ]; do - case "$STATE" in - 0) - # The user has cancel the timezone change, reset the debconf - # values to the initial one. - db_set tzdata/Areas "$AREA" - db_set tzdata/Zones/$AREA "$ZONE" - break - ;; - 1) - # Ask the user of the Area - db_input high tzdata/Areas || true - ;; - 2) - # Ask the user of the Zone - db_get tzdata/Areas || RET=Etc - db_input high tzdata/Zones/$RET || true - ;; - *) - break - ;; - esac - if db_go; then - STATE=$(($STATE + 1)) - else - STATE=$(($STATE - 1)) - fi -done - -#DEBHELPER# - - -exit 0 Deleted: tzdata/trunk/debian/install =================================================================== --- tzdata/trunk/debian/install 2011-08-13 13:50:46 UTC (rev 4880) +++ tzdata/trunk/debian/install 2011-08-13 13:52:08 UTC (rev 4881) @@ -1,4 +0,0 @@ -debian/tzconfig /usr/sbin -tzgen/* usr/share/zoneinfo/ -iso3166.tab usr/share/zoneinfo/ -zone.tab usr/share/zoneinfo/ Deleted: tzdata/trunk/debian/links =================================================================== --- tzdata/trunk/debian/links 2011-08-13 13:50:46 UTC (rev 4880) +++ tzdata/trunk/debian/links 2011-08-13 13:52:08 UTC (rev 4881) @@ -1 +0,0 @@ -etc/localtime usr/share/zoneinfo/localtime Deleted: tzdata/trunk/debian/postinst =================================================================== --- tzdata/trunk/debian/postinst 2011-08-13 13:50:46 UTC (rev 4880) +++ tzdata/trunk/debian/postinst 2011-08-13 13:52:08 UTC (rev 4881) @@ -1,52 +0,0 @@ -#! /bin/sh -set -e - -LC_ALL=C -LANG=C -unset TZ -umask 022 - -. /usr/share/debconf/confmodule -db_version 2.0 - -if [ "$1" = configure ]; then - # If the user prefers to manage the time zone by itself, let him doing that. - - if ! [ -e /etc/timezone ] && [ -z "$DEBCONF_RECONFIGURE" ] ; then - db_stop - echo - echo "User defined time zone, leaving /etc/localtime unchanged." - else - - # Get the values from debconf - AREA=Etc - ZONE=UTC - db_get tzdata/Areas && AREA="$RET" - db_get tzdata/Zones/$AREA && ZONE="$RET" - db_stop - - # Update the time zone - echo $AREA/$ZONE > /etc/timezone - cp -f /usr/share/zoneinfo/$AREA/$ZONE /etc/localtime.dpkg-new && \ - mv -f /etc/localtime.dpkg-new /etc/localtime - which restorecon >/dev/null 2>&1 && restorecon /etc/localtime - - echo - echo "Current default time zone: '$AREA/$ZONE'" - fi - - # Show the new setting to the user - TZBase=$(LC_ALL=C TZ=UTC0 date) - UTdate=$(LC_ALL=C TZ=UTC0 date -d "$TZBase") - TZdate=$(unset TZ ; LANG=C date -d "$TZBase") - echo "Local time is now: $TZdate." - echo "Universal Time is now: $UTdate." - if [ -z "$DEBCONF_RECONFIGURE" ] ; then - echo "Run 'dpkg-reconfigure tzdata' if you wish to change it." - fi - echo -fi - -#DEBHELPER# - -exit 0 Deleted: tzdata/trunk/debian/templates =================================================================== --- tzdata/trunk/debian/templates 2011-08-13 13:50:46 UTC (rev 4880) +++ tzdata/trunk/debian/templates 2011-08-13 13:52:08 UTC (rev 4881) @@ -1,97 +0,0 @@ -Template: tzdata/Areas -Type: select -# Note to translators: -# - "Etc" will present users with a list -# of "GMT+xx" or "GMT-xx" timezones -# - SystemV will give the choice between zone named as per SystemV conventions: -# EST5, MST7, etc. -__Choices: Africa, America, Antarctica, Australia, Arctic, Asia, Atlantic, Europe, Indian, Pacific, SystemV, Etc -_Description: Geographic area: - Please select the geographic area you live in. Subsequent - configuration questions will narrow this down by presenting a list of - cities, representing the time zones in which they are located. - -Template: tzdata/Zones/Africa -Type: select -# Translators: do not translate underscores. You can use spaces instead. -__Choices: Abidjan, Accra, Addis_Ababa, Algiers, Asmara, Bamako, Bangui, Banjul, Bissau, Blantyre, Brazzaville, Bujumbura, Cairo, Casablanca, Ceuta, Conakry, Dakar, Dar_es_Salaam, Djibouti, Douala, El_Aaiun, Freetown, Gaborone, Harare, Johannesburg, Kampala, Khartoum, Kigali, Kinshasa, Lagos, Libreville, Lome, Luanda, Lubumbashi, Lusaka, Malabo, Maputo, Maseru, Mbabane, Mogadishu, Monrovia, Nairobi, Ndjamena, Niamey, Nouakchott, Ouagadougou, Porto-Novo, Sao_Tome, Timbuktu, Tripoli, Tunis, Windhoek -_Description: Time zone: - Please select the time zone corresponding to your location. - -Template: tzdata/Zones/America -Type: select -# Translators: do not translate underscores. You can use spaces instead. -__Choices: Adak, Anchorage, Anguilla, Antigua, Araguaina, Argentina/Buenos_Aires, Argentina/Catamarca, Argentina/Cordoba, Argentina/Jujuy, Argentina/La_Rioja, Argentina/Mendoza, Argentina/Rio_Gallegos, Argentina/Salta, Argentina/San_Juan, Argentina/San_Luis, Argentina/Tucuman, Argentina/Ushuaia, Aruba, Asuncion, Atikokan, Atka, Bahia, Barbados, Belem, Belize, Blanc-Sablon, Boa_Vista, Bogota, Boise, Cambridge_Bay, Campo_Grande, Cancun, Caracas, Cayenne, Cayman, Chicago, Chihuahua, Coral_Harbour, Costa_Rica, Cuiaba, Curacao, Danmarkshavn, Dawson, Dawson_Creek, Denver, Detroit, Dominica, Edmonton, Eirunepe, El_Salvador, Ensenada, Fortaleza, Glace_Bay, Godthab, Goose_Bay, Grand_Turk, Grenada, Guadeloupe, Guatemala, Guayaquil, Guyana, Halifax, Havana, Hermosillo, Indiana/Indianapolis, Indiana/Knox, Indiana/Marengo, Indiana/Petersburg, Indiana/Tell_City, Indiana/Vevay, Indiana/Vincennes, Indiana/Winamac, Inuvik, Iqaluit, Jamaica, Juneau, Kentucky/Louisville, Kentucky/Monticello, L a_Paz, Lima, Los_Angeles, Maceio, Managua, Manaus, Marigot, Martinique, Mazatlan, Menominee, Merida, Mexico_City, Miquelon, Moncton, Monterrey, Montevideo, Montreal, Montserrat, Nassau, New_York, Nipigon, Nome, Noronha, North_Dakota/Center, North_Dakota/New_Salem, Panama, Pangnirtung, Paramaribo, Phoenix, Port-au-Prince, Port_of_Spain, Porto_Acre, Porto_Velho, Puerto_Rico, Rainy_River, Rankin_Inlet, Recife, Regina, Resolute, Rio_Branco, Santarem, Santiago, Santo_Domingo, Sao_Paulo, Scoresbysund, Shiprock, St_Barthelemy, St_Johns, St_Kitts, St_Lucia, St_Thomas, St_Vincent, Swift_Current, Tegucigalpa, Thule, Thunder_Bay, Tijuana, Toronto, Tortola, Vancouver, Virgin, Whitehorse, Winnipeg, Yakutat, Yellowknife -_Description: Time zone: - Please select the time zone corresponding to your location. - -Template: tzdata/Zones/Antarctica -Type: select -# Translators: do not translate underscores. You can use spaces instead. -__Choices: Casey, Davis, DumontDUrville, Mawson, McMurdo, Palmer, Rothera, Syowa, Vostok -_Description: Time zone: - Please select the time zone corresponding to your location. - -Template: tzdata/Zones/Australia -Type: select -# Translators: do not translate underscores. You can use spaces instead. -__Choices: Adelaide, Brisbane, Broken_Hill, Canberra, Currie, Darwin, Eucla, Hobart, Lindeman, Lord_Howe, Melbourne, Perth, Sydney, Yancowinna -_Description: Time zone: - Please select the time zone corresponding to your location. - -Template: tzdata/Zones/Arctic -Type: select -# Translators: do not translate underscores. You can use spaces instead. -__Choices: Longyearbyen -_Description: Time zone: - Please select the time zone corresponding to your location. - -Template: tzdata/Zones/Asia -Type: select -# Translators: do not translate underscores. You can use spaces instead. -__Choices: Aden, Almaty, Amman, Anadyr, Aqtau, Aqtobe, Ashgabat, Baghdad, Bahrain, Baku, Bangkok, Beirut, Bishkek, Brunei, Choibalsan, Chongqing, Colombo, Damascus, Dhaka, Dili, Dubai, Dushanbe, Gaza, Harbin, Ho_Chi_Minh, Hong_Kong, Hovd, Irkutsk, Istanbul, Jakarta, Jayapura, Jerusalem, Kabul, Kamchatka, Karachi, Kashgar, Kathmandu, Kolkata, Krasnoyarsk, Kuala_Lumpur, Kuching, Kuwait, Macau, Magadan, Makassar, Manila, Muscat, Nicosia, Novosibirsk, Omsk, Oral, Phnom_Penh, Pontianak, Pyongyang, Qatar, Qyzylorda, Rangoon, Riyadh, Riyadh87, Riyadh88, Riyadh89, Sakhalin, Samarkand, Seoul, Shanghai, Singapore, Taipei, Tashkent, Tbilisi, Tehran, Tel_Aviv, Thimphu, Tokyo, Ujung_Pandang, Ulaanbaatar, Urumqi, Vientiane, Vladivostok, Yakutsk, Yekaterinburg, Yerevan -_Description: Time zone: - Please select the time zone corresponding to your location. - -Template: tzdata/Zones/Atlantic -Type: select -# Translators: do not translate underscores. You can use spaces instead. -__Choices: Azores, Bermuda, Canary, Cape_Verde, Faroe, Jan_Mayen, Madeira, Reykjavik, South_Georgia, St_Helena, Stanley -_Description: Time zone: - Please select the time zone corresponding to your location. - -Template: tzdata/Zones/Europe -Type: select -# Translators: do not translate underscores. You can use spaces instead. -__Choices: Amsterdam, Andorra, Athens, Belfast, Belgrade, Berlin, Bratislava, Brussels, Bucharest, Budapest, Chisinau, Copenhagen, Dublin, Gibraltar, Guernsey, Helsinki, Isle_of_Man, Istanbul, Jersey, Kaliningrad, Kiev, Lisbon, Ljubljana, London, Luxembourg, Madrid, Malta, Mariehamn, Minsk, Monaco, Moscow, Nicosia, Oslo, Paris, Podgorica, Prague, Riga, Rome, Samara, San_Marino, Sarajevo, Simferopol, Skopje, Sofia, Stockholm, Tallinn, Tirane, Tiraspol, Uzhgorod, Vaduz, Vatican, Vienna, Vilnius, Volgograd, Warsaw, Zagreb, Zaporozhye, Zurich -_Description: Time zone: - Please select the time zone corresponding to your location. - -Template: tzdata/Zones/Indian -Type: select -# Translators: do not translate underscores. You can use spaces instead. -__Choices: Antananarivo, Chagos, Christmas, Cocos, Comoro, Kerguelen, Mahe, Maldives, Mauritius, Mayotte, Reunion -_Description: Time zone: - Please select the time zone corresponding to your location. - -Template: tzdata/Zones/Pacific -Type: select -# Translators: do not translate underscores. You can use spaces instead. -__Choices: Apia, Auckland, Chatham, Easter, Efate, Enderbury, Fakaofo, Fiji, Funafuti, Galapagos, Gambier, Guadalcanal, Guam, Honolulu, Johnston, Kiritimati, Kosrae, Kwajalein, Majuro, Marquesas, Midway, Nauru, Niue, Norfolk, Noumea, Pago_Pago, Palau, Pitcairn, Ponape, Port_Moresby, Rarotonga, Saipan, Samoa, Tahiti, Tarawa, Tongatapu, Truk, Wake, Wallis, Yap -_Description: Time zone: - Please select the time zone corresponding to your location. - -Template: tzdata/Zones/SystemV -Type: select -# Translators: do not translate underscores. You can use spaces instead. -Choices: AST4, AST4ADT, CST6, CST6CDT, EST5, EST5EDT, HST10, MST7, MST7MDT, PST8, PST8PDT, YST9, YST9YDT -_Description: Time zone: - Please select the time zone corresponding to your location. - -Template: tzdata/Zones/Etc -Type: select -# Translators: do not translate underscores. You can use spaces instead. -Choices: GMT, GMT+0, GMT+1, GMT+10, GMT+11, GMT+12, GMT+2, GMT+3, GMT+4, GMT+5, GMT+6, GMT+7, GMT+8, GMT+9, GMT-0, GMT-1, GMT-10, GMT-11, GMT-12, GMT-13, GMT-14, GMT-2, GMT-3, GMT-4, GMT-5, GMT-6, GMT-7, GMT-8, GMT-9, GMT0, Greenwich, UCT, UTC, Universal, Zulu -_Description: Time zone: - Please select the time zone corresponding to your location. - Copied: tzdata/trunk/debian/tzdata.config (from rev 4878, tzdata/trunk/debian/config) =================================================================== --- tzdata/trunk/debian/tzdata.config (rev 0) +++ tzdata/trunk/debian/tzdata.config 2011-08-13 13:52:08 UTC (rev 4881) @@ -0,0 +1,423 @@ +#! /bin/sh +set -e + +. /usr/share/debconf/confmodule +db_version 2.0 +db_capb backup + +convert_timezone() +{ + case "$1" in + (right/*|posix/*) + convert_timezone "${1#*/}" + ;; + ("Africa/Asmera") + echo "Africa/Asmara" + ;; + ("America/Argentina/ComodRivadavia"|"America/Catamarca") + echo "America/Argentina/Catamarca" + ;; + ("America/Buenos_Aires") + echo "America/Argentina/Buenos_Aires" + ;; + ("America/Cordoba"|"America/Rosario") + echo "America/Argentina/Cordoba" + ;; + ("America/Jujuy") + echo "America/Argentina/Jujuy" + ;; + ("America/Mendoza") + echo "America/Argentina/Mendoza" + ;; + ("Antarctica/South_Pole") + echo "Antarctica/McMurdo" + ;; + "Asia/Ashkhabad") + echo "Asia/Ashgabat" + ;; + ("Asia/Calcutta") + echo "Asia/Kolkata" + ;; + "Asia/Chungking") + echo "Asia/Chongqing" + ;; + "Asia/Dacca") + echo "Asia/Dhaka" + ;; + ("Asia/Katmandu") + echo "Asia/Kathmandu" + ;; + "Asia/Macao") + echo "Asia/Macau" + ;; + ("Asia/Saigon") + echo "Asia/Ho_Chi_Minh" + ;; + "Asia/Thimbu") + echo "Asia/Thimphu" + ;; + "Asia/Ulan_Bator") + echo "Asia/Ulaanbaatar" + ;; + "Atlantic/Faeroe") + echo "Atlantic/Faroe" + ;; + "Australia/ACT" | "Australia/NSW") + echo "Australia/Sydney" + ;; + "Australia/LHI") + echo "Australia/Lord_Howe" + ;; + "Australia/North") + echo "Australia/Darwin" + ;; + "Australia/Queensland") + echo "Australia/Brisbane" + ;; + "Australia/South") + echo "Australia/Adelaide" + ;; + "Australia/Tasmania") + echo "Australia/Hobart" + ;; + "Australia/Victoria") + echo "Australia/Melbourne" + ;; + "Australia/West") + echo "Australia/Perth" + ;; + "Brazil/Acre") + echo "America/Rio_Branco" + ;; + "Brazil/DeNoronha") + echo "America/Noronha" + ;; + "Brazil/East") + echo "America/Sao_Paulo" + ;; + "Brazil/West") + echo "America/Manaus" + ;; + "Canada/Atlantic") + echo "America/Halifax" + ;; + "Canada/Central") + echo "America/Winnipeg" + ;; + "Canada/East-Saskatchewan") + echo "America/Regina" + ;; + "Canada/Eastern") + echo "America/Toronto" + ;; + "Canada/Mountain") + echo "America/Edmonton" + ;; + "Canada/Newfoundland") + echo "America/St_Johns" + ;; + "Canada/Pacific") + echo "America/Vancouver" + ;; + "Canada/Saskatchewan") + echo "America/Regina" + ;; + "Canada/Yukon") + echo "America/Whitehorse" + ;; + "CET") + echo "Europe/Paris" + ;; + "Chile/Continental") + echo "America/Santiago" + ;; + "Chile/EasterIsland") + echo "Pacific/Easter" + ;; + "CST6CDT") + echo "SystemV/CST6CDT" + ;; + "Cuba") + echo "America/Havana" + ;; + "EET") + echo "Europe/Helsinki" + ;; + "Egypt") + echo "Africa/Cairo" + ;; + "Eire") + echo "Europe/Dublin" + ;; + "EST") + echo "SystemV/EST5" + ;; + "EST5EDT") + echo "SystemV/EST5EDT" + ;; + "GB") + echo "Europe/London" + ;; + "GB-Eire") + echo "Europe/London" + ;; + "GMT") + echo "Etc/GMT" + ;; + "GMT0") + echo "Etc/GMT0" + ;; + "GMT-0") + echo "Etc/GMT-0" + ;; + "GMT+0") + echo "Etc/GMT+0" + ;; + "Greenwich") + echo "Etc/Greenwich" + ;; + "Hongkong") + echo "Asia/Hong_Kong" + ;; + "HST") + echo "Pacific/Honolulu" + ;; + "Iceland") + echo "Atlantic/Reykjavik" + ;; + "Iran") + echo "Asia/Tehran" + ;; + "Israel") + echo "Asia/Tel_Aviv" + ;; + "Jamaica") + echo "America/Jamaica" + ;; + "Japan") + echo "Asia/Tokyo" + ;; + "Kwajalein") + echo "Pacific/Kwajalein" + ;; + "Libya") + echo "Africa/Tripoli" + ;; + "MET") + echo "Europe/Paris" + ;; + "Mexico/BajaNorte") + echo "America/Tijuana" + ;; + "Mexico/BajaSur") + echo "America/Mazatlan" + ;; + "Mexico/General") + echo "America/Mexico_City" + ;; + "Mideast/Riyadh87") + echo "Asia/Riyadh87" + ;; + "Mideast/Riyadh88") + echo "Asia/Riyadh88" + ;; + "Mideast/Riyadh89") + echo "Asia/Riyadh89" + ;; + "MST") + echo "SystemV/MST7" + ;; + "MST7MDT") + echo "SystemV/MST7MDT" + ;; + "Navajo") + echo "America/Denver" + ;; + "NZ") + echo "Pacific/Auckland" + ;; + "NZ-CHAT") + echo "Pacific/Chatham" + ;; + "Poland") + echo "Europe/Warsaw" + ;; + "Portugal") + echo "Europe/Lisbon" + ;; + "PRC") + echo "Asia/Shanghai" + ;; + "PST8PDT") + echo "SystemV/PST8PDT" + ;; + "ROC") + echo "Asia/Taipei" + ;; + "ROK") + echo "Asia/Seoul" + ;; + "Singapore") + echo "Asia/Singapore" + ;; + "Turkey") + echo "Europe/Istanbul" + ;; + "UCT") + echo "Etc/UCT" + ;; + "Universal") + echo "Etc/UTC" + ;; + "US/Alaska") + echo "America/Anchorage" + ;; + "US/Aleutian") + echo "America/Adak" + ;; + "US/Arizona") + echo "America/Phoenix" + ;; + "US/Central") + echo "America/Chicago" + ;; + "US/East-Indiana") + echo "America/Indianapolis" + ;; + "US/Eastern") + echo "America/New_York" + ;; + "US/Hawaii") + echo "Pacific/Honolulu" + ;; + "US/Indiana-Starke") + echo "America/Indianapolis" + ;; + "US/Michigan") + echo "America/Detroit" + ;; + "US/Mountain") + echo "America/Denver" + ;; + "US/Pacific") + echo "America/Los_Angeles" + ;; + "US/Samoa") + echo "Pacific/Pago_Pago" + ;; + "UTC") + echo "Etc/UTC" + ;; + "WET") + echo "Europe/Lisbon" + ;; + "W-SU") + echo "Europe/Moscow" + ;; + "Zulu") + echo "Etc/UTC" + ;; + *) + echo "$1" + ;; + esac +} + +# If /etc/localtime is a link, update /etc/timezone +if [ -L /etc/localtime ] ; then + TIMEZONE="$(readlink /etc/localtime)" + TIMEZONE="${TIMEZONE#/usr/share/zoneinfo/}" + if [ -f "/usr/share/zoneinfo/$TIMEZONE" ] ; then + echo ${TIMEZONE} > /etc/timezone + fi +fi + +# Read /etc/timezone +if [ -e /etc/timezone ]; then + TIMEZONE="$(head -n 1 /etc/timezone)" + TIMEZONE="${TIMEZONE%% *}" + TIMEZONE="${TIMEZONE##/}" + TIMEZONE="${TIMEZONE%%/}" + TIMEZONE="$(convert_timezone $TIMEZONE)" + if [ -f "/usr/share/zoneinfo/$TIMEZONE" ] ; then + AREA="${TIMEZONE%%/*}" + ZONE="${TIMEZONE#*/}" + else + rm -f /etc/timezone + fi +fi + +# The timezone is already configured +if [ -e /etc/timezone ] && [ -e /etc/localtime ] ; then + # Don't ask the user, except if he/she explicitely asked that + if [ -z "$DEBCONF_RECONFIGURE" ] ; then + db_fset tzdata/Areas seen true + db_fset tzdata/Zones/$AREA seen true + fi +# The timezone has never been configured or is falsely configured +elif ! [ -e /etc/localtime ] || [ -n "$DEBCONF_RECONFIGURE" ] ; then + if [ -z "$AREA" ] || [ -z "$ZONE" ] ; then + RET="" + db_get tzdata/Areas || true + if [ -n "$RET" ] ; then + AREA=$RET + else + AREA="Etc" + fi + + RET="" + db_get tzdata/Zones/$AREA || RET=true + if [ -n "$RET" ] ; then + ZONE=$RET + else + ZONE="UTC" + fi + + echo "$AREA/$ZONE" > /etc/timezone + fi + db_fset tzdata/Areas seen false + db_fset tzdata/Zones/$AREA seen false +# The user want to handle the timezone by him/herself +else + exit 0 +fi + +# Initializes debconf default values from the ones found in +# configuration files +db_set tzdata/Areas "$AREA" +db_set tzdata/Zones/$AREA "$ZONE" + +STATE=1 +while [ "$STATE" -ge 0 ]; do + case "$STATE" in + 0) + # The user has cancel the timezone change, reset the debconf + # values to the initial one. + db_set tzdata/Areas "$AREA" + db_set tzdata/Zones/$AREA "$ZONE" + break + ;; + 1) + # Ask the user of the Area + db_input high tzdata/Areas || true + ;; + 2) + # Ask the user of the Zone + db_get tzdata/Areas || RET=Etc + db_input high tzdata/Zones/$RET || true + ;; + *) + break + ;; + esac + if db_go; then + STATE=$(($STATE + 1)) + else + STATE=$(($STATE - 1)) + fi +done + +#DEBHELPER# + + +exit 0 Copied: tzdata/trunk/debian/tzdata.install (from rev 4878, tzdata/trunk/debian/install) =================================================================== --- tzdata/trunk/debian/tzdata.install (rev 0) +++ tzdata/trunk/debian/tzdata.install 2011-08-13 13:52:08 UTC (rev 4881) @@ -0,0 +1,4 @@ +debian/tzconfig /usr/sbin +tzgen/* usr/share/zoneinfo/ +iso3166.tab usr/share/zoneinfo/ +zone.tab usr/share/zoneinfo/ Copied: tzdata/trunk/debian/tzdata.links (from rev 4878, tzdata/trunk/debian/links) =================================================================== --- tzdata/trunk/debian/tzdata.links (rev 0) +++ tzdata/trunk/debian/tzdata.links 2011-08-13 13:52:08 UTC (rev 4881) @@ -0,0 +1 @@ +etc/localtime usr/share/zoneinfo/localtime Copied: tzdata/trunk/debian/tzdata.postinst (from rev 4878, tzdata/trunk/debian/postinst) =================================================================== --- tzdata/trunk/debian/tzdata.postinst (rev 0) +++ tzdata/trunk/debian/tzdata.postinst 2011-08-13 13:52:08 UTC (rev 4881) @@ -0,0 +1,52 @@ +#! /bin/sh +set -e + +LC_ALL=C +LANG=C +unset TZ +umask 022 + +. /usr/share/debconf/confmodule +db_version 2.0 + +if [ "$1" = configure ]; then + # If the user prefers to manage the time zone by itself, let him doing that. + + if ! [ -e /etc/timezone ] && [ -z "$DEBCONF_RECONFIGURE" ] ; then + db_stop + echo + echo "User defined time zone, leaving /etc/localtime unchanged." + else + + # Get the values from debconf + AREA=Etc + ZONE=UTC + db_get tzdata/Areas && AREA="$RET" + db_get tzdata/Zones/$AREA && ZONE="$RET" + db_stop + + # Update the time zone + echo $AREA/$ZONE > /etc/timezone + cp -f /usr/share/zoneinfo/$AREA/$ZONE /etc/localtime.dpkg-new && \ + mv -f /etc/localtime.dpkg-new /etc/localtime + which restorecon >/dev/null 2>&1 && restorecon /etc/localtime + + echo + echo "Current default time zone: '$AREA/$ZONE'" + fi + + # Show the new setting to the user + TZBase=$(LC_ALL=C TZ=UTC0 date) + UTdate=$(LC_ALL=C TZ=UTC0 date -d "$TZBase") + TZdate=$(unset TZ ; LANG=C date -d "$TZBase") + echo "Local time is now: $TZdate." + echo "Universal Time is now: $UTdate." + if [ -z "$DEBCONF_RECONFIGURE" ] ; then + echo "Run 'dpkg-reconfigure tzdata' if you wish to change it." + fi + echo +fi + +#DEBHELPER# + +exit 0 Copied: tzdata/trunk/debian/tzdata.templates (from rev 4878, tzdata/trunk/debian/templates) =================================================================== --- tzdata/trunk/debian/tzdata.templates (rev 0) +++ tzdata/trunk/debian/tzdata.templates 2011-08-13 13:52:08 UTC (rev 4881) @@ -0,0 +1,97 @@ +Template: tzdata/Areas +Type: select +# Note to translators: +# - "Etc" will present users with a list +# of "GMT+xx" or "GMT-xx" timezones +# - SystemV will give the choice between zone named as per SystemV conventions: +# EST5, MST7, etc. +__Choices: Africa, America, Antarctica, Australia, Arctic, Asia, Atlantic, Europe, Indian, Pacific, SystemV, Etc +_Description: Geographic area: + Please select the geographic area you live in. Subsequent + configuration questions will narrow this down by presenting a list of + cities, representing the time zones in which they are located. + +Template: tzdata/Zones/Africa +Type: select +# Translators: do not translate underscores. You can use spaces instead. +__Choices: Abidjan, Accra, Addis_Ababa, Algiers, Asmara, Bamako, Bangui, Banjul, Bissau, Blantyre, Brazzaville, Bujumbura, Cairo, Casablanca, Ceuta, Conakry, Dakar, Dar_es_Salaam, Djibouti, Douala, El_Aaiun, Freetown, Gaborone, Harare, Johannesburg, Kampala, Khartoum, Kigali, Kinshasa, Lagos, Libreville, Lome, Luanda, Lubumbashi, Lusaka, Malabo, Maputo, Maseru, Mbabane, Mogadishu, Monrovia, Nairobi, Ndjamena, Niamey, Nouakchott, Ouagadougou, Porto-Novo, Sao_Tome, Timbuktu, Tripoli, Tunis, Windhoek +_Description: Time zone: + Please select the time zone corresponding to your location. + +Template: tzdata/Zones/America +Type: select +# Translators: do not translate underscores. You can use spaces instead. +__Choices: Adak, Anchorage, Anguilla, Antigua, Araguaina, Argentina/Buenos_Aires, Argentina/Catamarca, Argentina/Cordoba, Argentina/Jujuy, Argentina/La_Rioja, Argentina/Mendoza, Argentina/Rio_Gallegos, Argentina/Salta, Argentina/San_Juan, Argentina/San_Luis, Argentina/Tucuman, Argentina/Ushuaia, Aruba, Asuncion, Atikokan, Atka, Bahia, Barbados, Belem, Belize, Blanc-Sablon, Boa_Vista, Bogota, Boise, Cambridge_Bay, Campo_Grande, Cancun, Caracas, Cayenne, Cayman, Chicago, Chihuahua, Coral_Harbour, Costa_Rica, Cuiaba, Curacao, Danmarkshavn, Dawson, Dawson_Creek, Denver, Detroit, Dominica, Edmonton, Eirunepe, El_Salvador, Ensenada, Fortaleza, Glace_Bay, Godthab, Goose_Bay, Grand_Turk, Grenada, Guadeloupe, Guatemala, Guayaquil, Guyana, Halifax, Havana, Hermosillo, Indiana/Indianapolis, Indiana/Knox, Indiana/Marengo, Indiana/Petersburg, Indiana/Tell_City, Indiana/Vevay, Indiana/Vincennes, Indiana/Winamac, Inuvik, Iqaluit, Jamaica, Juneau, Kentucky/Louisville, Kentucky/Monticello, L a_Paz, Lima, Los_Angeles, Maceio, Managua, Manaus, Marigot, Martinique, Mazatlan, Menominee, Merida, Mexico_City, Miquelon, Moncton, Monterrey, Montevideo, Montreal, Montserrat, Nassau, New_York, Nipigon, Nome, Noronha, North_Dakota/Center, North_Dakota/New_Salem, Panama, Pangnirtung, Paramaribo, Phoenix, Port-au-Prince, Port_of_Spain, Porto_Acre, Porto_Velho, Puerto_Rico, Rainy_River, Rankin_Inlet, Recife, Regina, Resolute, Rio_Branco, Santarem, Santiago, Santo_Domingo, Sao_Paulo, Scoresbysund, Shiprock, St_Barthelemy, St_Johns, St_Kitts, St_Lucia, St_Thomas, St_Vincent, Swift_Current, Tegucigalpa, Thule, Thunder_Bay, Tijuana, Toronto, Tortola, Vancouver, Virgin, Whitehorse, Winnipeg, Yakutat, Yellowknife +_Description: Time zone: + Please select the time zone corresponding to your location. + +Template: tzdata/Zones/Antarctica +Type: select +# Translators: do not translate underscores. You can use spaces instead. +__Choices: Casey, Davis, DumontDUrville, Mawson, McMurdo, Palmer, Rothera, Syowa, Vostok +_Description: Time zone: + Please select the time zone corresponding to your location. + +Template: tzdata/Zones/Australia +Type: select +# Translators: do not translate underscores. You can use spaces instead. +__Choices: Adelaide, Brisbane, Broken_Hill, Canberra, Currie, Darwin, Eucla, Hobart, Lindeman, Lord_Howe, Melbourne, Perth, Sydney, Yancowinna +_Description: Time zone: + Please select the time zone corresponding to your location. + +Template: tzdata/Zones/Arctic +Type: select +# Translators: do not translate underscores. You can use spaces instead. +__Choices: Longyearbyen +_Description: Time zone: + Please select the time zone corresponding to your location. + +Template: tzdata/Zones/Asia +Type: select +# Translators: do not translate underscores. You can use spaces instead. +__Choices: Aden, Almaty, Amman, Anadyr, Aqtau, Aqtobe, Ashgabat, Baghdad, Bahrain, Baku, Bangkok, Beirut, Bishkek, Brunei, Choibalsan, Chongqing, Colombo, Damascus, Dhaka, Dili, Dubai, Dushanbe, Gaza, Harbin, Ho_Chi_Minh, Hong_Kong, Hovd, Irkutsk, Istanbul, Jakarta, Jayapura, Jerusalem, Kabul, Kamchatka, Karachi, Kashgar, Kathmandu, Kolkata, Krasnoyarsk, Kuala_Lumpur, Kuching, Kuwait, Macau, Magadan, Makassar, Manila, Muscat, Nicosia, Novosibirsk, Omsk, Oral, Phnom_Penh, Pontianak, Pyongyang, Qatar, Qyzylorda, Rangoon, Riyadh, Riyadh87, Riyadh88, Riyadh89, Sakhalin, Samarkand, Seoul, Shanghai, Singapore, Taipei, Tashkent, Tbilisi, Tehran, Tel_Aviv, Thimphu, Tokyo, Ujung_Pandang, Ulaanbaatar, Urumqi, Vientiane, Vladivostok, Yakutsk, Yekaterinburg, Yerevan +_Description: Time zone: + Please select the time zone corresponding to your location. + +Template: tzdata/Zones/Atlantic +Type: select +# Translators: do not translate underscores. You can use spaces instead. +__Choices: Azores, Bermuda, Canary, Cape_Verde, Faroe, Jan_Mayen, Madeira, Reykjavik, South_Georgia, St_Helena, Stanley +_Description: Time zone: + Please select the time zone corresponding to your location. + +Template: tzdata/Zones/Europe +Type: select +# Translators: do not translate underscores. You can use spaces instead. +__Choices: Amsterdam, Andorra, Athens, Belfast, Belgrade, Berlin, Bratislava, Brussels, Bucharest, Budapest, Chisinau, Copenhagen, Dublin, Gibraltar, Guernsey, Helsinki, Isle_of_Man, Istanbul, Jersey, Kaliningrad, Kiev, Lisbon, Ljubljana, London, Luxembourg, Madrid, Malta, Mariehamn, Minsk, Monaco, Moscow, Nicosia, Oslo, Paris, Podgorica, Prague, Riga, Rome, Samara, San_Marino, Sarajevo, Simferopol, Skopje, Sofia, Stockholm, Tallinn, Tirane, Tiraspol, Uzhgorod, Vaduz, Vatican, Vienna, Vilnius, Volgograd, Warsaw, Zagreb, Zaporozhye, Zurich +_Description: Time zone: + Please select the time zone corresponding to your location. + +Template: tzdata/Zones/Indian +Type: select +# Translators: do not translate underscores. You can use spaces instead. +__Choices: Antananarivo, Chagos, Christmas, Cocos, Comoro, Kerguelen, Mahe, Maldives, Mauritius, Mayotte, Reunion +_Description: Time zone: + Please select the time zone corresponding to your location. + +Template: tzdata/Zones/Pacific +Type: select +# Translators: do not translate underscores. You can use spaces instead. +__Choices: Apia, Auckland, Chatham, Easter, Efate, Enderbury, Fakaofo, Fiji, Funafuti, Galapagos, Gambier, Guadalcanal, Guam, Honolulu, Johnston, Kiritimati, Kosrae, Kwajalein, Majuro, Marquesas, Midway, Nauru, Niue, Norfolk, Noumea, Pago_Pago, Palau, Pitcairn, Ponape, Port_Moresby, Rarotonga, Saipan, Samoa, Tahiti, Tarawa, Tongatapu, Truk, Wake, Wallis, Yap +_Description: Time zone: + Please select the time zone corresponding to your location. + +Template: tzdata/Zones/SystemV +Type: select +# Translators: do not translate underscores. You can use spaces instead. +Choices: AST4, AST4ADT, CST6, CST6CDT, EST5, EST5EDT, HST10, MST7, MST7MDT, PST8, PST8PDT, YST9, YST9YDT +_Description: Time zone: + Please select the time zone corresponding to your location. + +Template: tzdata/Zones/Etc +Type: select +# Translators: do not translate underscores. You can use spaces instead. +Choices: GMT, GMT+0, GMT+1, GMT+10, GMT+11, GMT+12, GMT+2, GMT+3, GMT+4, GMT+5, GMT+6, GMT+7, GMT+8, GMT+9, GMT-0, GMT-1, GMT-10, GMT-11, GMT-12, GMT-13, GMT-14, GMT-2, GMT-3, GMT-4, GMT-5, GMT-6, GMT-7, GMT-8, GMT-9, GMT0, Greenwich, UCT, UTC, Universal, Zulu +_Description: Time zone: + Please select the time zone corresponding to your location. + -- To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1qsede-0000bn...@vasks.debian.org