[PR PATCH] Mobile broadband provider info update

[PR PATCH] Mobile broadband provider info update

[ulfw2020]

[-- Attachment #1: Type: text/plain, Size: 486 bytes --]

There is a new pull request by ulfw2020 against master on the void-packages repository

https://github.com/ulfw2020/void-packages mobile-broadband-provider-info-update
https://github.com/void-linux/void-packages/pull/27701

Mobile broadband provider info update
adopt

Apologies for closing the earlier pull request, I couldn't figure out for the life of me how to remove the earlier commits.

A patch file from https://github.com/void-linux/void-packages/pull/27701.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mobile-broadband-provider-info-update-27701.patch --]
[-- Type: text/x-diff, Size: 2665 bytes --]

From 13b19251fe60d20c0af456f744f526c5421ce295 Mon Sep 17 00:00:00 2001
From: Ulf <github@uw.anonaddy.com>
Date: Mon, 4 Jan 2021 12:57:03 +0000
Subject: [PATCH 1/2] rooster: update to 2.8.6.

---
 srcpkgs/rooster/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/rooster/template b/srcpkgs/rooster/template
index b9df272d985..76a1738601c 100644
--- a/srcpkgs/rooster/template
+++ b/srcpkgs/rooster/template
@@ -1,16 +1,16 @@
 # Template file for 'rooster'
 pkgname=rooster
-version=2.8.5
-revision=2
+version=2.8.6
+revision=1
 build_style=cargo
 hostmakedepends="pkg-config python3"
 makedepends="libX11-devel libXmu-devel libressl-devel libsodium-devel"
 short_desc="Simple password manager for geeks"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Ulf <void@uw.anonaddy.com>"
 license="Apache-2.0"
 homepage="https://github.com/conradkdotcom/rooster"
 distfiles="https://github.com/conradkdotcom/rooster/archive/v${version}.tar.gz"
-checksum=c2b83603083e30423c1637949608b957b265a0b2a93eceff4e72109a852e68c2
+checksum=b05d2c368ac26d96edd058130bfc7cc7a1960a5bfbc63b6ddfad62d27b08d62f
 
 pre_build() {
 	cargo update --package openssl-sys --precise 0.9.58

From 45a8555812f0c80bc0027c0cfb9da988af3138a2 Mon Sep 17 00:00:00 2001
From: Ulf <github@uw.anonaddy.com>
Date: Tue, 5 Jan 2021 19:30:51 +0000
Subject: [PATCH 2/2] mobile-broadband-provider-info: update to 20201225.

---
 srcpkgs/mobile-broadband-provider-info/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/mobile-broadband-provider-info/template b/srcpkgs/mobile-broadband-provider-info/template
index 39b7fe007e3..52252eb1f3b 100644
--- a/srcpkgs/mobile-broadband-provider-info/template
+++ b/srcpkgs/mobile-broadband-provider-info/template
@@ -1,16 +1,16 @@
 # Template file for 'mobile-broadband-provider-info'
 pkgname=mobile-broadband-provider-info
-version=20190618
-revision=2
+version=20201225
+revision=1
 build_style=gnu-configure
 hostmakedepends="automake libxslt"
 checkdepends="libxml2"
 short_desc="Database of mobile broadband service providers"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Ulf <ulf@uw.anonaddy.com>"
 license="custom:Creative Commons Public Domain"
 homepage="https://gitlab.gnome.org/GNOME/mobile-broadband-provider-info/"
 distfiles="https://gitlab.gnome.org/GNOME/mobile-broadband-provider-info/-/archive/${version}/mobile-broadband-provider-info-${version}.tar.bz2"
-checksum=d0cb1648e7d21c6bd899ab6be0e7963a69521296b43b8b191c9edaf243bf3748
+checksum=0616b3d0580575741d4319ac71ca67c9a378879943d32a67ac0460615767bcdf
 
 pre_configure() {
 	autoreconf -fi

Re: mobile-broadband-provider-info: update to 20201225.

[mobinmob]

[-- Attachment #1: Type: text/plain, Size: 221 bytes --]

New comment by mobinmob on void-packages repository

https://github.com/void-linux/void-packages/pull/27701#issuecomment-762269855

Comment:
The license should probably be CC-PDDC:
https://spdx.org/licenses/CC-PDDC.html

Re: [PR PATCH] [Closed]: mobile-broadband-provider-info: update to 20201225.

[ulfw2020]

[-- Attachment #1: Type: text/plain, Size: 323 bytes --]

There's a closed pull request on the void-packages repository

mobile-broadband-provider-info: update to 20201225.
https://github.com/void-linux/void-packages/pull/27701

Description:
adopt

Apologies for closing the earlier pull request, I can't figure out for the life of me how to remove the rooster commit from here.

Re: mobile-broadband-provider-info: update to 20201225.

[ulfw2020]

[-- Attachment #1: Type: text/plain, Size: 473 bytes --]

New comment by ulfw2020 on void-packages repository

https://github.com/void-linux/void-packages/pull/27655#issuecomment-754570750

Comment:
> https://github.com/void-linux/void-packages/blob/master/Manual.md#contributing-via-git

I've force pushed a new commit with the right file, but the old commit with the rooster template is still there. So going to 'Files changed' and clicking delete file under rooster is the wrong way? What is the correct way to do it? Thanks.

Re: mobile-broadband-provider-info: update to 20201225.

[Piraty]

[-- Attachment #1: Type: text/plain, Size: 226 bytes --]

New comment by Piraty on void-packages repository

https://github.com/void-linux/void-packages/pull/27655#issuecomment-754563236

Comment:
https://github.com/void-linux/void-packages/blob/master/Manual.md#contributing-via-git

Re: mobile-broadband-provider-info: update to 20201225.

[ulfw2020]

[-- Attachment #1: Type: text/plain, Size: 378 bytes --]

New comment by ulfw2020 on void-packages repository

https://github.com/void-linux/void-packages/pull/27655#issuecomment-754508540

Comment:
> That's the wrong thing to do. You should rebase the branch interactively and drop the commits that aren't related to the package being updated.

How can I do that? I'm reading up on it but I'm confused. Any help is much appreciated.

Re: mobile-broadband-provider-info: update to 20201225.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 284 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/27655#issuecomment-754343153

Comment:
That's the wrong thing to do. You should rebase the branch interactively and drop the commits that aren't related to the package being updated.

Re: mobile-broadband-provider-info: update to 20201225.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 174 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/27655#issuecomment-754275899

Comment:
You left the rooster commit here.