Hi Dave On 2021-05-17 22:01:39 +0100, Dave Hibberd wrote: > Hi, > > Thanks for the feedback. > > Attached in aprx-3.diff is my proposed changes to the blocked upload as a new revision - my understanding is now that I've uploaded aprx_2.9.0+dfsg-3, I need to upload aprx_2.9.0+dfsg-4. > This reverts to dh 11 in control and restores the debian-compat file. Yes, an upload versioned as -4 is needed. Thanks. Cheers > > I have also attached aprx-2.diff, showing the proposed changes from the current problematic package, aprx_2.9.0+dfsg-2 that is in testing. > This now contains: > * the bug fix > * debian janitor's 2x secure URI fixes, > * gpg signature lintian override > * debian-ci inclusion. > > Is my understanding of the next steps (increase package revision) correct? > Are the last 3 items still inappropriate or can I continue to finalise and upload? > > Cheers, > > -- > Hibby > MM0RFN > > On Sat, 15 May 2021, at 1:25 PM, Sebastian Ramacher wrote: > > Control: tags -1 moreinfo > > > > > > debhelper compat changes are not approprtiate for this phase of the > > freeze. Please revert that change but make sure that the fix for RC bug > > still works as intended. > > > > Cheers > > > diff -Nru aprx-2.9.0+dfsg/debian/changelog aprx-2.9.0+dfsg/debian/changelog > --- aprx-2.9.0+dfsg/debian/changelog 2018-09-27 04:20:51.000000000 +0100 > +++ aprx-2.9.0+dfsg/debian/changelog 2021-05-17 21:45:32.000000000 +0100 > @@ -1,3 +1,25 @@ > +aprx (2.9.0+dfsg-4) UNRELEASED; urgency=medium > + > + * Revert dh update for freeze > + > + -- Dave Hibberd <d@vehibberd.com> Mon, 17 May 2021 21:45:32 +0100 > + > +aprx (2.9.0+dfsg-3) unstable; urgency=medium > + [ Dave Hibberd ] > + * Add debian/gitlab-ci.yml > + * Change installinit behaviour in debian/rules > + - aprx is now disabled by default upon install > + - Belt & Braces interrupting installsystemd too > + * Added patch to modify default config commenting out default callsign > + - Closes: #987332 > + [ Debian Janitor] > + * Use secure URI in debian/watch. > + * Use secure URI in Homepage field. > + * Bump debhelper from old 11 to 12. > + * Update renamed lintian tag names in lintian overrides. > + > + -- Dave Hibberd <d@vehibberd.com> Sun, 09 May 2021 23:15:56 +0100 > + > aprx (2.9.0+dfsg-2) unstable; urgency=medium > > * debian/aprx.init > diff -Nru aprx-2.9.0+dfsg/debian/control aprx-2.9.0+dfsg/debian/control > --- aprx-2.9.0+dfsg/debian/control 2018-09-27 04:20:51.000000000 +0100 > +++ aprx-2.9.0+dfsg/debian/control 2021-05-17 21:45:32.000000000 +0100 > @@ -5,7 +5,7 @@ > Uploaders: Chris Knadle <Chris.Knadle@coredump.us>, Colin Tuckley <colint@debian.org>, Dave Hibberd <d@vehibberd.com> > Build-Depends: debhelper (>= 11) > Standards-Version: 4.2.1 > -Homepage: http://thelifeofkenneth.com/aprx/ > +Homepage: https://thelifeofkenneth.com/aprx/ > Vcs-Browser: https://salsa.debian.org/debian-hamradio-team/aprx > Vcs-Git: https://salsa.debian.org/debian-hamradio-team/aprx.git > > diff -Nru aprx-2.9.0+dfsg/debian/gitlab-ci.yml aprx-2.9.0+dfsg/debian/gitlab-ci.yml > --- aprx-2.9.0+dfsg/debian/gitlab-ci.yml 1970-01-01 01:00:00.000000000 +0100 > +++ aprx-2.9.0+dfsg/debian/gitlab-ci.yml 2021-05-09 22:09:08.000000000 +0100 > @@ -0,0 +1,6 @@ > +include: > + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml > + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml > + > +reprotest: > + extends: .test-reprotest-diffoscope > diff -Nru aprx-2.9.0+dfsg/debian/NEWS aprx-2.9.0+dfsg/debian/NEWS > --- aprx-2.9.0+dfsg/debian/NEWS 1970-01-01 01:00:00.000000000 +0100 > +++ aprx-2.9.0+dfsg/debian/NEWS 2021-05-09 23:21:23.000000000 +0100 > @@ -0,0 +1,8 @@ > +aprx (2.9.0+dfsg-3) unstable; urgency=medium > + > + aprx now ships with NOCALL-1 commented out in the default config, causing > + the program to exit upon running with default config. Please read the > + supplied example configs and edit them with your own callsign to avoid > + spamming the APRS-IS servers, as we have been doing for some time now. > + > + -- Dave Hibberd <d@vehibberd.com> Sun, 09 May 2021 22:34:00 +0100 > diff -Nru aprx-2.9.0+dfsg/debian/patches/03-Config-callsign.patch aprx-2.9.0+dfsg/debian/patches/03-Config-callsign.patch > --- aprx-2.9.0+dfsg/debian/patches/03-Config-callsign.patch 1970-01-01 01:00:00.000000000 +0100 > +++ aprx-2.9.0+dfsg/debian/patches/03-Config-callsign.patch 2021-05-09 22:04:07.000000000 +0100 > @@ -0,0 +1,43 @@ > +Description: Patch to prevent default config from connecting to APRS-IS > +Authod: Dave Hibberd <d@vehibberd.com> > +Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=987332 > +Last-Updated: 2021-05-09 > + > +--- a/aprx-complex.conf.in > ++++ b/aprx-complex.conf.in > +@@ -19,7 +19,8 @@ > + # Usable for 99+% of cases. > + # > + > +-mycall N0CALL-1 > ++# Uncomment the below line and add your own callsign > ++# mycall N0CALL-1 > + > + # > + # Global macro for simplified "my location" definition in > +--- a/aprx-rxigate.conf.in > ++++ b/aprx-rxigate.conf.in > +@@ -25,8 +25,8 @@ > + # Global macro for simplified callsign definition: > + # Usable for 99+% of cases. > + # > +- > +-mycall N0CALL-1 > ++# Uncomment the below line and add your own callsign > ++# mycall N0CALL-1 > + > + <aprsis> > + #login OTHERCALL-7 # login defaults to $mycall > +--- a/aprx.conf.in > ++++ b/aprx.conf.in > +@@ -29,8 +29,8 @@ > + # Global macro for simplified callsign definition: > + # Usable for 99+% of cases. > + # > +- > +-mycall N0CALL-1 > ++# Uncomment the below line and add your own callsign > ++# mycall N0CALL-1 > + > + # > + # Global macro for simplified "my location" definition in > diff -Nru aprx-2.9.0+dfsg/debian/patches/series aprx-2.9.0+dfsg/debian/patches/series > --- aprx-2.9.0+dfsg/debian/patches/series 2018-09-27 04:20:51.000000000 +0100 > +++ aprx-2.9.0+dfsg/debian/patches/series 2021-05-09 21:56:04.000000000 +0100 > @@ -1,2 +1,3 @@ > +03-Config-callsign.patch > 01-man-page.patch > 02-reproducible-builds.patch > diff -Nru aprx-2.9.0+dfsg/debian/rules aprx-2.9.0+dfsg/debian/rules > --- aprx-2.9.0+dfsg/debian/rules 2018-09-27 04:20:51.000000000 +0100 > +++ aprx-2.9.0+dfsg/debian/rules 2021-05-09 23:09:33.000000000 +0100 > @@ -31,7 +31,10 @@ > rm -vf ./test ./aprx-complex.conf Makefile > > override_dh_installinit: > - dh_installinit --restart-after-upgrade > + dh_installinit --restart-after-upgrade --no-enable > + > +override_dh_installsystemd: > + dh_installsystemd --no-enable > > override_dh_installdirs: > dh_installdirs > diff -Nru aprx-2.9.0+dfsg/debian/source/lintian-overrides aprx-2.9.0+dfsg/debian/source/lintian-overrides > --- aprx-2.9.0+dfsg/debian/source/lintian-overrides 2017-12-11 17:48:21.000000000 +0000 > +++ aprx-2.9.0+dfsg/debian/source/lintian-overrides 2020-04-20 18:22:23.000000000 +0100 > @@ -1,2 +1,2 @@ > # Upstream does not sign the source, override watch-may-check-gpg-sig warning > -aprx source: debian-watch-may-check-gpg-signature > +aprx source: debian-watch-does-not-check-gpg-signature > diff -Nru aprx-2.9.0+dfsg/debian/watch aprx-2.9.0+dfsg/debian/watch > --- aprx-2.9.0+dfsg/debian/watch 2017-12-11 17:48:21.000000000 +0000 > +++ aprx-2.9.0+dfsg/debian/watch 2020-04-20 18:22:23.000000000 +0100 > @@ -3,5 +3,5 @@ > version=4 > opts="repack,repacksuffix=+repack,\ > dversionmangle=s/(\da?)[\+\.\-~](?:dfsg|debian|ds|repack|repacked)\.?\d*$/$1/" \ > -http://thelifeofkenneth.com/aprx/release/ \ > +https://thelifeofkenneth.com/aprx/release/ \ > (?:|.*/)aprx(?:[_\-]v?|)(\d[^\s/]*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz) > diff -Nru aprx-2.9.0+dfsg/debian/changelog aprx-2.9.0+dfsg/debian/changelog > --- aprx-2.9.0+dfsg/debian/changelog 2021-05-09 23:15:56.000000000 +0100 > +++ aprx-2.9.0+dfsg/debian/changelog 2021-05-17 21:45:32.000000000 +0100 > @@ -1,3 +1,9 @@ > +aprx (2.9.0+dfsg-4) UNRELEASED; urgency=medium > + > + * Revert dh update for freeze > + > + -- Dave Hibberd <d@vehibberd.com> Mon, 17 May 2021 21:45:32 +0100 > + > aprx (2.9.0+dfsg-3) unstable; urgency=medium > [ Dave Hibberd ] > * Add debian/gitlab-ci.yml > diff -Nru aprx-2.9.0+dfsg/debian/compat aprx-2.9.0+dfsg/debian/compat > --- aprx-2.9.0+dfsg/debian/compat 1970-01-01 01:00:00.000000000 +0100 > +++ aprx-2.9.0+dfsg/debian/compat 2021-05-17 21:43:34.000000000 +0100 > @@ -0,0 +1 @@ > +11 > diff -Nru aprx-2.9.0+dfsg/debian/control aprx-2.9.0+dfsg/debian/control > --- aprx-2.9.0+dfsg/debian/control 2020-04-20 18:22:23.000000000 +0100 > +++ aprx-2.9.0+dfsg/debian/control 2021-05-17 21:45:32.000000000 +0100 > @@ -3,7 +3,7 @@ > Priority: optional > Maintainer: Debian Hamradio Maintainers <debian-hams@lists.debian.org> > Uploaders: Chris Knadle <Chris.Knadle@coredump.us>, Colin Tuckley <colint@debian.org>, Dave Hibberd <d@vehibberd.com> > -Build-Depends: debhelper-compat (= 12) > +Build-Depends: debhelper (>= 11) > Standards-Version: 4.2.1 > Homepage: https://thelifeofkenneth.com/aprx/ > Vcs-Browser: https://salsa.debian.org/debian-hamradio-team/aprx -- Sebastian Ramacher
Attachment:
signature.asc
Description: PGP signature