Skip to content

Draft: Backport most recent version from Debian unstable

This MR is about backporting the latest possible version of mobile-broadband-provider-info from Debian based on #2 (closed).

It's targeting byzantium, the modifications are done within the (new) branch pureos/byzantium (that's why the MR it's marked as Draft). The CI setup was also modified so it uses a byzantium environment.

@guido.gunther I'm not sure what other L5 people need to get addressed here for review so please expand if needed. I'm also unsure about adding the discussed modifications from #1 (closed) on top of the current backport. Needs the CI file more adjustments because of main usage of that package within the L5 area?

The following diff shows the delta between the current branch pureos/latest and the lastest tagged upstream Debian version.

git diff  debian/20201225-1 debian
diff --git a/debian/changelog b/debian/changelog
index e0357e6..5e92c70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+mobile-broadband-provider-info (20210805-1~pureos1) byzantium; urgency=medium
+
+  * Merge in 20210805-1 from Debian unstable
+    - No remaining changes left.
+  * d/control: Switch back to debhelper 13
+  * Adjust CI pipeline setup
+    Switch over to a byzantium based test environment.
+
+ -- Carsten Schoenert <carsten.schoenert@puri.sm>  Fri, 03 Dec 2021 07:21:06 +0100
+
+mobile-broadband-provider-info (20210805-1) unstable; urgency=medium
+
+  * New upstream release
+  * Bump Standards-Version to 4.6.0, no changes
+
+ -- Graham Inggs <ginggs@debian.org>  Fri, 24 Sep 2021 19:36:35 +0000
+
+mobile-broadband-provider-info (20201225-1~amber1) amber-phone; urgency=medium
+
+  * Backport to amber-phone
+  * Revert "Switch to debhelper 13"
+
+ -- Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>  Wed, 06 Jan 2021 01:43:23 +0100
+
 mobile-broadband-provider-info (20201225-1) unstable; urgency=medium
 
   [ Debian Janitor ]
@@ -11,6 +35,16 @@ mobile-broadband-provider-info (20201225-1) unstable; urgency=medium
 
  -- Graham Inggs <ginggs@debian.org>  Fri, 25 Dec 2020 20:29:41 +0000
 
+mobile-broadband-provider-info (20190618-4pureos+librem5.1) amber-phone; urgency=medium
+
+  [ Sebastian Krzyszkowiak ]
+  * Add upstream patches that didn't make it yet into a release
+  * Add Purism's CI pipeline
+  * purism-ci: Remove arm64 job
+  * Include the one latest upstream patch as well
+
+ -- Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>  Tue, 20 Oct 2020 16:12:22 +0200
+
 mobile-broadband-provider-info (20190618-3) unstable; urgency=medium
 
   [ Debian Janitor ]
diff --git a/debian/control b/debian/control
index 0185f0a..8073ead 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Graham Inggs <ginggs@debian.org>
 Build-Depends: debhelper-compat (= 13),
                libxml2-utils,
                xsltproc
-Standards-Version: 4.5.1
+Standards-Version: 4.6.0
 Rules-Requires-Root: no
 Homepage: https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband/ServiceProviders
 Vcs-Browser: https://salsa.debian.org/debian/mobile-broadband-provider-info
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..f0ed54d
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,9 @@
+[DEFAULT]
+debian-branch = pureos/byzantium
+debian-tag = pureos/%(version)s
+debian-tag-msg = %(pkg)s v%(version)s
+upstream-tag = upstream/%(version)s
+pristine-tar = True
+
+[tag]
+sign-tags = true
diff --git a/debian/purism-ci.yml b/debian/purism-ci.yml
new file mode 100644
index 0000000..9bb8c3a
--- /dev/null
+++ b/debian/purism-ci.yml
@@ -0,0 +1,7 @@
+include:
+ - 'https://source.puri.sm/Librem5/librem5-ci/raw/master/librem5-pipeline-definitions.yml'
+ - 'https://source.puri.sm/Librem5/librem5-ci/raw/master/librem5-pipeline-byzantium-jobs.yml'
+
+stages:
+ - package
+ - test-package

Merge request reports