At 2017-03-29T12:59:12-0700, Sean Whitton wrote:
> Hello Branden,
>
> On Tue, Mar 28, 2017 at 08:29:38PM -0400, G. Branden Robinson wrote:
> > > On Tue, Mar 28, 2017 at 05:28:25PM -0400, G. Branden Robinson wrote:
> > > > So my goals were, in this order:
> > > > 1) Get the package suitable for unstable (which it wasn't); then
> > > > 2) Get the package suitable for testing.
> >
> > It'll be suitable for testing for Buster, that's for sure. My bad luck
> > to return during a release freeze.
>
> Right. But your wording ("then") suggested that (2) could be done
> exclusively of (1).
It can. I've uploaded xtrs 4.9c-4 with a far leaner set of changes, and
am attaching a diff of the diff to this message. As you can see, it's
far leaner.
Thoughts?
> > I'm interested in the least-effort solution (for other people) that
> > doesn't involve shipping a badly broken package in Stretch.
>
> Well, letting it drop out of testing is technically the least-effort
> solution.
Right. What's the next-least-effort solution? :)
Regards,
Branden
--- xtrs_4.9c-3.5.diff 2017-03-30 09:25:15.053347227 -0400 +++ xtrs_4.9c-4.diff 2017-03-30 09:25:15.053347227 -0400 @@ -1,3 +1,14 @@ +--- xtrs-4.9c.orig/Makefile ++++ xtrs-4.9c/Makefile +@@ -143,7 +143,7 @@ + include Makefile.local + + CFLAGS = $(DEBUG) $(ENDIAN) $(DEFAULT_ROM) $(READLINE) $(DISKDIR) $(IFLAGS) \ +- $(APPDEFAULTS) -DKBWAIT -DHAVE_SIGIO ++ $(APPDEFAULTS) -DKBWAIT + LIBS = $(XLIB) $(READLINELIBS) $(EXTRALIBS) + + ZMACFLAGS = -h --- xtrs-4.9c.orig/Makefile.local +++ xtrs-4.9c/Makefile.local @@ -50,7 +50,7 @@ @@ -363,7 +374,15 @@ +vim:set ai et ts=4 sw=4 tw=80: --- xtrs-4.9c.orig/debian/changelog +++ xtrs-4.9c/debian/changelog -@@ -0,0 +1,627 @@ +@@ -0,0 +1,635 @@ ++xtrs (4.9c-4) unstable; urgency=medium ++ ++ * Makefile: Undefine HAVE_SIGIO. (Closes: #511645) ++ * Update Maintainer full name and email address from the "old me" to the ++ "new me". ++ ++ -- G. Branden Robinson <g.branden.robinson@gmail.com> Thu, 30 Mar 2017 09:20:32 -0400 ++ +xtrs (4.9c-3.5) unstable; urgency=medium + + * Non-maintainer upload. @@ -1036,8 +1055,8 @@ +Source: xtrs +Section: contrib/otherosfs +Priority: extra -+Maintainer: Branden Robinson <branden@debian.org> -+Build-Depends: libncurses5-dev, libreadline-dev, libx11-dev, groff, debhelper (>= 5), po-debconf, html2text ++Maintainer: G. Branden Robinson <g.branden.robinson@gmail.com> ++Build-Depends: libncurses5-dev, libreadline-dev, libx11-dev, groff-base, debhelper (>= 5), po-debconf, html2text +Standards-Version: 3.7.3 + +Package: xtrs @@ -1132,7 +1151,7 @@ + command="/usr/bin/xtrs" --- xtrs-4.9c.orig/debian/patches +++ xtrs-4.9c/debian/patches -@@ -0,0 +1,236 @@ +@@ -0,0 +1,247 @@ +--- cassette.man~ ++++ cassette.man +@@ -15,13 +15,6 @@ @@ -1369,6 +1388,17 @@ + + # If you want to debug the emulator, use the -g flag instead: + ++--- Makefile.orig 2017-03-30 09:17:41.055300129 -0400 +++++ Makefile 2017-03-30 09:17:48.455224512 -0400 ++@@ -143,7 +143,7 @@ ++ include Makefile.local ++ ++ CFLAGS = $(DEBUG) $(ENDIAN) $(DEFAULT_ROM) $(READLINE) $(DISKDIR) $(IFLAGS) \ ++- $(APPDEFAULTS) -DKBWAIT -DHAVE_SIGIO +++ $(APPDEFAULTS) -DKBWAIT ++ LIBS = $(XLIB) $(READLINELIBS) $(EXTRALIBS) ++ ++ ZMACFLAGS = -h --- xtrs-4.9c.orig/debian/po/POTFILES.in +++ xtrs-4.9c/debian/po/POTFILES.in @@ -0,0 +1 @@
Attachment:
signature.asc
Description: PGP signature