diff -Nru motif-2.3.8/debian/changelog motif-2.3.8/debian/changelog --- motif-2.3.8/debian/changelog 2018-02-20 07:06:00.000000000 +0000 +++ motif-2.3.8/debian/changelog 2020-07-02 09:30:19.000000000 +0000 @@ -1,8 +1,24 @@ -motif (2.3.8-2build1) bionic; urgency=medium +motif (2.3.8-3) unstable; urgency=medium - * No-change rebuild to pick up the shared flex library. + [ Graham Inggs ] + * Switch to debhelper 13, add debian/not-installed + * Drop dh-exec, not needed with debhelper 13 + * Do not link with -Wl,--as-needed, it is now the default + * Set Rules-Requires-Root: no + * Add Build-Depends-Package: libmotif-dev to symbols files + * Use secure URIs in debian/watch and upstream Homepage + * Fix more spelling errors in manpages, thanks Lintian + * Bump Standards-Version to 4.5.0, no changes + + [ Helmut Grohne ] + * Fix AC_CHECK_FILE abuse (Closes: #928872) + + [ Debian Janitor ] + * Bump debhelper from old 11 to 12. + * Set debhelper-compat version in Build-Depends. + * Fix day-of-week for changelog entry 2.3.3-1. - -- Matthias Klose Tue, 20 Feb 2018 07:06:00 +0000 + -- Graham Inggs Thu, 02 Jul 2020 09:30:19 +0000 motif (2.3.8-2) unstable; urgency=medium @@ -306,7 +322,7 @@ * Drop patch for autoconf-bug as this was fixed upstream * Applied patch to fix implicit pointer conversion (Closes: #587461) - -- Stefan Bauer Sat, 29 Jun 2010 09:42:21 +0200 + -- Stefan Bauer Tue, 29 Jun 2010 09:42:21 +0200 openmotif (2.3.0-1) unstable; urgency=low diff -Nru motif-2.3.8/debian/compat motif-2.3.8/debian/compat --- motif-2.3.8/debian/compat 2018-02-17 15:34:08.000000000 +0000 +++ motif-2.3.8/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -11 diff -Nru motif-2.3.8/debian/control motif-2.3.8/debian/control --- motif-2.3.8/debian/control 2018-02-17 15:34:08.000000000 +0000 +++ motif-2.3.8/debian/control 2020-07-02 09:29:06.000000000 +0000 @@ -2,8 +2,7 @@ Section: x11 Priority: optional Build-Depends: byacc, - debhelper (>= 11), - dh-exec, + debhelper-compat (= 13), flex, libfl-dev (>= 2.6.1), libfontconfig1-dev, @@ -19,8 +18,9 @@ xbitmaps Maintainer: Graham Inggs Uploaders: Paul Gevers -Standards-Version: 4.1.3 -Homepage: http://motif.ics.com/ +Standards-Version: 4.5.0 +Rules-Requires-Root: no +Homepage: https://motif.ics.com/ Vcs-Browser: https://salsa.debian.org/debian/motif Vcs-Git: https://salsa.debian.org/debian/motif.git diff -Nru motif-2.3.8/debian/libmrm4.links motif-2.3.8/debian/libmrm4.links --- motif-2.3.8/debian/libmrm4.links 2017-12-16 14:03:23.000000000 +0000 +++ motif-2.3.8/debian/libmrm4.links 2020-07-02 08:08:17.000000000 +0000 @@ -1,3 +1 @@ -#! /usr/bin/dh-exec usr/lib/${DEB_HOST_MULTIARCH}/libMrm.so.4.0.4 usr/lib/${DEB_HOST_MULTIARCH}/libMrm.so.3 - diff -Nru motif-2.3.8/debian/libmrm4.symbols motif-2.3.8/debian/libmrm4.symbols --- motif-2.3.8/debian/libmrm4.symbols 2017-12-16 14:03:23.000000000 +0000 +++ motif-2.3.8/debian/libmrm4.symbols 2020-07-02 08:51:54.000000000 +0000 @@ -1,4 +1,5 @@ libMrm.so.4 libmrm4 #MINVER# +* Build-Depends-Package: libmotif-dev (optional)Idb__BM_Decommit@Base 2.3.4 (optional)Idb__BM_DecommitAll@Base 2.3.4 (optional)Idb__BM_GetBuffer@Base 2.3.4 diff -Nru motif-2.3.8/debian/libuil4.links motif-2.3.8/debian/libuil4.links --- motif-2.3.8/debian/libuil4.links 2017-12-16 14:03:23.000000000 +0000 +++ motif-2.3.8/debian/libuil4.links 2020-07-02 08:08:17.000000000 +0000 @@ -1,3 +1 @@ -#! /usr/bin/dh-exec usr/lib/${DEB_HOST_MULTIARCH}/libUil.so.4.0.4 usr/lib/${DEB_HOST_MULTIARCH}/libUil.so.3 - diff -Nru motif-2.3.8/debian/libuil4.symbols motif-2.3.8/debian/libuil4.symbols --- motif-2.3.8/debian/libuil4.symbols 2017-12-16 14:03:23.000000000 +0000 +++ motif-2.3.8/debian/libuil4.symbols 2020-07-02 08:52:21.000000000 +0000 @@ -1,4 +1,5 @@ libUil.so.4 libuil4 #MINVER# +* Build-Depends-Package: libmotif-dev Uil@Base 2.3.4 UilDumpSymbolTable@Base 2.3.4 (optional)Uil_characters_read@Base 2.3.4 diff -Nru motif-2.3.8/debian/libxm4.links motif-2.3.8/debian/libxm4.links --- motif-2.3.8/debian/libxm4.links 2017-12-16 14:03:23.000000000 +0000 +++ motif-2.3.8/debian/libxm4.links 2020-07-02 08:08:17.000000000 +0000 @@ -1,3 +1 @@ -#! /usr/bin/dh-exec usr/lib/${DEB_HOST_MULTIARCH}/libXm.so.4.0.4 usr/lib/${DEB_HOST_MULTIARCH}/libXm.so.3 - diff -Nru motif-2.3.8/debian/libxm4.symbols motif-2.3.8/debian/libxm4.symbols --- motif-2.3.8/debian/libxm4.symbols 2017-12-16 14:03:23.000000000 +0000 +++ motif-2.3.8/debian/libxm4.symbols 2020-07-02 08:52:29.000000000 +0000 @@ -1,4 +1,5 @@ libXm.so.4 libxm4 #MINVER# +* Build-Depends-Package: libmotif-dev (optional)GetWidgetNavigPtrs@Base 2.3.4 (optional)InitializeScrollBars@Base 2.3.4 NumLockMask@Base 2.3.3 diff -Nru motif-2.3.8/debian/mwm.install motif-2.3.8/debian/mwm.install --- motif-2.3.8/debian/mwm.install 2017-12-16 14:03:23.000000000 +0000 +++ motif-2.3.8/debian/mwm.install 2020-07-02 07:44:02.000000000 +0000 @@ -1,8 +1,7 @@ -#! /usr/bin/dh-exec +/etc/X11/mwm/system.mwmrc-menu /usr/bin/mwm /usr/bin/xmbind /usr/share/man/man1/mwm* /usr/share/man/man1/xmbind* /usr/share/man/man4 debian/mwm.desktop usr/share/xsessions -clients/mwm/system.mwmrc => /etc/X11/mwm/system.mwmrc-menu diff -Nru motif-2.3.8/debian/not-installed motif-2.3.8/debian/not-installed --- motif-2.3.8/debian/not-installed 1970-01-01 00:00:00.000000000 +0000 +++ motif-2.3.8/debian/not-installed 2020-07-02 07:26:07.000000000 +0000 @@ -0,0 +1,3 @@ +usr/share/Xm +usr/share/man/manm +usr/lib/${DEB_HOST_MULTIARCH}/*.la diff -Nru motif-2.3.8/debian/patches/cast-size_t-to-int.patch motif-2.3.8/debian/patches/cast-size_t-to-int.patch --- motif-2.3.8/debian/patches/cast-size_t-to-int.patch 2017-12-16 13:32:57.000000000 +0000 +++ motif-2.3.8/debian/patches/cast-size_t-to-int.patch 2020-07-01 12:22:00.000000000 +0000 @@ -1,8 +1,10 @@ Description: To prevent build failure during building with Hardening options enabled due to "format '%d' expects argument of type 'int', but argument 5 has type 'size_t'", the fifth argument is cast to integer on the input. +Forwarded: http://bugs.motifzone.net/show_bug.cgi?id=1711 Author: Paul Gevers Updated: 2017-08-03 + --- a/tools/wml/wmloutkey.c +++ b/tools/wml/wmloutkey.c @@ -621,7 +621,7 @@ diff -Nru motif-2.3.8/debian/patches/cross.patch motif-2.3.8/debian/patches/cross.patch --- motif-2.3.8/debian/patches/cross.patch 1970-01-01 00:00:00.000000000 +0000 +++ motif-2.3.8/debian/patches/cross.patch 2020-07-02 09:03:44.000000000 +0000 @@ -0,0 +1,21 @@ +Description: Fix AC_CHECK_FILE abuse +Bug-Debian: https://bugs.debian.org/928872 +Forwarded: http://bugs.motifzone.net/show_bug.cgi?id=1710 +Author: Helmut Grohne +Last-Update: 2019-05-12 + +--- a/configure.ac ++++ b/configure.ac +@@ -8,10 +8,10 @@ + AM_INIT_AUTOMAKE([foreign no-define]) + dnl AM_MAINTAINER_MODE + +-AC_CHECK_FILE(/usr/X/include/X11/X.h, ++AS_IF([test -f "/usr/X/include/X11/X.h"], + AC_PREFIX_DEFAULT(/usr/X), + AC_PREFIX_DEFAULT(/usr)) +-AC_CHECK_FILE(/usr/X11R6/include/X11/X.h, ++AS_IF([test -f "/usr/X11R6/include/X11/X.h"], + AC_PREFIX_DEFAULT(/usr/X11R6), + AC_PREFIX_DEFAULT(/usr)) + diff -Nru motif-2.3.8/debian/patches/fix_lintian_reported_manpage_typos.patch motif-2.3.8/debian/patches/fix_lintian_reported_manpage_typos.patch --- motif-2.3.8/debian/patches/fix_lintian_reported_manpage_typos.patch 2017-12-16 13:32:57.000000000 +0000 +++ motif-2.3.8/debian/patches/fix_lintian_reported_manpage_typos.patch 2020-07-02 09:23:32.000000000 +0000 @@ -3,7 +3,8 @@ Author: Paul Gevers Author: Graham Inggs Forwarded: http://bugs.motifzone.net/show_bug.cgi?id=1587 -Last-update: 2017-08-03 +Last-update: 2020-07-02 + --- a/doc/man/man1/mwm.1 +++ b/doc/man/man1/mwm.1 @@ -359,7 +359,7 @@ @@ -270,3 +271,58 @@ .PP .nf \f(CW ! icon\&.xpm is 30x30 pixels +--- a/doc/man/man3/XmContainer.3 ++++ b/doc/man/man3/XmContainer.3 +@@ -1207,7 +1207,7 @@ + is a pointer to the \fBXmDropProcCallbackStruct\fR passed to the + \fBXmNdropProc\fP procedure\&. + When the selection is \fBSECONDARY\fP, \fIdestination_data\fP is an Atom +-representing a target recommmended by the selection owner for use in ++representing a target recommended by the selection owner for use in + converting the selection\&. + Otherwise, \fIdestination_data\fP is NULL\&. + .IP "\fBlocation_data\fP" 10 +--- a/doc/man/man3/XmDrawingArea.3 ++++ b/doc/man/man3/XmDrawingArea.3 +@@ -512,7 +512,7 @@ + is a pointer to the \fBXmDropProcCallbackStruct\fR passed to the + \fBXmNdropProc\fP procedure\&. + When the selection is \fBSECONDARY\fP, \fIdestination_data\fP is an Atom +-representing a target recommmended by the selection owner for use in ++representing a target recommended by the selection owner for use in + converting the selection\&. + Otherwise, \fIdestination_data\fP is NULL\&. + .IP "\fBlocation_data\fP" 10 +--- a/doc/man/man3/XmList.3 ++++ b/doc/man/man3/XmList.3 +@@ -902,7 +902,7 @@ + is a pointer to the \fBXmDropProcCallbackStruct\fR passed to the + \fBXmNdropProc\fP procedure\&. + When the selection is \fBSECONDARY\fP, \fIdestination_data\fP is an Atom +-representing a target recommmended by the selection owner for use in ++representing a target recommended by the selection owner for use in + converting the selection\&. + Otherwise, \fIdestination_data\fP is NULL\&. + .IP "\fBlocation_data\fP" 10 +--- a/doc/man/man3/XmText.3 ++++ b/doc/man/man3/XmText.3 +@@ -1058,7 +1058,7 @@ + When the selection is \fBSECONDARY\fP, + \fIdestination_data\fP + is an Atom +-representing a target recommmended by the selection owner for use in ++representing a target recommended by the selection owner for use in + converting the selection\&. + Otherwise, \fIdestination_data\fP is NULL\&. + .IP "\fBlocation_data\fP" 10 +--- a/doc/man/man3/XmTextField.3 ++++ b/doc/man/man3/XmTextField.3 +@@ -879,7 +879,7 @@ + When the selection is \fBSECONDARY\fP, + \fIdestination_data\fP + is an Atom +-representing a target recommmended by the selection owner for use in ++representing a target recommended by the selection owner for use in + converting the selection\&. + Otherwise, \fIdestination_data\fP is NULL\&. + .IP "\fBlocation_data\fP" 10 diff -Nru motif-2.3.8/debian/patches/series motif-2.3.8/debian/patches/series --- motif-2.3.8/debian/patches/series 2017-12-16 14:07:51.000000000 +0000 +++ motif-2.3.8/debian/patches/series 2020-07-02 08:59:29.000000000 +0000 @@ -16,3 +16,4 @@ fix-type-inconsistencies.patch pass-hardening-flags.patch revert-fix-1617.patch +cross.patch diff -Nru motif-2.3.8/debian/rules motif-2.3.8/debian/rules --- motif-2.3.8/debian/rules 2018-02-17 15:34:08.000000000 +0000 +++ motif-2.3.8/debian/rules 2020-07-02 08:34:52.000000000 +0000 @@ -1,15 +1,11 @@ #!/usr/bin/make -f export DEB_CFLAGS_MAINT_APPEND=-D_FILE_OFFSET_BITS=64 -export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed export DEB_BUILD_MAINT_OPTIONS=hardening=+all %: dh $@ -override_dh_autoreconf: - dh_autoreconf --as-needed - override_dh_auto_configure: dh_auto_configure -- \ --disable-printing \ @@ -21,6 +17,10 @@ --with-x11rgbdir="/etc/X11" override_dh_install: + # MWM needs a copy of system.mwmrc named system.mwmrc-menu + # as a template for update-menus + mv debian/tmp/etc/X11/mwm/system.mwmrc debian/tmp/etc/X11/mwm/system.mwmrc-menu + # Fixing several man page warnings until proper sources are found # Comments generated by very old docbook2man were ...\" instead of .\" # For proper indexing you probably need to define the IX macro properly diff -Nru motif-2.3.8/debian/watch motif-2.3.8/debian/watch --- motif-2.3.8/debian/watch 2017-12-16 14:03:23.000000000 +0000 +++ motif-2.3.8/debian/watch 2020-07-02 09:10:07.000000000 +0000 @@ -1,2 +1,2 @@ version=3 -http://qa.debian.org/watch/sf.php/motif/motif-(\d.*)(?:-src|)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz)) +https://qa.debian.org/watch/sf.php/motif/motif-(\d.*)(?:-src|)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))