Adapt packaging for release

Change-Id: I7d4e41a8f538ebe7546f6e95f4789f68a9acbf96

debian/gbp.conf

 [DEFAULT]
 pristine-tar = False
-upstream-branch = master
+upstream-branch = release-2.1.x
 
 [git-buildpackage]
 export-dir = ../build-area/

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 \

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