:: Re: [devuan-dev] [PATCHES] Update o…
Page principale
Supprimer ce message
Répondre à ce message
Auteur: Svante Signell
Date:  
À: Daniel Reurich, devuan developers internal list
Sujet: Re: [devuan-dev] [PATCHES] Update of policykit from 0.105-9+devuan1 to 0.105-18+devuan2.1 for ASCII
On Wed, 2017-12-20 at 08:58 +1300, Daniel Reurich wrote:
> Hi Svante,
>
> remove the line debian-branch=suites/ascii-proposed from gbp.conf and
> instead add the line "ignore-branch = true" instead.  That means you
> don't have to patch gbp.conf when migrating a package between suites.


Thanks Daniel,

Attached is
0001-Simplify-migration-between-suites-by-ignore-branch.patch
replacing
0001-Change-debian-branch-to-suites-ascii-proposed.patchFrom 17a753307ffcaa677f37723904637fed48ef14c4 Mon Sep 17 00:00:00 2001
From: Svante Signell <svante.signell@???>
Date: Tue, 19 Dec 2017 19:16:59 +0100
Subject: [PATCH 1/3] Change debian-branch to suites/ascii-proposed

---
debian/gbp.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/gbp.conf b/debian/gbp.conf
index c31be83..0a4a2f3 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,3 +1,3 @@
[DEFAULT]
pristine-tar = True
-debian-branch = master
+debian-branch = suites/experimental
--
2.11.0


From 76be48d84d8e7477f913cf876bd9fa3f25c00ca5 Mon Sep 17 00:00:00 2001
From: Svante Signell <svante.signell@???>
Date: Tue, 19 Dec 2017 19:24:42 +0100
Subject: [PATCH 2/3] Really change branch in gbp.conf

---
debian/gbp.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/gbp.conf b/debian/gbp.conf
index 0a4a2f3..67441ec 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,3 +1,3 @@
[DEFAULT]
pristine-tar = True
-debian-branch = suites/experimental
+debian-branch = suites/ascii-proposed
--
2.11.0


From 9352e9a3370fab9bd7387c29b6b36a2d988ee559 Mon Sep 17 00:00:00 2001
From: Svante Signell <svante.signell@???>
Date: Wed, 20 Dec 2017 08:49:08 +0100
Subject: [PATCH 3/3] gbp.conf: Simplify migration between suites by
ignore-branch = true.

---
debian/gbp.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/gbp.conf b/debian/gbp.conf
index 67441ec..604cd47 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,3 +1,3 @@
[DEFAULT]
pristine-tar = True
-debian-branch = suites/ascii-proposed
+ignore-branch = true
--
2.11.0