Skip to content
This repository has been archived by the owner on Sep 24, 2022. It is now read-only.

WIP: Rebase on Debian 1.14.6-2 #1

Closed
wants to merge 17 commits into from

Conversation

lkundrak
Copy link

@lkundrak lkundrak commented Mar 4, 2019

See how this files.

I organized the changes by bringing in the vanilla Debian package, then putting the patches back in and finally merging in the Xenial base. Should be good enough to track changes as well as seeing brid's eye of the changes in the merge commit.

What should be apparent is that I dropped some patches because they bitrotted too much.

Also, there's more stuff there to verify: e.g. removal of tests/ or the libnm-glib packages.

This is a dump of debian/ directory of commit 61ab603600 ('Release version
1.14.6-2 to unstable') of https://salsa.debian.org/utopia-team/network-manager.git

It serves as a base for future changes.
…pat"

This reverts commit 12aead6b161a3312673ac62686af0350061c0666.
This reverts commit 2034b7ef86afd9d007e5812aa1fb2a2a717ba635.
This reverts commit bfe57e5fbd9cea476af46baece1c83c1b9cdd631.
This reverts commit c5d5a332ecb229bf49c3b4a279d10a1e33399478.
@Flohack74
Copy link
Member

Cool I need to fire up our CI for that repo ;)

@Flohack74
Copy link
Member

You need to set the changelog to xenial release:

UNRELEASED wont work, otherwise our CI freaks out. Just ignore usual debian rules here ;)

BR Florian

…ries"

This reverts commit b4acc5e03e2b821e1cccc69529bb70826c741942.
This reverts commit 6a32f324f450ee1da73e6fa06def037c4a05fe65.
@lkundrak lkundrak force-pushed the lr/debian-rebase branch 5 times, most recently from bf9446f to 36143fc Compare March 8, 2019 08:49
Disable some features to slim the dependency chain down a bit.
Fixed upstream in 16c368b8eb03 ('platform: recognize rmnet and ccmni
interfaces as WWAN network devices')
@Flohack74
Copy link
Member

You are still good? Anything we can do to help you?

@Flohack74 Flohack74 added this to In progress in OTA-12 via automation Oct 16, 2019
@mariogrip
Copy link
Member

@Flohack74 I'm not sure if this will have time to get into OTA-12, and I would suggest this gets staged into edge before going directly to devel as we are pretty close to end of the development cycle.

@mariogrip mariogrip removed this from In progress in OTA-12 Dec 19, 2019
@Flohack74
Copy link
Member

I agree.

@dobey dobey marked this pull request as draft November 5, 2020 17:20
@Flohack74
Copy link
Member

Due to the upgrade to 20.04 base this became a bit obsolete. We might want to revisit it later this year though.

@Flohack74 Flohack74 closed this Feb 2, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants