Control: tags 957193 + pending Control: tags 967133 + pending Dear maintainer,
I've prepared an NMU for fbpanel (versioned as 7.0-4.1) and uploaded it to DELAYED/1. Please feel free to tell me if I should cancel it. cu Adrian
diff -Nru fbpanel-7.0/debian/changelog fbpanel-7.0/debian/changelog --- fbpanel-7.0/debian/changelog 2017-10-12 14:54:27.000000000 +0300 +++ fbpanel-7.0/debian/changelog 2021-02-06 15:45:54.000000000 +0200 @@ -1,3 +1,11 @@ +fbpanel (7.0-4.1) unstable; urgency=medium + + * Non-maintainer upload. + * Add patch from Ubuntu to fix FTBFS with gcc 10. (Closes: #957193) + * Add patch from Ubuntu to build using python2. (Closes: #967133) + + -- Adrian Bunk <[email protected]> Sat, 06 Feb 2021 15:45:54 +0200 + fbpanel (7.0-4) unstable; urgency=medium * Fix creation template issues. Thanks Juri Grabowski! (Closes: #878186). diff -Nru fbpanel-7.0/debian/control fbpanel-7.0/debian/control --- fbpanel-7.0/debian/control 2017-10-12 14:54:27.000000000 +0300 +++ fbpanel-7.0/debian/control 2021-02-06 15:45:54.000000000 +0200 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Ulises Vitulli <[email protected]> Build-Depends: debhelper (>= 9), autotools-dev, libgtk2.0-dev, libxmu-dev, - libxpm-dev, python-minimal, python-argparse + libxpm-dev, python2 Standards-Version: 4.1.1 Homepage: https://github.com/aanatoly/fbpanel diff -Nru fbpanel-7.0/debian/patches/gcc-10.patch fbpanel-7.0/debian/patches/gcc-10.patch --- fbpanel-7.0/debian/patches/gcc-10.patch 1970-01-01 02:00:00.000000000 +0200 +++ fbpanel-7.0/debian/patches/gcc-10.patch 2021-02-06 15:45:50.000000000 +0200 @@ -0,0 +1,11 @@ +--- a/panel/plugin.h ++++ b/panel/plugin.h +@@ -9,7 +9,7 @@ + #include <stdio.h> + #include "panel.h" + +-struct _plugin_instance *stam; ++extern struct _plugin_instance *stam; + + typedef struct { + /* common */ diff -Nru fbpanel-7.0/debian/patches/python2.diff fbpanel-7.0/debian/patches/python2.diff --- fbpanel-7.0/debian/patches/python2.diff 1970-01-01 02:00:00.000000000 +0200 +++ fbpanel-7.0/debian/patches/python2.diff 2021-02-06 15:45:50.000000000 +0200 @@ -0,0 +1,40 @@ +Index: b/.config/help +=================================================================== +--- a/.config/help ++++ b/.config/help +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + + import re, os, sys, textwrap + # Formats help message +Index: b/.config/repl.py +=================================================================== +--- a/.config/repl.py ++++ b/.config/repl.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + + import re, sys + +Index: b/.config/tar.py +=================================================================== +--- a/.config/tar.py ++++ b/.config/tar.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + + import subprocess as sp + import re, tempfile +Index: b/configure +=================================================================== +--- a/configure ++++ b/configure +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + + import sys + if sys.version_info < (2, 7): diff -Nru fbpanel-7.0/debian/patches/series fbpanel-7.0/debian/patches/series --- fbpanel-7.0/debian/patches/series 2017-10-12 14:54:27.000000000 +0300 +++ fbpanel-7.0/debian/patches/series 2021-02-06 15:45:50.000000000 +0200 @@ -5,3 +5,5 @@ plugins_volume_oss+alsa_hint.patch ftbfs-hurd.patch nolibexec.patch +python2.diff +gcc-10.patch
