diff --git a/debian/changelog b/debian/changelog index ae9165c6c681b2c75e60b9fe51936f69a4e43756..e123cebefe30b02efda429c527aee19ca6a21fcc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ring-daemon (2.1.0-1) unstable; urgency=medium + + [ Thibault Cohen] + * New upstream version + + -- Thibault Cohen <thibault.cohen@savoirfairelinux.com> Tue, 14 Apr 2015 12:40:24 -0400 + ring-daemon (2.0.1-1) unstable; urgency=medium [ Thibault Cohen] diff --git a/debian/gbp.conf b/debian/gbp.conf index 107e00fa1bf970495aefdc625cfdd393ef58ffa4..849c17a142df3761a5895b34eae96af8eb3284fe 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 d7eb2a51e872039140f6b008b86029ee471ee2ab..f54aec4bebe7bfb14d3acd54e5bb15891a06158e 100755 --- a/debian/rules +++ b/debian/rules @@ -8,6 +8,8 @@ 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 + # Uncomment this to turn on verbose mode. export DH_VERBOSE=1 @@ -48,8 +50,14 @@ override_dh_auto_install: get-orig-source: # Daemon + git init + git remote add origin https://gerrit-ring.savoirfairelinux.com/ring-daemon git fetch --all - git merge origin master --no-edit + git checkout packaging-releases -f + git config user.name "joulupukki" + git config user.email "joulupukki@localhost" + git merge $(DAEMON_TAG) --no-edit + rm -rf .git # Packing @echo "# Packing ... " find . | sort \ diff --git a/ring-daemon.spec b/ring-daemon.spec index f270847b9b8e9cc15d68ae2820d58d887076eace..3e4aa8e6808141d06f6230f6cb17ca99fdeb803c 100644 --- a/ring-daemon.spec +++ b/ring-daemon.spec @@ -1,6 +1,7 @@ %define name ring-daemon -%define version 2.0.1 +%define version 2.1.0 %define release 1 +%define daemon_tag master Name: %{name} Version: %{version} @@ -40,12 +41,13 @@ This is the ring repository %prep %setup -q git init -git remote add origin https://gerrit-ring.savoirfairelinux.com/ring +git remote add origin https://gerrit-ring.savoirfairelinux.com/ring-daemon 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 %{daemon_tag} --no-edit +rm -rf .git # Apply all patches for patch_file in $(cat debian/patches/series | grep -v "^#") do @@ -94,5 +96,8 @@ echo 'gpgcheck=0' >> %{buildroot}/%{_sysconfdir}/yum.repo.d/ring-nightly.repo %config %{_sysconfdir}/yum.repo.d/ring-nightly.repo %changelog +* Tue Apr 14 2015 Thibault Cohen <thibault.cohen@savoirfairelinux.com> - 2.1.0-1 +- New upstream version + * Fri Mar 27 2015 Thibault Cohen <thibault.cohen@savoirfairelinux.com> - 2.0.1-1 - New upstream version