r3122 - tzdata/trunk/debian
Author: aurel32
Date: 2008-09-06 16:05:18 +0000 (Sat, 06 Sep 2008)
New Revision: 3122
Modified:
tzdata/trunk/debian/changelog
tzdata/trunk/debian/rules
Log:
* Only build the posix version of the timezone data on emdebian.
* Don't build solar87, solar88 and solar89 on emdebian as they are
useless.
Modified: tzdata/trunk/debian/changelog
===================================================================
--- tzdata/trunk/debian/changelog 2008-09-06 14:58:48 UTC (rev 3121)
+++ tzdata/trunk/debian/changelog 2008-09-06 16:05:18 UTC (rev 3122)
@@ -2,6 +2,9 @@
* Add a README.Debian file explaining the difference between the
"posix" and the "right" versions of the timezone data.
+ * Only build the posix version of the timezone data on emdebian.
+ * Don't build solar87, solar88 and solar89 on emdebian as they are
+ useless.
-- Aurelien Jarno <aurel32@debian.org> Sat, 06 Sep 2008 16:57:41 +0200
Modified: tzdata/trunk/debian/rules
===================================================================
--- tzdata/trunk/debian/rules 2008-09-06 14:58:48 UTC (rev 3121)
+++ tzdata/trunk/debian/rules 2008-09-06 16:05:18 UTC (rev 3122)
@@ -9,6 +9,7 @@
TZSOURCE := $(CURDIR)/tzsource
VERSION := $(shell dpkg-parsechangelog | sed -e '/^Version/!d;s/^Version: //g;s/.*://g;s/-.*//g')
+EMDEBIAN := $(shell dpkg-parsechangelog | egrep '^Version: .*em[0-9]+')
JHOME := /usr/lib/jvm/java-6-openjdk
@@ -21,11 +22,15 @@
southamerica \
etcetera \
factory \
- solar87 \
- solar88 \
- solar89 \
backward \
systemv
+
+ifeq ($(EMDEBIAN),)
+TIMEZONES += solar87 \
+ solar88 \
+ solar89
+endif
+
TIMEZONES_JAVA := gmt \
jdk11_backward
@@ -69,12 +74,18 @@
echo "No patches to apply"; \
fi
- # Build
+ # Build the "default" version
for zone in $(TIMEZONES); do \
/usr/sbin/zic -d $(TZGEN) -L /dev/null -y $(TZSOURCE)/yearistype.sh $(TZSOURCE)/$${zone} ; \
+ done
+
+ # Build the "posix" and "right" versions
+ifeq ($(EMDEBIAN),)
+ for zone in $(TIMEZONES); do \
/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
+endif
# Generate a posixrules file
/usr/sbin/zic -d $(TZGEN) -p America/New_York
@@ -147,7 +158,6 @@
dh_installchangelogs
dh_link
dh_installdocs
- dh_installinfo
dh_compress
dh_fixperms
dh_installdeb
Reply to: