This is an automated email from the git hooks/post-receive script.

aurel32 pushed a commit to branch sid
in repository tzdata.

commit c51c8da48ae47c6d76d075d5e07a4ed1344b79c4
Author: Aurelien Jarno <[email protected]>
Date:   Tue Feb 2 12:30:17 2016 +0100

    debian/rules: remove emdebian ifdefs.
---
 debian/changelog | 6 ++++++
 debian/rules     | 7 -------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3364d1b..ba2dfc7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tzdata (2016a-2) UNRELEASED; urgency=medium
+
+  * debian/rules: remove emdebian ifdefs.
+
+ -- Aurelien Jarno <[email protected]>  Tue, 02 Feb 2016 12:29:58 +0100
+
 tzdata (2016a-1) unstable; urgency=medium
 
   [ Aurelien Jarno ]
diff --git a/debian/rules b/debian/rules
index 0cc039d..df075e1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,6 @@ TZGEN := $(CURDIR)/tzgen
 TZGEN_JAVA := $(CURDIR)/tzgen-java
 
 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/default-java/
 
@@ -55,15 +54,9 @@ build-indep-stamp:
        # Build the "default" version
        for zone in $(TIMEZONES); do \
          /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 yearistype.sh 
$${zone} ; \
          /usr/sbin/zic -d $(TZGEN)/right -L leapseconds -y 
$(TZGEN)/yearistype.sh $${zone} ; \
        done
-endif
 
        # Generate a posixrules file
        /usr/sbin/zic -d $(TZGEN) -p America/New_York

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-glibc/tzdata.git

Reply via email to