LINARO: use debian.linaro instead of debian.master

Signed-off-by: John Rigby <john.rigby@linaro.org>

8 files changed, 9 insertions, 9 deletions

diff --git a/debian/commit-templates/newrelease b/debian/commit-templates/newrelease
index 5f8931c40cd..9f3d99e251d 100644
--- a/debian/commit-templates/newrelease
+++ b/debian/commit-templates/newrelease
@@ -1,3 +1,3 @@
-UBUNTU: Start new release
+LINARO: Start new release
 
 Ignore: yes
diff --git a/debian/debian.env b/debian/debian.env
index be31a0c2701..3b58772a143 100644
--- a/debian/debian.env
+++ b/debian/debian.env
@@ -1 +1 @@
-DEBIAN=debian.master
+DEBIAN=debian.linaro
diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk
index 17eed6a2571..5fc139b9629 100644
--- a/debian/rules.d/0-common-vars.mk
+++ b/debian/rules.d/0-common-vars.mk
@@ -120,7 +120,7 @@ abidir		:= $(CURDIR)/$(DEBIAN)/abi/$(release)-$(revision)/$(arch)
 prev_abidir	:= $(CURDIR)/$(DEBIAN)/abi/$(release)-$(prev_revision)/$(arch)
 commonconfdir	:= $(CURDIR)/$(DEBIAN)/config
 archconfdir	:= $(CURDIR)/$(DEBIAN)/config/$(arch)
-sharedconfdir	:= $(CURDIR)/debian.master/config
+sharedconfdir	:= $(CURDIR)/debian.linaro/config
 builddir	:= $(CURDIR)/debian/build
 stampdir	:= $(CURDIR)/debian/stamps
 
diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk
index 975cd79de9e..6ed6c147618 100644
--- a/debian/rules.d/1-maintainer.mk
+++ b/debian/rules.d/1-maintainer.mk
@@ -91,7 +91,7 @@ printenv:
 prev_release="$(release)-$(prev_revision)"
 printchanges:
 	@baseCommit=$$(git log --pretty=format:'%H %s' | \
-		awk '/UBUNTU: '".*Ubuntu-$(prev_release)"'$$/ { print $$1; exit }'); \
+		awk '/LINARO: '".*Linaro-$(release)-$(prev_revision)"'$$/ { print $$1; exit }'); \
 		git log "$$baseCommit"..HEAD | \
 		perl -w -f $(DROOT)/scripts/misc/git-ubuntu-log $(ubuntu_log_opts)
 
diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index f285da053a3..0f2688b0e5f 100644
--- a/debian/rules.d/2-binary-arch.mk
+++ b/debian/rules.d/2-binary-arch.mk
@@ -22,8 +22,8 @@ $(stampdir)/stamp-prepare-tree-%: $(commonconfdir)/config.common.$(family) $(arc
 	install -d $(builddir)/build-$*
 	touch $(builddir)/build-$*/ubuntu-build
 	[ "$(do_full_source)" != 'true' ] && true || \
-		rsync -a --exclude debian --exclude debian.master --exclude $(DEBIAN) * $(builddir)/build-$*
-	cat $^ | sed -e 's/.*CONFIG_VERSION_SIGNATURE.*/CONFIG_VERSION_SIGNATURE="Ubuntu $(release)-$(revision)-$* $(raw_kernelversion)"/' > $(builddir)/build-$*/.config
+		rsync -a --exclude debian --exclude debian.master --exclude debian.linaro --exclude $(DEBIAN) * $(builddir)/build-$*
+	cat $^ | sed -e 's/.*CONFIG_VERSION_SIGNATURE.*/CONFIG_VERSION_SIGNATURE="Ubuntu $(release)-$(revision)-$* $(release)$(extraversion)"/' > $(builddir)/build-$*/.config
 	find $(builddir)/build-$* -name "*.ko" | xargs rm -f
 	$(build_cd) $(kmake) $(build_O) -j1 silentoldconfig prepare scripts
 	touch $@
diff --git a/debian/scripts/misc/insert-changes.pl b/debian/scripts/misc/insert-changes.pl
index c820597a9fc..1c18234727f 100755
--- a/debian/scripts/misc/insert-changes.pl
+++ b/debian/scripts/misc/insert-changes.pl
@@ -4,7 +4,7 @@ my $debian;
 $droot = $ARGV[0] if (defined $ARGV[0]);
 $droot = 'debian' if (!defined $droot);
 $debian = $ARGV[1] if (defined $ARGV[1]);
-$debian = 'debian.master' if (!defined $debian);
+$debian = 'debian.linaro' if (!defined $debian);
 
 system("make -s -f $droot/rules printchanges > $debian/changes");
 
diff --git a/debian/scripts/misc/insert-ubuntu-changes b/debian/scripts/misc/insert-ubuntu-changes
index 9ede7f3950d..61b1faec687 100755
--- a/debian/scripts/misc/insert-ubuntu-changes
+++ b/debian/scripts/misc/insert-ubuntu-changes
@@ -10,7 +10,7 @@ $start =~ s/.*\.//;
 
 my @changes = ();
 my $output = 0;
-open(CHG, "<debian.master/changelog") ||
+open(CHG, "<debian.linaro/changelog") ||
 	open(CHG, "<debian/changelog") ||
 	die "$0: debian/changelog: open failed - $!\n";
 while (<CHG>) {
diff --git a/debian/scripts/misc/kernelconfig b/debian/scripts/misc/kernelconfig
index 310d1f8951f..48f84a5c96c 100755
--- a/debian/scripts/misc/kernelconfig
+++ b/debian/scripts/misc/kernelconfig
@@ -24,7 +24,7 @@ case "$mode" in
 esac
 kerneldir="`pwd`"
 confdir="$kerneldir/${DEBIAN}/config"
-sharedconfdir="$kerneldir/debian.master/config"
+sharedconfdir="$kerneldir/debian.linaro/config"
 variant="$2"
 
 . $DEBIAN/etc/kernelconfig