diff -Nru ucblogo-6.0+dfsg/debian/changelog ucblogo-6.0+dfsg/debian/changelog --- ucblogo-6.0+dfsg/debian/changelog 2016-04-14 17:22:50.000000000 +0000 +++ ucblogo-6.0+dfsg/debian/changelog 2018-02-16 15:26:54.000000000 +0000 @@ -1,3 +1,14 @@ +ucblogo (6.0+dfsg-2) unstable; urgency=medium + + * Adopt package (closes: #790725), many thanks to Hamish Moffatt! + * Update packaging: + - dh11, and slightly simplify debian/rules + - bump policy, no changes required + - update patch descriptions + * Patch to ignore ./configure --runstatedir + + -- Barak A. Pearlmutter Fri, 16 Feb 2018 15:26:54 +0000 + ucblogo (6.0+dfsg-1) unstable; urgency=low * QA upload. diff -Nru ucblogo-6.0+dfsg/debian/compat ucblogo-6.0+dfsg/debian/compat --- ucblogo-6.0+dfsg/debian/compat 2016-04-14 17:22:50.000000000 +0000 +++ ucblogo-6.0+dfsg/debian/compat 2018-02-16 14:12:11.000000000 +0000 @@ -1 +1 @@ -9 +11 diff -Nru ucblogo-6.0+dfsg/debian/control ucblogo-6.0+dfsg/debian/control --- ucblogo-6.0+dfsg/debian/control 2016-04-14 17:22:50.000000000 +0000 +++ ucblogo-6.0+dfsg/debian/control 2018-02-16 14:13:14.000000000 +0000 @@ -1,12 +1,14 @@ Source: ucblogo Section: devel Priority: optional -Maintainer: Debian QA Group -Standards-Version: 3.9.8 +Maintainer: Barak A. Pearlmutter +Standards-Version: 4.1.3 Homepage: http://www.cs.berkeley.edu/~bh/logo.html Vcs-Git: https://anonscm.debian.org/git/collab-maint/ucblogo.git Vcs-Browser: https://anonscm.debian.org/git/collab-maint/ucblogo.git -Build-Depends: debhelper (>= 9), libncurses-dev, libx11-dev, libsm-dev, libice-dev, libwxgtk3.0-dev, texlive-latex-base, texinfo, ghostscript +Build-Depends: debhelper (>= 11), + libncurses-dev, libx11-dev, libsm-dev, libice-dev, libwxgtk3.0-dev, + texlive-latex-base, texinfo, ghostscript Package: ucblogo Architecture: any diff -Nru ucblogo-6.0+dfsg/debian/copyright ucblogo-6.0+dfsg/debian/copyright --- ucblogo-6.0+dfsg/debian/copyright 2016-04-14 17:22:50.000000000 +0000 +++ ucblogo-6.0+dfsg/debian/copyright 2018-02-16 14:13:40.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Berkeley Logo Source: http://www.cs.berkeley.edu/~bh/downloads/ Files-Excluded: .nfs000000000123876700000013 .gdb_history logo makehelp */CVS */.svn config.cache config.log config.status diff -Nru ucblogo-6.0+dfsg/debian/gbp.conf ucblogo-6.0+dfsg/debian/gbp.conf --- ucblogo-6.0+dfsg/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 +++ ucblogo-6.0+dfsg/debian/gbp.conf 2018-02-16 15:26:54.000000000 +0000 @@ -0,0 +1,11 @@ +[DEFAULT] +upstream-branch = upstream +debian-branch = master +upstream-tag = upstream/%(version)s +debian-tag = debian/%(version)s + +sign-tags = True +pristine-tar = True + +compression = xz +compression-level = 9 diff -Nru ucblogo-6.0+dfsg/debian/patches/0009-configure-option-runstatedir.patch ucblogo-6.0+dfsg/debian/patches/0009-configure-option-runstatedir.patch --- ucblogo-6.0+dfsg/debian/patches/0009-configure-option-runstatedir.patch 1970-01-01 00:00:00.000000000 +0000 +++ ucblogo-6.0+dfsg/debian/patches/0009-configure-option-runstatedir.patch 2018-02-16 15:26:54.000000000 +0000 @@ -0,0 +1,50 @@ +From: "Barak A. Pearlmutter" +Date: Fri, 16 Feb 2018 15:19:42 +0000 +Subject: configure option runstatedir + +Add ./configure --runstatedir= option, which is ignored. +This avoids a configuration-time error. +--- + configure | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/configure b/configure +index a6cb318..461b1b8 100755 +--- a/configure ++++ b/configure +@@ -49,6 +49,7 @@ includedir='${prefix}/include' + oldincludedir='/usr/include' + infodir='${prefix}/info' + mandir='${prefix}/man' ++runstatedir='${prefix}/man' + + # Initialize some other variables. + subdirs= +@@ -163,6 +164,7 @@ Directory and file names: + --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] + --infodir=DIR info documentation in DIR [PREFIX/info] + --mandir=DIR man documentation in DIR [PREFIX/man] ++ --runstatedir=DIR run state in DIR [PREFIX/run] + --srcdir=DIR find the sources in DIR [configure dir or ..] + --program-prefix=PREFIX prepend PREFIX to installed program names + --program-suffix=SUFFIX append SUFFIX to installed program names +@@ -230,6 +232,11 @@ EOF + -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) + mandir="$ac_optarg" ;; + ++ -runstatedir | --runstatedir | --runstatedi | --runstated | --runstate | --ru | --r) ++ ac_prev=runstatedir ;; ++ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* | --runstate=* | --ru=* | --r=*) ++ runstatedir="$ac_optarg" ;; ++ + -nfp | --nfp | --nf) + # Obsolete; use --without-fp. + with_fp=no ;; +@@ -2047,6 +2054,7 @@ s%@includedir@%$includedir%g + s%@oldincludedir@%$oldincludedir%g + s%@infodir@%$infodir%g + s%@mandir@%$mandir%g ++s%@runstatedir@%$runstatedir%g + s%@CC@%$CC%g + s%@CPP@%$CPP%g + s%@X_CFLAGS@%$X_CFLAGS%g diff -Nru ucblogo-6.0+dfsg/debian/patches/documentation.patch ucblogo-6.0+dfsg/debian/patches/documentation.patch --- ucblogo-6.0+dfsg/debian/patches/documentation.patch 2016-04-14 17:22:50.000000000 +0000 +++ ucblogo-6.0+dfsg/debian/patches/documentation.patch 2018-02-16 15:26:54.000000000 +0000 @@ -1,12 +1,22 @@ -Author: Reiner Herrmann -Description: Some documentation fixes - - add @dircategory / @direntry (found by Lintian) - - fix wrong section level - - use makeinfo instead of obsolete texi2html +From: Reiner Herrmann +Date: Mon, 11 Apr 2016 20:07:03 +0200 +Subject: documentation +Some documentation fixes + +- add @dircategory / @direntry (found by Lintian) +- fix wrong section level +- use makeinfo instead of obsolete texi2html +--- + docs/makefile | 4 +--- + docs/usermanual.texi | 11 ++++++++--- + 2 files changed, 9 insertions(+), 6 deletions(-) + +diff --git a/docs/makefile b/docs/makefile +index f02e4aa..cb2dd37 100644 --- a/docs/makefile +++ b/docs/makefile -@@ -23,9 +23,7 @@ +@@ -23,9 +23,7 @@ usermanual.pdf: usermanual.ps usermanual.dvi html/usermanual_1.html: usermanual.texi for d in html; do [ -d $$d ] || mkdir -p $$d || exit 1; done @@ -17,6 +27,8 @@ ship: -rm -f *.{aux,cp,cps,dvi,fn,ky,log,pg,toc,tp,vr} +diff --git a/docs/usermanual.texi b/docs/usermanual.texi +index 1ca3600..9bf40c4 100644 --- a/docs/usermanual.texi +++ b/docs/usermanual.texi @@ -5,6 +5,11 @@ @@ -31,7 +43,7 @@ @iftex @vsize = 8.9 in @parskip = 7 pt -@@ -2875,7 +2880,7 @@ +@@ -2875,7 +2880,7 @@ must be integers. @node AND, OR, LOGICAL OPERATIONS, LOGICAL OPERATIONS @@ -40,7 +52,7 @@ @cindex and @example -@@ -6766,7 +6771,7 @@ +@@ -6766,7 +6771,7 @@ either that template's value is @code{TRUE} or the inbasket is used up. @end menu @node dMACRO, dDEFMACRO, MACROS, MACROS @@ -49,7 +61,7 @@ @cindex .macro @cindex .defmacro -@@ -7128,7 +7133,7 @@ +@@ -7128,7 +7133,7 @@ except for @code{ALLOWGETSET}, @code{CASEIGNOREDP}, and @node ALLOWGETSET, BUTTONACT, SPECIAL VARIABLES, SPECIAL VARIABLES @comment node-name, next, previous, up diff -Nru ucblogo-6.0+dfsg/debian/patches/fix_ftbfs_lp64.patch ucblogo-6.0+dfsg/debian/patches/fix_ftbfs_lp64.patch --- ucblogo-6.0+dfsg/debian/patches/fix_ftbfs_lp64.patch 2016-04-14 17:22:50.000000000 +0000 +++ ucblogo-6.0+dfsg/debian/patches/fix_ftbfs_lp64.patch 2018-02-16 15:26:54.000000000 +0000 @@ -1,10 +1,23 @@ -From: Jan Rękorajski -Subject: fixes build on LP64 platforms, like x86_64) +From: =?utf-8?q?Jan_R=C4=99korajski?= +Date: Sun, 19 May 2013 08:45:54 +0000 +Subject: print pointers long + +printf pointers as longs + +add lp64 (fixes build on LP64 platforms, like x86_64) + +Import patch to fix building on 64 bit architectures. + Origin: https://git.pld-linux.org/gitweb.cgi?p=packages/ucblogo.git;a=commitdiff;h=173b5aa26229130a42c885a89f0375504820b970 +--- + wxTerminal.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +diff --git a/wxTerminal.cpp b/wxTerminal.cpp +index 898badc..ba89536 100644 --- a/wxTerminal.cpp +++ b/wxTerminal.cpp -@@ -2202,7 +2202,7 @@ +@@ -2202,7 +2202,7 @@ void wxTerminal::DebugOutputBuffer() { lpos.offset = 0; wxterm_charpos pos_1 = line_of(lpos); @@ -13,7 +26,7 @@ fprintf(stderr, "WXTERMINAL CHARACTER BUFFER\n###############\n"); while(char_of(pos_1) != '\0') { if(char_of(pos_1) == '\n') { -@@ -2218,7 +2218,7 @@ +@@ -2218,7 +2218,7 @@ void wxTerminal::DebugOutputBuffer() { fprintf(stderr, "\n#############\n"); fprintf(stderr, "WXTERMINAL LINE BUFFER\n##############\n"); for(int i = 0; i <= y_max; i++) { diff -Nru ucblogo-6.0+dfsg/debian/patches/fix_ftbfs.patch ucblogo-6.0+dfsg/debian/patches/fix_ftbfs.patch --- ucblogo-6.0+dfsg/debian/patches/fix_ftbfs.patch 2016-04-14 17:22:50.000000000 +0000 +++ ucblogo-6.0+dfsg/debian/patches/fix_ftbfs.patch 2018-02-16 15:26:54.000000000 +0000 @@ -1,10 +1,20 @@ -Author: Adam Borowski -Description: Fix FTBFS with glibc 2.22 +From: Adam Borowski +Date: Sun, 10 Apr 2016 17:59:02 +0200 +Subject: glibc 2.22 + +Fix FTBFS with glibc 2.22 + Bug-Debian: https://bugs.debian.org/811956 +--- + coms.c | 2 +- + graphics.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +diff --git a/coms.c b/coms.c +index 3477af9..759b56e 100644 --- a/coms.c +++ b/coms.c -@@ -25,9 +25,9 @@ +@@ -25,9 +25,9 @@ extern int check_wx_stop(int force_yield); #endif #define WANT_EVAL_REGS 1 @@ -15,6 +25,8 @@ #ifdef HAVE_UNISTD_H #include #endif +diff --git a/graphics.c b/graphics.c +index 4632db2..2f81169 100644 --- a/graphics.c +++ b/graphics.c @@ -24,9 +24,9 @@ diff -Nru ucblogo-6.0+dfsg/debian/patches/fix_keyp_64bit.patch ucblogo-6.0+dfsg/debian/patches/fix_keyp_64bit.patch --- ucblogo-6.0+dfsg/debian/patches/fix_keyp_64bit.patch 2016-04-14 17:22:50.000000000 +0000 +++ ucblogo-6.0+dfsg/debian/patches/fix_keyp_64bit.patch 2018-02-16 15:26:54.000000000 +0000 @@ -1,10 +1,19 @@ -Author: Panu Kalliokoski -Description: fix keyp on 64-bit architectures +From: Panu Kalliokoski +Date: Sun, 10 Apr 2016 17:59:02 +0200 +Subject: ioctl request type + +fix keyp on 64-bit architectures + Bug-Debian: https://bugs.debian.org/744802 +--- + files.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +diff --git a/files.c b/files.c +index 64f1bc6..be3a7de 100644 --- a/files.c +++ b/files.c -@@ -689,7 +689,7 @@ +@@ -689,7 +689,7 @@ NODE *leofp(NODE *args) { NODE *lkeyp(NODE *args) { #if defined(unix) | defined(__WXMSW__) diff -Nru ucblogo-6.0+dfsg/debian/patches/makefile_target.patch ucblogo-6.0+dfsg/debian/patches/makefile_target.patch --- ucblogo-6.0+dfsg/debian/patches/makefile_target.patch 2016-04-14 17:22:50.000000000 +0000 +++ ucblogo-6.0+dfsg/debian/patches/makefile_target.patch 2018-02-16 15:26:54.000000000 +0000 @@ -1,10 +1,19 @@ -Author: Reiner Herrmann -Description: Rename Makefile target to 'all' - - rename binary to ucblogo +From: Reiner Herrmann +Date: Sun, 10 Apr 2016 21:06:43 +0200 +Subject: makefile binary name +Rename Makefile target to 'all' + +rename binary to ucblogo +--- + makefile.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/makefile.in b/makefile.in +index 7c0fde1..a2e12d3 100644 --- a/makefile.in +++ b/makefile.in -@@ -21,10 +21,10 @@ +@@ -21,10 +21,10 @@ SRCS = coms.c error.c eval.c files.c graphics.c init.c intern.c \ HDRS = globals.h logo.h xgraphics.h diff -Nru ucblogo-6.0+dfsg/debian/patches/reproducible_build.patch ucblogo-6.0+dfsg/debian/patches/reproducible_build.patch --- ucblogo-6.0+dfsg/debian/patches/reproducible_build.patch 2016-04-14 17:22:50.000000000 +0000 +++ ucblogo-6.0+dfsg/debian/patches/reproducible_build.patch 2018-02-16 15:26:54.000000000 +0000 @@ -1,9 +1,17 @@ -Author: Reiner Herrmann -Description: use C locale for sorting to get reproducible build +From: Reiner Herrmann +Date: Sun, 10 Apr 2016 21:40:42 +0200 +Subject: set locale +Use C locale for sorting to get reproducible build. +--- + makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/makefile.in b/makefile.in +index baaec6b..8831d99 100644 --- a/makefile.in +++ b/makefile.in -@@ -54,7 +54,7 @@ +@@ -54,7 +54,7 @@ helpfiles: helpfiles/HELPCONTENTS: makehelp usermanual ./makehelp diff -Nru ucblogo-6.0+dfsg/debian/patches/series ucblogo-6.0+dfsg/debian/patches/series --- ucblogo-6.0+dfsg/debian/patches/series 2016-04-14 17:22:50.000000000 +0000 +++ ucblogo-6.0+dfsg/debian/patches/series 2018-02-16 15:26:54.000000000 +0000 @@ -6,3 +6,4 @@ strip_svn_version.patch reproducible_build.patch documentation.patch +0009-configure-option-runstatedir.patch diff -Nru ucblogo-6.0+dfsg/debian/patches/strip_svn_version.patch ucblogo-6.0+dfsg/debian/patches/strip_svn_version.patch --- ucblogo-6.0+dfsg/debian/patches/strip_svn_version.patch 2016-04-14 17:22:50.000000000 +0000 +++ ucblogo-6.0+dfsg/debian/patches/strip_svn_version.patch 2018-02-16 15:26:54.000000000 +0000 @@ -1,9 +1,22 @@ -Author: Reiner Herrmann -Description: Don't include unavailable svn info in version +From: Reiner Herrmann +Date: Sun, 10 Apr 2016 21:01:57 +0200 +Subject: no svn +Don't include unavailable svn info in version. + +Strip unavailable svn information. + +(Consider adding git commit id.) +--- + main.c | 4 ---- + makefile.in | 2 +- + 2 files changed, 1 insertion(+), 5 deletions(-) + +diff --git a/main.c b/main.c +index ad14663..c4956ec 100644 --- a/main.c +++ b/main.c -@@ -270,14 +270,10 @@ +@@ -270,14 +270,10 @@ int main(int argc, char *argv[]) { if (1 || isatty(1)) // fix this. for interactive from menu bar. #endif { @@ -18,9 +31,11 @@ #else strcpy(version,"5.6"); #endif +diff --git a/makefile.in b/makefile.in +index a2e12d3..baaec6b 100644 --- a/makefile.in +++ b/makefile.in -@@ -13,7 +13,7 @@ +@@ -13,7 +13,7 @@ LINKER = @LINKER@ OBJS = coms.o error.o eval.o files.o graphics.o init.o intern.o \ libloc.o lists.o logodata.o main.o math.o mem.o paren.o parse.o \ diff -Nru ucblogo-6.0+dfsg/debian/patches/wx3.0.patch ucblogo-6.0+dfsg/debian/patches/wx3.0.patch --- ucblogo-6.0+dfsg/debian/patches/wx3.0.patch 2016-04-14 17:22:50.000000000 +0000 +++ ucblogo-6.0+dfsg/debian/patches/wx3.0.patch 2018-02-16 15:26:54.000000000 +0000 @@ -1,10 +1,19 @@ -From: Jan Rękorajski -Subject: fix build with wxWidgets 3.0 -Origin: https://git.pld-linux.org/gitweb.cgi?p=packages/ucblogo.git;a=commitdiff;h=4ffabd4aa70fe812d395dbabbdbb9cefcd3a4c9f +From: =?utf-8?q?Jan_R=C4=99korajski?= +Date: Sun, 10 Apr 2016 19:42:52 +0200 +Subject: wxWidgets 3.0 +fix build with wxWidgets 3.0 + +Build with wxWidgets support. +--- + wxTerminal.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/wxTerminal.cpp b/wxTerminal.cpp +index 291fadf..898badc 100644 --- a/wxTerminal.cpp +++ b/wxTerminal.cpp -@@ -506,7 +506,7 @@ +@@ -506,7 +506,7 @@ void LogoFrame::OnSaveAs(wxCommandEvent& WXUNUSED(event)) { #else wxStandardPaths::Get().GetDocumentsDir() : #endif @@ -13,7 +22,7 @@ wxEmptyString, _T("Logo workspaces(*.lg)|*.lg|All files(*)|*"), // "*", -@@ -542,7 +542,7 @@ +@@ -542,7 +542,7 @@ void LogoFrame::OnLoad(wxCommandEvent& WXUNUSED(event)){ #else wxStandardPaths::Get().GetDocumentsDir() : #endif diff -Nru ucblogo-6.0+dfsg/debian/rules ucblogo-6.0+dfsg/debian/rules --- ucblogo-6.0+dfsg/debian/rules 2016-04-14 17:22:50.000000000 +0000 +++ ucblogo-6.0+dfsg/debian/rules 2018-02-16 15:26:54.000000000 +0000 @@ -1,15 +1,14 @@ #!/usr/bin/make -f export DEB_BUILD_MAINT_OPTIONS = hardening=+all -export DH_ALWAYS_EXCLUDE=CVS:.svn %: # don't autoreconf, as configure is newer than configure.in # -> configure.in doesn't contain wxwidgets related checks - dh $@ --parallel --without autoreconf + dh $@ --without autoreconf override_dh_auto_configure: - dh_auto_configure -- --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib --wx-enable --wx-config_path=/usr/bin/wx-config + dh_auto_configure -- --wx-enable --wx-config_path=wx-config override_dh_auto_build: dh_auto_build -- LIBLOC=/usr/share/ucblogo