From b9143884abfc998237ec5c00bafd54e12d396c4c Mon Sep 17 00:00:00 2001
From: Thibault Cohen <thibault.cohen@savoirfairelinux.com>
Date: Tue, 14 Apr 2015 12:29:58 -0400
Subject: [PATCH] Adapt packaging for release

Change-Id: I7d4e41a8f538ebe7546f6e95f4789f68a9acbf96
---
 debian/gbp.conf  | 2 +-
 debian/rules     | 2 +-
 ring-daemon.spec | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/gbp.conf b/debian/gbp.conf
index 107e00fa1b..849c17a142 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,6 +1,6 @@
 [DEFAULT]
 pristine-tar = False
-upstream-branch = master
+upstream-branch = release-2.1.x
 
 [git-buildpackage]
 export-dir = ../build-area/
diff --git a/debian/rules b/debian/rules
index d7eb2a51e8..329bddc39f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,7 +49,7 @@ override_dh_auto_install:
 get-orig-source:
 	# Daemon
 	git fetch --all
-	git merge origin master --no-edit
+	git merge origin release-2.1.x --no-edit
 	# Packing
 	@echo "# Packing ... "
 	find . | sort \
diff --git a/ring-daemon.spec b/ring-daemon.spec
index f270847b9b..546c366048 100644
--- a/ring-daemon.spec
+++ b/ring-daemon.spec
@@ -42,10 +42,10 @@ This is the ring repository
 git init
 git remote add origin https://gerrit-ring.savoirfairelinux.com/ring
 git fetch --all
-git checkout packaging -f
+git checkout packaging-releases -f
 git config user.name "joulupukki"
 git config user.email "joulupukki@localhost"
-git merge origin/master --no-edit
+git merge origin/release-2.1.x --no-edit
 # Apply all patches
 for patch_file in $(cat debian/patches/series | grep -v "^#")
 do
-- 
GitLab