diff --git a/debian/rules b/debian/rules index f54aec4bebe7bfb14d3acd54e5bb15891a06158e..d675d8ccf0fef4f86580926f6fdb315e1e74e324 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 3e4aa8e6808141d06f6230f6cb17ca99fdeb803c..10c7631eacf58ce82770cf6c011ad2157ada8fe0 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