Bug#1034016: unblock (pre-approval): debos/1.1.1-2.1
Hello, On Thu, Apr 06, 2023 at 05:52:32PM +0100, Christopher Obbard wrote: > Hi Andreas, > > On Thu, 2023-04-06 at 18:45 +0200, Andreas Henriksson wrote: [...] > > IMHO it feels much safer to just go with a targeted upload [...] > > Let's go with your NMU, since you've done all of the work already, then I > will upload the new version into unstable once development opens. > > How does that sound? > > PS: Can you push your source to salsa? Pushed to salsa (incl. tag)! dput new version, so should hopefully he accepted for unstable soon! Thanks for the quick followup! Regards, Andreas Henriksson
Bug#1034016: unblock (pre-approval): debos/1.1.1-2.1
Hi Andreas, On Thu, 2023-04-06 at 18:45 +0200, Andreas Henriksson wrote: > Hello Chris, > > On Thu, Apr 06, 2023 at 04:37:30PM +0100, Christopher Obbard wrote: > > Hi Andreas, > > > > As the upstream maintainer, I can just tag a new version upstream as 1.1.2 > > & pick that in Debian. > > Then I hope it can flow into bookworm? > > I wonder if the release team will accept a new upstream release at this > point in the freeze We're pretty deep into the hard freeze at this > point (but I don't have enough insight into how the release team works > these days, it seems much more relaxed than in the old times where I was > more involved and basically any extra character would get you a NACK, > specially an "unneccessary" upstream version number change). > > Do you have time to do all the work and still accept a potential NO from > the release team? Please be honest to yourself. > > IMHO it feels much safer to just go with a targeted upload (which is now > also already approved), but if you feel strongly about it and also think > you have time to pursue a new release then just send me a NACK on the > NMU (ASAP! I'm ready to upload *now*) and I will not pursue it. Let's go with your NMU, since you've done all of the work already, then I will upload the new version into unstable once development opens. How does that sound? PS: Can you push your source to salsa? Thanks! Chris > > > > > The past few months have been... quite crazy in my personal life so I > > haven't gotten around to doing this as yet. Huge apologies for that, > > it is on my radar this week. > > > > Hope that is acceptable to you? > > No need to apologize. We're all busy sometimes and that's why we have > NMUs so we can help each other out. (I've also been quite busy or the > NMU would have happened much sooner in the release cycle.) > Thanks for all the work you have had time to do! > > > > > Thanks, > > > > Chris > > Regards, > Andreas Henriksson > > PS. Feel free to ignore my NMU and just upload the new upstream release > once we're past the freeze/release and the development opens up again.
Bug#1034016: unblock (pre-approval): debos/1.1.1-2.1
Hello Chris, On Thu, Apr 06, 2023 at 04:37:30PM +0100, Christopher Obbard wrote: > Hi Andreas, > > As the upstream maintainer, I can just tag a new version upstream as 1.1.2 & > pick that in Debian. > Then I hope it can flow into bookworm? I wonder if the release team will accept a new upstream release at this point in the freeze We're pretty deep into the hard freeze at this point (but I don't have enough insight into how the release team works these days, it seems much more relaxed than in the old times where I was more involved and basically any extra character would get you a NACK, specially an "unneccessary" upstream version number change). Do you have time to do all the work and still accept a potential NO from the release team? Please be honest to yourself. IMHO it feels much safer to just go with a targeted upload (which is now also already approved), but if you feel strongly about it and also think you have time to pursue a new release then just send me a NACK on the NMU (ASAP! I'm ready to upload *now*) and I will not pursue it. > > The past few months have been... quite crazy in my personal life so I > haven't gotten around to doing this as yet. Huge apologies for that, > it is on my radar this week. > > Hope that is acceptable to you? No need to apologize. We're all busy sometimes and that's why we have NMUs so we can help each other out. (I've also been quite busy or the NMU would have happened much sooner in the release cycle.) Thanks for all the work you have had time to do! > > Thanks, > > Chris Regards, Andreas Henriksson PS. Feel free to ignore my NMU and just upload the new upstream release once we're past the freeze/release and the development opens up again.
Bug#1034016: unblock (pre-approval): debos/1.1.1-2.1
Hi Andreas, As the upstream maintainer, I can just tag a new version upstream as 1.1.2 & pick that in Debian. Then I hope it can flow into bookworm? The past few months have been... quite crazy in my personal life so I haven't gotten around to doing this as yet. Huge apologies for that, it is on my radar this week. Hope that is acceptable to you? Thanks, Chris On Thu, 2023-04-06 at 15:51 +0200, Andreas Henriksson wrote: > Package: release.debian.org > Severity: normal > User: release.debian@packages.debian.org > Usertags: unblock > X-Debbugs-Cc: de...@packages.debian.org > Control: affects -1 + src:debos > > > Hello release-team, > > I'm looking for a pre-approval for an unblock of my NMU of debos, > which contains 3 commits cherry-picked from upstream. > > The main bug to fix is https://bugs.debian.org/1027787 > The current version of debos in bookworm is not compatible with > bookworm. The maintainer promised me to deal with this if I > submitted an upstream PR where he merged my patch for it, > but apparently never found the time to update the debian > package. > > While at it I also cherry-picked 2 documentation fixes. > > I'm attaching a debdiff, but if you'd like to avoid reading > patch-in-patch these are the commits: > https://github.com/go-debos/debos/commit/18998ffaf78321e111d9823b3180eca3fa4593f6 > https://github.com/go-debos/debos/commit/f4ff78305513a90eca089e33f7bba35bffa96bd1 > https://github.com/go-debos/debos/commit/c8c5075853aab9e1ac6ae07a3a7c2b070aa38a62 > > > unblock debos/1.1.1-2.1
Bug#1034016: unblock (pre-approval): debos/1.1.1-2.1
On 2023-04-06 15:51:38 +0200, Andreas Henriksson wrote:
> Package: release.debian.org
> Severity: normal
> User: release.debian@packages.debian.org
> Usertags: unblock
> X-Debbugs-Cc: de...@packages.debian.org
> Control: affects -1 + src:debos
>
>
> Hello release-team,
>
> I'm looking for a pre-approval for an unblock of my NMU of debos,
> which contains 3 commits cherry-picked from upstream.
Please go ahead
Cheers
>
> The main bug to fix is https://bugs.debian.org/1027787
> The current version of debos in bookworm is not compatible with
> bookworm. The maintainer promised me to deal with this if I
> submitted an upstream PR where he merged my patch for it,
> but apparently never found the time to update the debian
> package.
>
> While at it I also cherry-picked 2 documentation fixes.
>
> I'm attaching a debdiff, but if you'd like to avoid reading
> patch-in-patch these are the commits:
> https://github.com/go-debos/debos/commit/18998ffaf78321e111d9823b3180eca3fa4593f6
> https://github.com/go-debos/debos/commit/f4ff78305513a90eca089e33f7bba35bffa96bd1
> https://github.com/go-debos/debos/commit/c8c5075853aab9e1ac6ae07a3a7c2b070aa38a62
>
>
> unblock debos/1.1.1-2.1
> diff -Nru debos-1.1.1/debian/changelog debos-1.1.1/debian/changelog
> --- debos-1.1.1/debian/changelog 2022-10-31 11:16:08.0 +0100
> +++ debos-1.1.1/debian/changelog 2023-03-16 10:09:37.0 +0100
> @@ -1,3 +1,13 @@
> +debos (1.1.1-2.1) unstable; urgency=medium
> +
> + * Non-maintainer upload.
> + * Cherry-pick upstream commit that unbreaks bookworm (Closes: #1027787)
> + * Cherry-pick upstream doc fix for non-free-firmware
> + * Cherry-pick upstream example fix for interactive password prompt
> +(Closes: #1006823)
> +
> + -- Andreas Henriksson Thu, 16 Mar 2023 10:09:37 +0100
> +
> debos (1.1.1-2) unstable; urgency=medium
>
>* Run autopkgtest in an isolated virtual machine
> diff -Nru debos-1.1.1/debian/patches/0001-Limit-old-suite-workaround.patch
> debos-1.1.1/debian/patches/0001-Limit-old-suite-workaround.patch
> --- debos-1.1.1/debian/patches/0001-Limit-old-suite-workaround.patch
> 1970-01-01 01:00:00.0 +0100
> +++ debos-1.1.1/debian/patches/0001-Limit-old-suite-workaround.patch
> 2023-03-16 10:09:37.0 +0100
> @@ -0,0 +1,65 @@
> +From: Andreas Henriksson
> +Date: Tue, 3 Jan 2023 01:12:42 +0100
> +Subject: Limit old suite workaround
> +
> +The workaround for https://github.com/go-debos/debos/issues/361
> +that was applied in
> https://github.com/go-debos/debos/commit/b3c1f76bcc1dbd55fef584b8ddbda33f12733116
> +breaks recipes for bookworm and newer.
> +
> +Signed-off-by: Andreas Henriksson
> +(cherry picked from commit 18998ffaf78321e111d9823b3180eca3fa4593f6)
> +---
> + actions/debootstrap_action.go | 26 +-
> + 1 file changed, 25 insertions(+), 1 deletion(-)
> +
> +diff --git a/actions/debootstrap_action.go b/actions/debootstrap_action.go
> +index e354ff4..e7c2587 100644
> +--- a/actions/debootstrap_action.go
> b/actions/debootstrap_action.go
> +@@ -53,6 +53,7 @@ package actions
> + import (
> + "fmt"
> + "io"
> ++"log"
> + "os"
> + "path"
> + "strings"
> +@@ -158,6 +159,24 @@ func (d *DebootstrapAction) RunSecondStage(context
> debos.DebosContext) error {
> + return err
> + }
> +
> ++// Guess if suite is something before usr-is-merged was introduced
> ++func (d *DebootstrapAction) isLikelyOldSuite() bool {
> ++switch strings.ToLower(d.Suite) {
> ++case "sid", "unstable":
> ++return false
> ++case "testing":
> ++return false
> ++case "bookworm":
> ++return false
> ++case "trixie":
> ++return false
> ++case "forky":
> ++return false
> ++default:
> ++return true
> ++}
> ++}
> ++
> + func (d *DebootstrapAction) Run(context *debos.DebosContext) error {
> + d.LogStart()
> + cmdline := []string{"debootstrap"}
> +@@ -204,7 +223,12 @@ func (d *DebootstrapAction) Run(context
> *debos.DebosContext) error {
> + cmdline = append(cmdline, fmt.Sprintf("--variant=%s",
> d.Variant))
> + }
> +
> +-cmdline = append(cmdline, "--exclude=usr-is-merged")
> ++// workaround for https://github.com/go-debos/debos/issues/361
> ++if d.isLikelyOldSuite() {
> ++log.Println("excluding usr-is-merged as package is not in
> suite")
> ++cmdline = append(cmdline, "--exclude=usr-is-merged")
> ++}
> ++
> + cmdline = append(cmdline, d.Suite)
> + cmdline = append(cmdline, context.Rootdir)
> + cmdline = append(cmdline, d.Mirror)
> diff -Nru
> debos-1.1.1/debian/patches/0002-Include-non-free-firmware-component-in-Simple-exampl.patch
>
> debos-1.1.1/debian/patches/0002-Include-non-free-firmware-component-in-Simple-exampl.patch
> ---
> debos-1.1.1/debian/patches/0002-Include-non-free-firmware-component-in-Simple-exampl.patch
> 1970-01-01 01:00:00.0
Bug#1034016: unblock (pre-approval): debos/1.1.1-2.1
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: de...@packages.debian.org
Control: affects -1 + src:debos
Hello release-team,
I'm looking for a pre-approval for an unblock of my NMU of debos,
which contains 3 commits cherry-picked from upstream.
The main bug to fix is https://bugs.debian.org/1027787
The current version of debos in bookworm is not compatible with
bookworm. The maintainer promised me to deal with this if I
submitted an upstream PR where he merged my patch for it,
but apparently never found the time to update the debian
package.
While at it I also cherry-picked 2 documentation fixes.
I'm attaching a debdiff, but if you'd like to avoid reading
patch-in-patch these are the commits:
https://github.com/go-debos/debos/commit/18998ffaf78321e111d9823b3180eca3fa4593f6
https://github.com/go-debos/debos/commit/f4ff78305513a90eca089e33f7bba35bffa96bd1
https://github.com/go-debos/debos/commit/c8c5075853aab9e1ac6ae07a3a7c2b070aa38a62
unblock debos/1.1.1-2.1
diff -Nru debos-1.1.1/debian/changelog debos-1.1.1/debian/changelog
--- debos-1.1.1/debian/changelog2022-10-31 11:16:08.0 +0100
+++ debos-1.1.1/debian/changelog2023-03-16 10:09:37.0 +0100
@@ -1,3 +1,13 @@
+debos (1.1.1-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Cherry-pick upstream commit that unbreaks bookworm (Closes: #1027787)
+ * Cherry-pick upstream doc fix for non-free-firmware
+ * Cherry-pick upstream example fix for interactive password prompt
+(Closes: #1006823)
+
+ -- Andreas Henriksson Thu, 16 Mar 2023 10:09:37 +0100
+
debos (1.1.1-2) unstable; urgency=medium
* Run autopkgtest in an isolated virtual machine
diff -Nru debos-1.1.1/debian/patches/0001-Limit-old-suite-workaround.patch
debos-1.1.1/debian/patches/0001-Limit-old-suite-workaround.patch
--- debos-1.1.1/debian/patches/0001-Limit-old-suite-workaround.patch
1970-01-01 01:00:00.0 +0100
+++ debos-1.1.1/debian/patches/0001-Limit-old-suite-workaround.patch
2023-03-16 10:09:37.0 +0100
@@ -0,0 +1,65 @@
+From: Andreas Henriksson
+Date: Tue, 3 Jan 2023 01:12:42 +0100
+Subject: Limit old suite workaround
+
+The workaround for https://github.com/go-debos/debos/issues/361
+that was applied in
https://github.com/go-debos/debos/commit/b3c1f76bcc1dbd55fef584b8ddbda33f12733116
+breaks recipes for bookworm and newer.
+
+Signed-off-by: Andreas Henriksson
+(cherry picked from commit 18998ffaf78321e111d9823b3180eca3fa4593f6)
+---
+ actions/debootstrap_action.go | 26 +-
+ 1 file changed, 25 insertions(+), 1 deletion(-)
+
+diff --git a/actions/debootstrap_action.go b/actions/debootstrap_action.go
+index e354ff4..e7c2587 100644
+--- a/actions/debootstrap_action.go
b/actions/debootstrap_action.go
+@@ -53,6 +53,7 @@ package actions
+ import (
+ "fmt"
+ "io"
++ "log"
+ "os"
+ "path"
+ "strings"
+@@ -158,6 +159,24 @@ func (d *DebootstrapAction) RunSecondStage(context
debos.DebosContext) error {
+ return err
+ }
+
++// Guess if suite is something before usr-is-merged was introduced
++func (d *DebootstrapAction) isLikelyOldSuite() bool {
++ switch strings.ToLower(d.Suite) {
++ case "sid", "unstable":
++ return false
++ case "testing":
++ return false
++ case "bookworm":
++ return false
++ case "trixie":
++ return false
++ case "forky":
++ return false
++ default:
++ return true
++ }
++}
++
+ func (d *DebootstrapAction) Run(context *debos.DebosContext) error {
+ d.LogStart()
+ cmdline := []string{"debootstrap"}
+@@ -204,7 +223,12 @@ func (d *DebootstrapAction) Run(context
*debos.DebosContext) error {
+ cmdline = append(cmdline, fmt.Sprintf("--variant=%s",
d.Variant))
+ }
+
+- cmdline = append(cmdline, "--exclude=usr-is-merged")
++ // workaround for https://github.com/go-debos/debos/issues/361
++ if d.isLikelyOldSuite() {
++ log.Println("excluding usr-is-merged as package is not in
suite")
++ cmdline = append(cmdline, "--exclude=usr-is-merged")
++ }
++
+ cmdline = append(cmdline, d.Suite)
+ cmdline = append(cmdline, context.Rootdir)
+ cmdline = append(cmdline, d.Mirror)
diff -Nru
debos-1.1.1/debian/patches/0002-Include-non-free-firmware-component-in-Simple-exampl.patch
debos-1.1.1/debian/patches/0002-Include-non-free-firmware-component-in-Simple-exampl.patch
---
debos-1.1.1/debian/patches/0002-Include-non-free-firmware-component-in-Simple-exampl.patch
1970-01-01 01:00:00.0 +0100
+++
debos-1.1.1/debian/patches/0002-Include-non-free-firmware-component-in-Simple-exampl.patch
2023-03-16 10:09:37.0 +0100
@@ -0,0 +1,23 @@
+From: Daniel Andersson
+Date: Fri, 24 Feb 2023 18:20:43 +0100
+Subject: Include non-free-firmware component in
