r2151 - in zope2.12/trunk/debian (rules)

[pumazi-guest at users.alioth.debian.org]

    Date: Thursday, December 16, 2010 @ 18:40:49
  Author: pumazi-guest
Revision: 2151

Fixing the source directory name for the get-orig-source target.

Modified:
  zope2.12/trunk/debian/rules

Modified: zope2.12/trunk/debian/rules
===================================================================
--- zope2.12/trunk/debian/rules	2010-12-10 16:09:41 UTC (rev 2150)
+++ zope2.12/trunk/debian/rules	2010-12-16 18:40:49 UTC (rev 2151)
@@ -5,35 +5,35 @@
 # As a special exception, when this file is copied by dh-make into a
 # dh-make output file, you may use that output file without restriction.
 # This special exception was added by Craig Small in version 0.37 of dh-make.
-export DH_VERBOSE=1
 
+##export DH_VERBOSE=1
+
 ZVER:=2.12
 ZOPE:=zope$(ZVER)
 DEBIAN:=$(CURDIR)/debian
 DEB_SATISFIED:=ClientForm:Docutils:mechanize:pip:pytz:transaction:zc.lockfile:ZConfig:zdaemon:ZODB3:zope.authentication:zope.browser:zope.component:zope.configuration:zope.contenttype:zope.copy:zope.event:zope.exceptions:zope.hookable:zope.i18n:zope.i18nmessageid:zope.location:zope.proxy:zope.publisher:zope.schema:zope.security:zope.testbrowser:zope.testing:zope.traversing
+distribution:=$(shell lsb_release -is)
 
+# get-orig-source variables
 ZOPE_INDEX:=http://download.zope.org/Zope2/index/
 SRC_VERSION:=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(\([0-9]\+\):\)\?\(.*\)-.*/\3/p')
+SRC_DIR:=$(ZOPE)-$(SRC_VERSION)
 TARBALL:=$(ZOPE)_$(SRC_VERSION).orig.tar.gz
 
-distribution:=$(shell lsb_release -is)
-
-%:
-	dh $@ 
-
 get-orig-source:
-	export DEBUG=$(DH_VERBOSE)
-	src_dir=$(ZOPE)-$(SRC_VERSION)
-	mkdir $(CURDIR)/$$(src_dir)
-	cd $(CURDIR)/$$(src_dir); \
+	mkdir $(CURDIR)/$(SRC_DIR)
+	cd $(CURDIR)/$(SRC_DIR); \
 	python $(DEBIAN)/build-scripts/fetch.py \
 		--versions-cfg-url=${ZOPE_INDEX}$(SRC_VERSION)/versions.cfg \
-		--index=${ZOPE_INDEX} \
+		--index=${ZOPE_INDEX}$(SRC_VERSION) \
 		--exclude-singles=$(DEB_SATISFIED) \
 		Zope2==$(SRC_VERSION)
-	tar czf $(CURDIR)/../$(TARBALL) $$(src_dir)
-	rm -rf $(CURDIR)/$$(src_dir)
+	tar czf $(CURDIR)/../$(TARBALL) $(SRC_DIR)
+	rm -rf $(CURDIR)/$(SRC_DIR)
 
+%:
+	dh $@ 
+
 override_dh_auto_clean:
 	for f in debian/*.in; do \
 		generated=`echo $$f | sed 's,.in$$,,;s,ZVER,$(ZVER),'`; \