r3883 - in tzdata/trunk/debian: . patches
Author: schizo
Date: 2009-10-19 16:24:44 +0000 (Mon, 19 Oct 2009)
New Revision: 3883
Modified:
tzdata/trunk/debian/changelog
tzdata/trunk/debian/install
tzdata/trunk/debian/patches/quiltrc
tzdata/trunk/debian/rules
Log:
2009o-1
Modified: tzdata/trunk/debian/changelog
===================================================================
--- tzdata/trunk/debian/changelog 2009-10-19 14:32:29 UTC (rev 3882)
+++ tzdata/trunk/debian/changelog 2009-10-19 16:24:44 UTC (rev 3883)
@@ -1,3 +1,10 @@
+tzdata (2009o-1) unstable; urgency=low
+
+ * New upstream release.
+ * Rework rules to stop using tarball-in-tarball.
+
+ -- Clint Adams <schizo@debian.org> Mon, 19 Oct 2009 09:04:43 -0700
+
tzdata (2009n-2) unstable; urgency=low
[ Christian Perrier ]
Modified: tzdata/trunk/debian/install
===================================================================
--- tzdata/trunk/debian/install 2009-10-19 14:32:29 UTC (rev 3882)
+++ tzdata/trunk/debian/install 2009-10-19 16:24:44 UTC (rev 3883)
@@ -1,4 +1,4 @@
debian/tzconfig /usr/sbin
tzgen/* usr/share/zoneinfo/
-tzsource/iso3166.tab usr/share/zoneinfo/
-tzsource/zone.tab usr/share/zoneinfo/
+iso3166.tab usr/share/zoneinfo/
+zone.tab usr/share/zoneinfo/
Modified: tzdata/trunk/debian/patches/quiltrc
===================================================================
--- tzdata/trunk/debian/patches/quiltrc 2009-10-19 14:32:29 UTC (rev 3882)
+++ tzdata/trunk/debian/patches/quiltrc 2009-10-19 16:24:44 UTC (rev 3883)
@@ -1,2 +1,2 @@
-QUILT_PATCHES="../debian/patches"
+QUILT_PATCHES="debian/patches"
QUILT_NO_DIFF_TIMESTAMPS=0
Modified: tzdata/trunk/debian/rules
===================================================================
--- tzdata/trunk/debian/rules 2009-10-19 14:32:29 UTC (rev 3882)
+++ tzdata/trunk/debian/rules 2009-10-19 16:24:44 UTC (rev 3883)
@@ -6,7 +6,6 @@
TZGEN := $(CURDIR)/tzgen
TZGEN_JAVA := $(CURDIR)/tzgen-java
-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]+')
@@ -50,21 +49,14 @@
US \
Etc
-QUILT := quilt --quiltrc ../debian/patches/quiltrc
+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 \
+ @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."; \
@@ -78,14 +70,14 @@
# Build the "default" version
for zone in $(TIMEZONES); do \
- /usr/sbin/zic -d $(TZGEN) -L /dev/null -y $(TZSOURCE)/yearistype.sh $(TZSOURCE)/$${zone} ; \
+ /usr/sbin/zic -d $(TZGEN) -L /dev/null -y yearistype.sh $${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} ; \
+ /usr/sbin/zic -d $(TZGEN)/posix -L /dev/null -y yearistype.sh $${zone} ; \
+ /usr/sbin/zic -d $(TZGEN)/right -L leapseconds -y $(TZGEN)/yearistype.sh $${zone} ; \
done
endif
@@ -93,8 +85,7 @@
/usr/sbin/zic -d $(TZGEN) -p America/New_York
# Generate a java version
- cd $(TZSOURCE) && \
- $(JHOME)/bin/java -jar $(JHOME)/jre/lib/javazic.jar -V $(VERSION) -d ../tzgen-java $(TIMEZONES) $(TIMEZONES_JAVA)
+ $(JHOME)/bin/java -jar $(JHOME)/jre/lib/javazic.jar -V $(VERSION) -d tzgen-java $(TIMEZONES) $(TIMEZONES_JAVA)
# Generate the templates file
( echo "Template: tzdata/Areas" ; \
@@ -135,15 +126,15 @@
clean:
dh_testdir
dh_testroot
- -rm -rf $(TZSOURCE) $(TZGEN) $(TZGEN_JAVA) .pc
+ -rm -rf $(TZGEN) $(TZGEN_JAVA) .pc
rm -f build-stamp
rm -f patch-log
- dh_clean
+ dh_clean
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_clean -k
# Do nothing
# Build architecture-dependent files here.
Reply to: