diff options
| -rwxr-xr-x | build | 34 | ||||
| -rw-r--r-- | tzdata-africa.pkg/control | 2 | ||||
| -rw-r--r-- | tzdata-antarctica.pkg/control | 2 | ||||
| -rw-r--r-- | tzdata-asia.pkg/control | 2 | ||||
| -rw-r--r-- | tzdata-australasia.pkg/control | 2 | ||||
| -rw-r--r-- | tzdata-common.pkg/control | 6 | ||||
| -rw-r--r-- | tzdata-etcetera.pkg/control | 2 | ||||
| -rw-r--r-- | tzdata-europe.pkg/control | 2 | ||||
| -rw-r--r-- | tzdata-factory.pkg/control | 2 | ||||
| -rw-r--r-- | tzdata-northamerica.pkg/control | 2 | ||||
| -rw-r--r-- | tzdata-southamerica.pkg/control | 2 | ||||
| -rw-r--r-- | tzdata.pkg/control | 6 | ||||
| -rw-r--r-- | tzdata.pkg/docs (renamed from tzdata-common.pkg/docs) | 0 |
13 files changed, 32 insertions, 32 deletions
@@ -25,24 +25,24 @@ build: touch $@ install: build - # Install tzdata-common files. - mkdir -p tzdata-common.data/usr/share/zoneinfo/Etc + # Install tzdata files. + mkdir -p tzdata.data/usr/share/zoneinfo/Etc mv tzdata-etcetera.data/usr/share/zoneinfo/Etc/UTC \ - tzdata-common.data/usr/share/zoneinfo/Etc - cp src/iso3166.tab src/zone.tab tzdata-common.data/usr/share/zoneinfo - ln -sf Universal tzdata-common.data/usr/share/zoneinfo/posixrules - mkdir -p tzdata-common.data/etc - ln -sf /usr/share/zoneinfo/Universal tzdata-common.data/etc/localtime - ln -sf . tzdata-common.data/usr/share/zoneinfo/posix + tzdata.data/usr/share/zoneinfo/Etc + cp src/iso3166.tab src/zone.tab tzdata.data/usr/share/zoneinfo + ln -sf Universal tzdata.data/usr/share/zoneinfo/posixrules + mkdir -p tzdata.data/etc + ln -sf /usr/share/zoneinfo/Universal tzdata.data/etc/localtime + ln -sf . tzdata.data/usr/share/zoneinfo/posix # Install time zones. - for tt in $(tables); do \ - grep '^Link' src/$${tt} | while read type dest src etc; do \ + for t in $(tables); do \ + grep '^Link' src/$${t} | while read type dest src etc; do \ if [ x"$${dest}" = x'Etc/UTC' ]; then \ - t='common'; \ + p='tzdata'; \ else \ - t="$${tt}"; \ + p="tzdata-$${t}"; \ fi; \ - rm -f "tzdata-$${t}.data/usr/share/zoneinfo/$${src}"; \ + rm -f "$${p}.data/usr/share/zoneinfo/$${src}"; \ link="$${src}" up=''; \ while [ "$${link#*/}" != "$${link}" ] && \ [ "$${link%%/*}" = "$${dest%%/*}" ]; do \ @@ -53,7 +53,7 @@ install: build link="$${link#*/}"; \ up="../$${up}"; \ done; \ - src="tzdata-$${t}.data/usr/share/zoneinfo/$${src}"; \ + src="$${p}.data/usr/share/zoneinfo/$${src}"; \ ln -sf "$${up}$${dest}" "$${src}"; \ done; \ done @@ -61,9 +61,9 @@ install: build # zone data package. grep '^Link' src/backward | while read type dest src etc; do \ if [ x"$${dest}" = x'Etc/UTC' ]; then \ - t='common'; \ + p='tzdata'; \ else \ - t="$$(cd src && grep -l \ + p="tzdata-$$(cd src && grep -l \ "^Zone[ ][ ]*$${dest}[ ].*$$" \ $(tables))"; \ fi; \ @@ -77,7 +77,7 @@ install: build link="$${link#*/}"; \ up="../$${up}"; \ done; \ - src="tzdata-$${t}.data/usr/share/zoneinfo/$${src}"; \ + src="$${p}.data/usr/share/zoneinfo/$${src}"; \ mkdir -p "$${src%/*}"; \ ln -sf "$${up}$${dest}" "$${src}"; \ done diff --git a/tzdata-africa.pkg/control b/tzdata-africa.pkg/control index 4290ac0..6aecd38 100644 --- a/tzdata-africa.pkg/control +++ b/tzdata-africa.pkg/control @@ -1,6 +1,6 @@ Architecture: all Platform: all -Depends: tzdata-common (= ${Binary-Version}) +Depends: tzdata (= ${Binary-Version}) Description: Time zone and daylight saving time data - Africa ${Common-Description} . diff --git a/tzdata-antarctica.pkg/control b/tzdata-antarctica.pkg/control index 4117dd8..61dd525 100644 --- a/tzdata-antarctica.pkg/control +++ b/tzdata-antarctica.pkg/control @@ -1,6 +1,6 @@ Architecture: all Platform: all -Depends: tzdata-common (= ${Binary-Version}) +Depends: tzdata (= ${Binary-Version}) Description: Time zone and daylight saving time data - Antarctica ${Common-Description} . diff --git a/tzdata-asia.pkg/control b/tzdata-asia.pkg/control index 7d95dbb..514b226 100644 --- a/tzdata-asia.pkg/control +++ b/tzdata-asia.pkg/control @@ -1,6 +1,6 @@ Architecture: all Platform: all -Depends: tzdata-common (= ${Binary-Version}) +Depends: tzdata (= ${Binary-Version}) Description: Time zone and daylight saving time data - Asia ${Common-Description} . diff --git a/tzdata-australasia.pkg/control b/tzdata-australasia.pkg/control index 30daae3..5ce951e 100644 --- a/tzdata-australasia.pkg/control +++ b/tzdata-australasia.pkg/control @@ -1,6 +1,6 @@ Architecture: all Platform: all -Depends: tzdata-common (= ${Binary-Version}) +Depends: tzdata (= ${Binary-Version}) Description: Time zone and daylight saving time data - Australasia ${Common-Description} . diff --git a/tzdata-common.pkg/control b/tzdata-common.pkg/control deleted file mode 100644 index 244f39c..0000000 --- a/tzdata-common.pkg/control +++ /dev/null @@ -1,6 +0,0 @@ -Architecture: all -Platform: all -Description: Time zone and daylight saving time data - common files - ${Common-Description} - . - This package provides common time zone tables and links. diff --git a/tzdata-etcetera.pkg/control b/tzdata-etcetera.pkg/control index b69b59a..08a9892 100644 --- a/tzdata-etcetera.pkg/control +++ b/tzdata-etcetera.pkg/control @@ -1,6 +1,6 @@ Architecture: all Platform: all -Depends: tzdata-common (= ${Binary-Version}) +Depends: tzdata (= ${Binary-Version}) Description: Time zone and daylight saving time data - generic ${Common-Description} . diff --git a/tzdata-europe.pkg/control b/tzdata-europe.pkg/control index dcdd6cd..f841e04 100644 --- a/tzdata-europe.pkg/control +++ b/tzdata-europe.pkg/control @@ -1,6 +1,6 @@ Architecture: all Platform: all -Depends: tzdata-common (= ${Binary-Version}) +Depends: tzdata (= ${Binary-Version}) Description: Time zone and daylight saving time data - Europe ${Common-Description} . diff --git a/tzdata-factory.pkg/control b/tzdata-factory.pkg/control index 3f572f2..9c6c7ce 100644 --- a/tzdata-factory.pkg/control +++ b/tzdata-factory.pkg/control @@ -1,6 +1,6 @@ Architecture: all Platform: all -Depends: tzdata-common (= ${Binary-Version}) +Depends: tzdata (= ${Binary-Version}) Description: Time zone and daylight saving time data - factory message ${Common-Description} . diff --git a/tzdata-northamerica.pkg/control b/tzdata-northamerica.pkg/control index 152969a..1cb0760 100644 --- a/tzdata-northamerica.pkg/control +++ b/tzdata-northamerica.pkg/control @@ -1,6 +1,6 @@ Architecture: all Platform: all -Depends: tzdata-common (= ${Binary-Version}) +Depends: tzdata (= ${Binary-Version}) Description: Time zone and daylight saving time data - North America ${Common-Description} . diff --git a/tzdata-southamerica.pkg/control b/tzdata-southamerica.pkg/control index c2e99f4..09ecc9a 100644 --- a/tzdata-southamerica.pkg/control +++ b/tzdata-southamerica.pkg/control @@ -1,6 +1,6 @@ Architecture: all Platform: all -Depends: tzdata-common (= ${Binary-Version}) +Depends: tzdata (= ${Binary-Version}) Description: Time zone and daylight saving time data - South America ${Common-Description} . diff --git a/tzdata.pkg/control b/tzdata.pkg/control new file mode 100644 index 0000000..af9e234 --- /dev/null +++ b/tzdata.pkg/control @@ -0,0 +1,6 @@ +Architecture: all +Platform: all +Description: Time zone and daylight saving time data - base files + ${Common-Description} + . + This package provides basic time zone and daylight saving time data. diff --git a/tzdata-common.pkg/docs b/tzdata.pkg/docs index e69de29..e69de29 100644 --- a/tzdata-common.pkg/docs +++ b/tzdata.pkg/docs |