[Pkg-chromium-commit] [pkg-chromium] 06/10: use source package name for get-orig-source rule

[Michael Gilbert]

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

mgilbert pushed a commit to branch master
in repository pkg-chromium.

commit ff15f3ee127f1a173a9a23f7076221b82537330f
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sat Aug 24 14:06:09 2013 -0400

    use source package name for get-orig-source rule
---
 debian/rules |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/rules b/debian/rules
index efbab99..8f3dd70 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,7 @@
 export DH_VERBOSE = 1
 
 DEBIAN_NAME		:= chromium
+SOURCE_NAME		:= chromium-browser
 DEBIAN_VERSION		:= $(shell dpkg-parsechangelog | sed -n 's/^Version: *\(.*\)$$/\1/ p')
 DEBIAN_UPSTREAM_VERSION	:= $(shell echo $(DEBIAN_VERSION) | sed 's/^\(.*\)-[^-]*$$/\1/')
 DEBIAN_REVISION		:= $(shell echo $(DEBIAN_VERSION) | sed 's/^.*r\([^-]*\)-.*/\1/')
@@ -830,9 +831,9 @@ gos-pack:
 	# Pack
 	if [ src != $(DEB_TAR_SRCDIR) ] ; then mv $(TMP_DIR)/src $(TMP_DIR)/$(DEB_TAR_SRCDIR) ; fi
 	mv $(TMP_DIR)/tools/depot_tools $(TMP_DIR)/$(DEB_TAR_SRCDIR)/depot_tools
-	mkdir $(TMP_DIR)/$(DEBIAN_NAME)-$(VERSION)
-	mv $(TMP_DIR)/$(DEB_TAR_SRCDIR) $(TMP_DIR)/$(DEBIAN_NAME)-$(VERSION)/
-	cd $(TMP_DIR) && tar -c $(TAR_FLAGS) -f ../$(DEBIAN_NAME)_$(VERSION).orig.tar.$(TAR_EXT) --exclude=.svn --exclude=.git $(DEBIAN_NAME)-$(VERSION)
+	mkdir $(TMP_DIR)/$(SOURCE_NAME)-$(VERSION)
+	mv $(TMP_DIR)/$(DEB_TAR_SRCDIR) $(TMP_DIR)/$(SOURCE_NAME)-$(VERSION)/
+	cd $(TMP_DIR) && tar -c $(TAR_FLAGS) -f ../$(SOURCE_NAME)_$(VERSION).orig.tar.$(TAR_EXT) --exclude=.svn --exclude=.git $(SOURCE_NAME)-$(VERSION)
 	rm -rf $(TMP_DIR)
-	@echo "# Done (created $(DEBIAN_NAME)_$(VERSION).orig.tar.$(TAR_EXT))"
-	@ls -l $(DEBIAN_NAME)_$(VERSION).orig.tar.$(TAR_EXT)
+	@echo "# Done (created $(SOURCE_NAME)_$(VERSION).orig.tar.$(TAR_EXT))"
+	@ls -l $(SOURCE_NAME)_$(VERSION).orig.tar.$(TAR_EXT)

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