diff -Nru vbetool-1.1/debian/changelog vbetool-1.1/debian/changelog --- vbetool-1.1/debian/changelog 2012-12-15 21:29:39.000000000 +0000 +++ vbetool-1.1/debian/changelog 2016-07-04 23:42:59.000000000 +0000 @@ -1,3 +1,26 @@ +vbetool (1.1-4) unstable; urgency=medium + + * QA upload. + * Migrations: + - debian/copyright to 1.0 format. + - Using dh-autoreconf now. + * debian/control: + - Added the architecture x32. Thanks to Adam Borowski. (Closes: #777386) + - Bumped Standards-Version to 3.9.8. + - Removed the unknown architecture lpia. + * debian/copyright: updated all data. + * debian/patches: + - Added a header to the patch 00_misc_fixes.diff. + - Created the patch 01_fix_manpage.diff to fix some typos and to correct + the section of manpage. Thanks to Filipus Klutiero. (Closes: #567177) + - Fixed the patch 00_misc_fixes.diff to use autoreconf. + * debian/rules: + - Added the DEB_BUILD_MAINT_OPTIONS variable to improve the GCC hardening. + - Added the override_dh_installman to put the manpage in right path. + * debian/watch: updated to version 4. + + -- Raphael Mota Ramos Mon, 04 Jul 2016 20:41:21 -0300 + vbetool (1.1-3) unstable; urgency=low * QA upload. @@ -138,4 +161,3 @@ * Initial Release. Closes: #284909 -- Matthew Garrett Thu, 30 Dec 2004 15:16:39 +0000 - diff -Nru vbetool-1.1/debian/control vbetool-1.1/debian/control --- vbetool-1.1/debian/control 2012-12-15 17:25:13.000000000 +0000 +++ vbetool-1.1/debian/control 2016-06-17 19:18:15.000000000 +0000 @@ -2,14 +2,17 @@ Section: utils Priority: optional Maintainer: Debian QA Group -Build-Depends: debhelper (>= 9), libx86-dev, libpci-dev -Standards-Version: 3.8.0 +Build-Depends: debhelper (>= 9), + dh-autoreconf, + libx86-dev, + libpci-dev +Standards-Version: 3.9.8 Homepage: http://www.codon.org.uk/~mjg59/vbetool/ Vcs-Git: http://git.brad-smith.co.uk/git/debian-old/pkg-vbetool.git Vcs-Browser: http://git.brad-smith.co.uk/?p=debian-old/pkg-vbetool.git Package: vbetool -Architecture: i386 amd64 lpia kfreebsd-i386 kfreebsd-amd64 +Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 x32 Depends: ${shlibs:Depends}, ${misc:Depends} Description: run real-mode video BIOS code to alter hardware state vbetool uses lrmi in order to run code from the video BIOS. Currently, it diff -Nru vbetool-1.1/debian/copyright vbetool-1.1/debian/copyright --- vbetool-1.1/debian/copyright 2012-12-11 15:33:05.000000000 +0000 +++ vbetool-1.1/debian/copyright 2016-07-04 23:44:08.000000000 +0000 @@ -1,26 +1,60 @@ -Author: Matthew Garrett -Download: http://www.codon.org.uk/~mjg59/vbetool/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: vbetool +Source: http://www.codon.org.uk/~mjg59/vbetool/ Files: * -Copyright: - Matthew Garrett , heavily based on vbetest.c from the - lrmi package and read-edid.c by John Fremlin +Copyright: ? Matthew Garrett License: GPL-2 - This program is free software; you can redistribute it and/or modify + +Files: include/fpu_regs.h + include/regs.h + include/types.h + include/x86emu.h + include/xf86int10.h + include/xf86x86emu.h +Copyright: ? David Mosberger-Tang + ? Kendall Bennett + 1996-1999 SciTech Software, Inc. + 1999 Egbert Eich + 2005 Jonathan McDowell +License: MIT-variant + +Files: include/lrmi.h + x86-common.c + x86-common.h +Copyright: 1998 Josh Vanderhoof + 2005 Jonathan McDowell +License: MIT + +Files: debian/* +Copyright: 2004-2007 Matthew Garrett + 2006 Julien Cristau + 2006 Paul Sladen + 2006 Raphael Hertzog + 2007 Philipp Kern + 2008 Anibal Monsalve Salazar + 2008-2009 Bradley Smith + 2012 Frank Lichtenheld + 2016 Raphael Mota Ramos +License: GPL-2+ + +License: GPL-2 or GPL-2+ + This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. . - This program is distributed in the hope that it will be useful, + This package is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". -Files: - x86-common.h - x86-common.c -Copyright: - (C) 1998 by Josh Vanderhoof - (C) 2005 by Jonathan McDowell License: MIT Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), @@ -40,18 +74,20 @@ OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -Files: debian/* -Copyright: (C) 2008 Bradley Smith -License: GPL-2+. - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. +License: MIT-variant + Permission to use, copy, modify, and distribute this software and its + documentation for any purpose and without fee is hereby granted, provided + that the above copyright notice appear in all copies and that both that + copyright notice and this permission notice appear in supporting + documentation, and that the name of the authors not be used in advertising + or publicity pertaining to distribution of the software without specific, + written prior permission. The authors makes no representations about the + suitability of this software for any purpose. It is provided "as is" + without express or implied warranty. . - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - -On Debian systems, the complete text of the GNU General Public License -can be found in `/usr/share/common-licenses/GPL-2'. + THE AUTHORS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING + ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL + THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR + ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER + IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff -Nru vbetool-1.1/debian/patches/00_misc_fixes.diff vbetool-1.1/debian/patches/00_misc_fixes.diff --- vbetool-1.1/debian/patches/00_misc_fixes.diff 2012-12-15 21:27:59.000000000 +0000 +++ vbetool-1.1/debian/patches/00_misc_fixes.diff 2016-07-04 23:44:33.000000000 +0000 @@ -1,3 +1,7 @@ +Description: build on kfreebsd-amd64 +Author: Petr Salinger +Last-Update: 2007-05-17 + Index: vbetool-1.1/Makefile.am =================================================================== --- vbetool-1.1.orig/Makefile.am 2008-05-16 14:52:33.000000000 +0200 @@ -16,553 +20,3 @@ AM_CFLAGS = -g -Wall -pedantic -std=gnu99 -AM_LDFLAGS = -lz -lx86 -Index: vbetool-1.1/Makefile.in -=================================================================== ---- vbetool-1.1.orig/Makefile.in 2008-05-16 14:52:38.000000000 +0200 -+++ vbetool-1.1/Makefile.in 2010-12-12 03:39:01.470851002 +0100 -@@ -1,8 +1,9 @@ --# Makefile.in generated by automake 1.10.1 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -+# Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -17,8 +18,9 @@ - - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ --pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ -+pkglibdir = $(libdir)/@PACKAGE@ -+pkglibexecdir = $(libexecdir)/@PACKAGE@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd - install_sh_DATA = $(install_sh) -c -m 644 - install_sh_PROGRAM = $(install_sh) -c -@@ -45,21 +47,43 @@ - configure.lineno config.status.lineno - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_CLEAN_FILES = -+CONFIG_CLEAN_VPATH_FILES = - am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man1dir)" --sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM) - PROGRAMS = $(sbin_PROGRAMS) - am_vbetool_OBJECTS = vbetool.$(OBJEXT) - vbetool_OBJECTS = $(am_vbetool_OBJECTS) --vbetool_DEPENDENCIES = $(libdir)/libpci.a -+vbetool_DEPENDENCIES = - DEFAULT_INCLUDES = -I.@am__isrc@ - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles -+am__mv = mv -f - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) - LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ - SOURCES = $(vbetool_SOURCES) - DIST_SOURCES = $(vbetool_SOURCES) -+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -+am__vpath_adj = case $$p in \ -+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -+ *) f=$$p;; \ -+ esac; -+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -+am__install_max = 40 -+am__nobase_strip_setup = \ -+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -+am__nobase_strip = \ -+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -+am__nobase_list = $(am__nobase_strip_setup); \ -+ for p in $$list; do echo "$$p $$p"; done | \ -+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ -+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ -+ if (++n[$$2] == $(am__install_max)) \ -+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ -+ END { for (dir in files) print dir, files[dir] }' -+am__base_list = \ -+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ -+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' - man1dir = $(mandir)/man1 - NROFF = nroff - MANS = $(man_MANS) -@@ -70,9 +94,9 @@ - distdir = $(PACKAGE)-$(VERSION) - top_distdir = $(distdir) - am__remove_distdir = \ -- { test ! -d $(distdir) \ -- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ -- && rm -fr $(distdir); }; } -+ { test ! -d "$(distdir)" \ -+ || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ -+ && rm -fr "$(distdir)"; }; } - DIST_ARCHIVES = $(distdir).tar.gz - GZIP_ENV = --best - distuninstallcheck_listfiles = find . -type f -print -@@ -111,6 +135,7 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - SET_MAKE = @SET_MAKE@ -@@ -156,16 +181,16 @@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ -+top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - AUTOMAKE_OPTIONS = foreign --vbetool_LDADD = $(libdir)/libpci.a -+vbetool_LDADD = -lx86 -lpci - man_MANS = vbetool.1 - vbetool_SOURCES = vbetool.c $(x86) - noinst_HEADERS = vbetool.h - EXTRA_DIST = vbetool.1 LRMI - AM_CFLAGS = -g -Wall -pedantic -std=gnu99 --AM_LDFLAGS = -lz -lx86 - all: all-am - - .SUFFIXES: -@@ -176,15 +201,15 @@ - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ -- echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \ -- cd $(srcdir) && $(AUTOMAKE) --foreign \ -+ echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \ -+ $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ -- cd $(top_srcdir) && \ -- $(AUTOMAKE) --foreign Makefile -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ -+ $(am__cd) $(top_srcdir) && \ -+ $(AUTOMAKE) --foreign Makefile - .PRECIOUS: Makefile - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ -@@ -200,29 +225,44 @@ - $(SHELL) ./config.status --recheck - - $(top_srcdir)/configure: $(am__configure_deps) -- cd $(srcdir) && $(AUTOCONF) -+ $(am__cd) $(srcdir) && $(AUTOCONF) - $(ACLOCAL_M4): $(am__aclocal_m4_deps) -- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -+ $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -+$(am__aclocal_m4_deps): - install-sbinPROGRAMS: $(sbin_PROGRAMS) - @$(NORMAL_INSTALL) - test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)" -- @list='$(sbin_PROGRAMS)'; for p in $$list; do \ -- p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ -- if test -f $$p \ -- ; then \ -- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ -- echo " $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \ -- $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \ -- else :; fi; \ -- done -+ @list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \ -+ for p in $$list; do echo "$$p $$p"; done | \ -+ sed 's/$(EXEEXT)$$//' | \ -+ while read p p1; do if test -f $$p; \ -+ then echo "$$p"; echo "$$p"; else :; fi; \ -+ done | \ -+ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ -+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ -+ sed 'N;N;N;s,\n, ,g' | \ -+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ -+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ -+ if ($$2 == $$4) files[d] = files[d] " " $$1; \ -+ else { print "f", $$3 "/" $$4, $$1; } } \ -+ END { for (d in files) print "f", d, files[d] }' | \ -+ while read type dir files; do \ -+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ -+ test -z "$$files" || { \ -+ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(sbindir)$$dir'"; \ -+ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(sbindir)$$dir" || exit $$?; \ -+ } \ -+ ; done - - uninstall-sbinPROGRAMS: - @$(NORMAL_UNINSTALL) -- @list='$(sbin_PROGRAMS)'; for p in $$list; do \ -- f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ -- echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \ -- rm -f "$(DESTDIR)$(sbindir)/$$f"; \ -- done -+ @list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \ -+ files=`for p in $$list; do echo "$$p"; done | \ -+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ -+ -e 's/$$/$(EXEEXT)/' `; \ -+ test -n "$$list" || exit 0; \ -+ echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \ -+ cd "$(DESTDIR)$(sbindir)" && rm -f $$files - - clean-sbinPROGRAMS: - -test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS) -@@ -240,76 +280,69 @@ - - .c.o: - @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< --@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(COMPILE) -c $< - - .c.obj: - @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` --@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` --install-man1: $(man1_MANS) $(man_MANS) -+install-man1: $(man_MANS) - @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" -- @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ -- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ -- for i in $$l2; do \ -- case "$$i" in \ -- *.1*) list="$$list $$i" ;; \ -- esac; \ -+ @list=''; test -n "$(man1dir)" || exit 0; \ -+ { for i in $$list; do echo "$$i"; done; \ -+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ -+ sed -n '/\.1[a-z]*$$/p'; \ -+ } | while read p; do \ -+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ -+ echo "$$d$$p"; echo "$$p"; \ -+ done | \ -+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \ -+ sed 'N;N;s,\n, ,g' | { \ -+ list=; while read file base inst; do \ -+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \ -+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ -+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \ -+ fi; \ - done; \ -- for i in $$list; do \ -- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ -- else file=$$i; fi; \ -- ext=`echo $$i | sed -e 's/^.*\\.//'`; \ -- case "$$ext" in \ -- 1*) ;; \ -- *) ext='1' ;; \ -- esac; \ -- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ -- inst=`echo $$inst | sed -e 's/^.*\///'`; \ -- inst=`echo $$inst | sed '$(transform)'`.$$ext; \ -- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ -- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ -- done -+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \ -+ while read files; do \ -+ test -z "$$files" || { \ -+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \ -+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \ -+ done; } -+ - uninstall-man1: - @$(NORMAL_UNINSTALL) -- @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ -- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ -- for i in $$l2; do \ -- case "$$i" in \ -- *.1*) list="$$list $$i" ;; \ -- esac; \ -- done; \ -- for i in $$list; do \ -- ext=`echo $$i | sed -e 's/^.*\\.//'`; \ -- case "$$ext" in \ -- 1*) ;; \ -- *) ext='1' ;; \ -- esac; \ -- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ -- inst=`echo $$inst | sed -e 's/^.*\///'`; \ -- inst=`echo $$inst | sed '$(transform)'`.$$ext; \ -- echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ -- rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ -- done -+ @list=''; test -n "$(man1dir)" || exit 0; \ -+ files=`{ for i in $$list; do echo "$$i"; done; \ -+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ -+ sed -n '/\.1[a-z]*$$/p'; \ -+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ -+ test -z "$$files" || { \ -+ echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ -+ cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } - - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique - tags: TAGS - - TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -- tags=; \ -+ set x; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -317,36 +350,54 @@ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -+ shift; \ -+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -+ if test $$# -gt 0; then \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ "$$@" $$unique; \ -+ else \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$unique; \ -+ fi; \ - fi - ctags: CTAGS - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -- tags=; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ -- test -z "$(CTAGS_ARGS)$$tags$$unique" \ -+ test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ -- $$tags $$unique -+ $$unique - - GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ -- && cd $(top_srcdir) \ -- && gtags -i $(GTAGS_ARGS) $$here -+ && $(am__cd) $(top_srcdir) \ -+ && gtags -i $(GTAGS_ARGS) "$$here" - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - - distdir: $(DISTFILES) -+ @list='$(MANS)'; if test -n "$$list"; then \ -+ list=`for p in $$list; do \ -+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ -+ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ -+ if test -n "$$list" && \ -+ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ -+ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ -+ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ -+ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ -+ echo " typically \`make maintainer-clean' will remove them" >&2; \ -+ exit 1; \ -+ else :; fi; \ -+ else :; fi - $(am__remove_distdir) -- test -d $(distdir) || mkdir $(distdir) -+ test -d "$(distdir)" || mkdir "$(distdir)" - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ -@@ -362,21 +413,27 @@ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ -+ if test -d "$(distdir)/$$file"; then \ -+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ -+ fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ -- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ -+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ -+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ -- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ -+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ -- test -f $(distdir)/$$file \ -- || cp -p $$d/$$file $(distdir)/$$file \ -+ test -f "$(distdir)/$$file" \ -+ || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ -+ -test -n "$(am__skip_mode_fix)" \ -+ || find "$(distdir)" -type d ! -perm -755 \ -+ -exec chmod u+rwx,go+rx {} \; -o \ - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ -- || chmod -R a+r $(distdir) -+ || chmod -R a+r "$(distdir)" - dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) -@@ -389,6 +446,10 @@ - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) - -+dist-xz: distdir -+ tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz -+ $(am__remove_distdir) -+ - dist-tarZ: distdir - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) -@@ -412,15 +473,17 @@ - distcheck: dist - case '$(DIST_ARCHIVES)' in \ - *.tar.gz*) \ -- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ -+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ -- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ -+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ -- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ -+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ -+ *.tar.xz*) \ -+ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ - *.shar.gz*) \ -- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ -+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ - *.zip*) \ - unzip $(distdir).zip ;;\ - esac -@@ -428,9 +491,11 @@ - mkdir $(distdir)/_build - mkdir $(distdir)/_inst - chmod a-w $(distdir) -+ test -d $(distdir)/_build || exit 0; \ - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ - && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ -- && cd $(distdir)/_build \ -+ && am__cwd=`pwd` \ -+ && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ - $(DISTCHECK_CONFIGURE_FLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) \ -@@ -452,13 +517,15 @@ - && rm -rf "$$dc_destdir" \ - && $(MAKE) $(AM_MAKEFLAGS) dist \ - && rm -rf $(DIST_ARCHIVES) \ -- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck -+ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ -+ && cd "$$am__cwd" \ -+ || exit 1 - $(am__remove_distdir) - @(echo "$(distdir) archives ready for distribution: "; \ - list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' - distuninstallcheck: -- @cd $(distuninstallcheck_dir) \ -+ @$(am__cd) '$(distuninstallcheck_dir)' \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ - || { echo "ERROR: files left after uninstall:" ; \ - if test -n "$(DESTDIR)"; then \ -@@ -502,6 +569,7 @@ - - distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -523,6 +591,8 @@ - - html: html-am - -+html-am: -+ - info: info-am - - info-am: -@@ -531,18 +601,28 @@ - - install-dvi: install-dvi-am - -+install-dvi-am: -+ - install-exec-am: install-sbinPROGRAMS - - install-html: install-html-am - -+install-html-am: -+ - install-info: install-info-am - -+install-info-am: -+ - install-man: install-man1 - - install-pdf: install-pdf-am - -+install-pdf-am: -+ - install-ps: install-ps-am - -+install-ps-am: -+ - installcheck-am: - - maintainer-clean: maintainer-clean-am -@@ -573,15 +653,15 @@ - - .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ - clean-generic clean-sbinPROGRAMS ctags dist dist-all \ -- dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ dist-zip \ -- distcheck distclean distclean-compile distclean-generic \ -- distclean-tags distcleancheck distdir distuninstallcheck dvi \ -- dvi-am html html-am info info-am install install-am \ -- install-data install-data-am install-dvi install-dvi-am \ -- install-exec install-exec-am install-html install-html-am \ -- install-info install-info-am install-man install-man1 \ -- install-pdf install-pdf-am install-ps install-ps-am \ -- install-sbinPROGRAMS install-strip installcheck \ -+ dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ dist-xz \ -+ dist-zip distcheck distclean distclean-compile \ -+ distclean-generic distclean-tags distcleancheck distdir \ -+ distuninstallcheck dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am install-dvi \ -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-man1 install-pdf install-pdf-am install-ps \ -+ install-ps-am install-sbinPROGRAMS install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic maintainer-clean-local mostlyclean \ - mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ -@@ -591,6 +671,7 @@ - - maintainer-clean-local: - $(RM) Makefile.in aclocal.m4 config.h.in stamp-h.in configure -+ - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: diff -Nru vbetool-1.1/debian/patches/01_fix_manpage.diff vbetool-1.1/debian/patches/01_fix_manpage.diff --- vbetool-1.1/debian/patches/01_fix_manpage.diff 1970-01-01 00:00:00.000000000 +0000 +++ vbetool-1.1/debian/patches/01_fix_manpage.diff 2016-06-17 19:56:41.000000000 +0000 @@ -0,0 +1,32 @@ +Description: fix some typos and fix the section of manpage +Author: Raphael Mota Ramos +Last-Update: 2016-05-17 + +Index: vbetool-1.1/vbetool.1 +=================================================================== +--- vbetool-1.1.orig/vbetool.1 ++++ vbetool-1.1/vbetool.1 +@@ -1,4 +1,4 @@ +-.TH VBETOOL "1" "31 December 2004" "vbetool 0.2" "User Commands" ++.TH VBETOOL "8" "31 December 2004" "vbetool 0.2" "User Commands" + .SH NAME + vbetool - run real-mode video BIOS code to alter hardware state + +@@ -41,7 +41,7 @@ will set the legacy VGA mode to the foll + .IP "post" + .B vbetool + will attempt to run BIOS code located at c000:0003. This is the code +-run by the system BIOS at boot in order to intialise the video ++run by the system BIOS at boot in order to initialise the video + hardware. Note that on some machines (especially laptops), not all of + this code is present after system boot - as a result, executing this + command may result in undefined behaviour. This command must be run +@@ -53,7 +53,7 @@ to the c000 segment and used instead of + .IP "vgastate" + .B vbetool + will enable or disable the current video card. On most hardware, disabling +-will cause the hardware to stop responding until it is reenabled. You ++will cause the hardware to stop responding until it is re-enabled. You + probably don't want to do this if you're using a framebuffer. + + .IP "vbefp" diff -Nru vbetool-1.1/debian/patches/series vbetool-1.1/debian/patches/series --- vbetool-1.1/debian/patches/series 2012-12-11 15:33:05.000000000 +0000 +++ vbetool-1.1/debian/patches/series 2016-06-15 22:53:42.000000000 +0000 @@ -1 +1,2 @@ 00_misc_fixes.diff +01_fix_manpage.diff diff -Nru vbetool-1.1/debian/rules vbetool-1.1/debian/rules --- vbetool-1.1/debian/rules 2012-12-15 21:33:07.000000000 +0000 +++ vbetool-1.1/debian/rules 2016-07-04 23:44:47.000000000 +0000 @@ -1,5 +1,9 @@ #!/usr/bin/make -f +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + +MANDIR=debian/vbetool/usr/share/man + DEB_HOST_ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH) ifeq ($(DEB_HOST_ARCH), $(findstring $(DEB_HOST_ARCH),i386 lpia)) EMU = @@ -8,7 +12,13 @@ endif %: - dh $@ + dh $@ --with autoreconf override_dh_auto_configure: dh_auto_configure -- $(EMU) + +override_dh_installman: + dh_installman + mkdir $(MANDIR)/man8 + mv $(MANDIR)/man1/vbetool.1 $(MANDIR)/man8/vbetool.8 + rm -rf $(MANDIR)/man1 diff -Nru vbetool-1.1/debian/watch vbetool-1.1/debian/watch --- vbetool-1.1/debian/watch 2012-12-11 15:33:05.000000000 +0000 +++ vbetool-1.1/debian/watch 2016-06-15 22:53:42.000000000 +0000 @@ -1,2 +1,2 @@ -version=3 +version=4 http://www.codon.org.uk/~mjg59/vbetool/download/vbetool-([\d\.]+).tar.gz