From 5a0b061749df67e01356ec289ae9dd50700102e1 Mon Sep 17 00:00:00 2001
From: Thibault Cohen <thibault.cohen@savoirfairelinux.com>
Date: Thu, 23 Apr 2015 11:37:13 -0400
Subject: [PATCH] packaging: fix get orig source
Refs #71506
Change-Id: I3dc4a5576ab7da137b7ec41c7f275827efc561af
---
debian/rules | 4 ++--
ring-daemon.spec | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/debian/rules b/debian/rules
index f54aec4beb..d675d8ccf0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ VER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m
DISTRIB_ID = $(shell grep -hPo "^ID=\K.*" /etc/*ease)
DISTRIB_VERSION_ID = $(shell grep -hPo "^VERSION_ID=\K.*" /etc/*ease)
-DAEMON_TAG = master
+DAEMON_TAG = origin/master
# Uncomment this to turn on verbose mode.
export DH_VERBOSE=1
@@ -53,7 +53,7 @@ get-orig-source:
git init
git remote add origin https://gerrit-ring.savoirfairelinux.com/ring-daemon
git fetch --all
- git checkout packaging-releases -f
+ git checkout packaging -f
git config user.name "joulupukki"
git config user.email "joulupukki@localhost"
git merge $(DAEMON_TAG) --no-edit
diff --git a/ring-daemon.spec b/ring-daemon.spec
index 3e4aa8e680..10c7631eac 100644
--- a/ring-daemon.spec
+++ b/ring-daemon.spec
@@ -1,7 +1,7 @@
%define name ring-daemon
%define version 2.1.0
%define release 1
-%define daemon_tag master
+%define daemon_tag origin/master
Name: %{name}
Version: %{version}
@@ -43,7 +43,7 @@ This is the ring repository
git init
git remote add origin https://gerrit-ring.savoirfairelinux.com/ring-daemon
git fetch --all
-git checkout packaging-releases -f
+git checkout packaging -f
git config user.name "joulupukki"
git config user.email "joulupukki@localhost"
git merge %{daemon_tag} --no-edit
--
GitLab