[Pkg-isocodes-devel] [SCM] ISO language, territory, currency, script codes and their translations branch, master, updated. 6df49ef35c352ce4a7901e178b52ac225053f5f9

[Tobias Quathamer]

The following commit has been merged in the master branch:
commit 6df49ef35c352ce4a7901e178b52ac225053f5f9
Author: Tobias Quathamer <toddy at debian.org>
Date:   Tue Aug 7 12:01:56 2012 +0200

    Remove alioth username handling from upload target

diff --git a/Makefile.am b/Makefile.am
index c436312..460ca16 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,12 +28,8 @@ sign-release: iso-codes-$(VERSION).tar.xz
 
 .PHONY: upload
 upload:
-	@if [[ "$(ALIOTH_USERNAME)" == "" ]]; then \
-		ALIOTH_USERNAME="$(USERNAME)"; \
-	fi
 	@if [[ -f "iso-codes-$(VERSION).tar.xz" ]] \
-	&& [[ -f "iso-codes-$(VERSION).tar.xz.sig" ]] \
-	&& [[ -n "$(ALIOTH_USERNAME)" ]]; then \
+	&& [[ -f "iso-codes-$(VERSION).tar.xz.sig" ]]; then \
 		scp iso-codes-$(VERSION).tar.* \
-		$(ALIOTH_USERNAME)@alioth.debian.org:/srv/home/groups/pkg-isocodes/htdocs/downloads; \
+		alioth.debian.org:/srv/home/groups/pkg-isocodes/htdocs/downloads; \
 	fi
diff --git a/Makefile.in b/Makefile.in
index 5ff356f..22cdee9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -747,14 +747,10 @@ sign-release: iso-codes-$(VERSION).tar.xz
 
 .PHONY: upload
 upload:
-	@if [[ "$(ALIOTH_USERNAME)" == "" ]]; then \
-		ALIOTH_USERNAME="$(USERNAME)"; \
-	fi
 	@if [[ -f "iso-codes-$(VERSION).tar.xz" ]] \
-	&& [[ -f "iso-codes-$(VERSION).tar.xz.sig" ]] \
-	&& [[ -n "$(ALIOTH_USERNAME)" ]]; then \
+	&& [[ -f "iso-codes-$(VERSION).tar.xz.sig" ]]; then \
 		scp iso-codes-$(VERSION).tar.* \
-		$(ALIOTH_USERNAME)@alioth.debian.org:/srv/home/groups/pkg-isocodes/htdocs/downloads; \
+		alioth.debian.org:/srv/home/groups/pkg-isocodes/htdocs/downloads; \
 	fi
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

-- 
ISO language, territory, currency, script codes and their translations