diff -Nru vgabios-0.7a/debian/changelog vgabios-0.7a/debian/changelog --- vgabios-0.7a/debian/changelog 2014-04-18 16:33:57.000000000 +0000 +++ vgabios-0.7a/debian/changelog 2016-04-09 00:43:46.000000000 +0000 @@ -1,3 +1,24 @@ +vgabios (0.7a-6) unstable; urgency=low + + [ Reiner Herrmann ] + * QA upload. + * Bump Standards-Version to 3.9.8. + * Bump debhelper compat level to 9. + * Use https URLs for Vcs-Git/Vcs-Browser/Homepage fields. + * Convert debian/copyright to DEP5. + * Remove comments from debian/watch. + * Remove unneeded targets from rules. + * Remove bochs conflict. + * Enable parallel building. + * Add patch for reproducible building. + * Add patch to support QXGA resolutions. + Thanks to Sven Schnelle. (Closes: #669114) + + [ Mattia Rizzolo ] + * Move the repository to collab-maint + + -- Reiner Herrmann Fri, 08 Apr 2016 23:11:11 +0200 + vgabios (0.7a-5) unstable; urgency=medium * Orphan package, set maintainer to Debian QA Group. diff -Nru vgabios-0.7a/debian/compat vgabios-0.7a/debian/compat --- vgabios-0.7a/debian/compat 2012-02-06 14:18:38.000000000 +0000 +++ vgabios-0.7a/debian/compat 2016-04-09 00:41:05.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -Nru vgabios-0.7a/debian/control vgabios-0.7a/debian/control --- vgabios-0.7a/debian/control 2014-04-18 16:33:50.000000000 +0000 +++ vgabios-0.7a/debian/control 2016-04-09 00:43:34.000000000 +0000 @@ -2,17 +2,16 @@ Section: misc Priority: extra Maintainer: Debian QA Group -Homepage: http://savannah.nongnu.org/projects/vgabios/ -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-qemu/vgabios.git -Vcs-Git: git://git.debian.org/git/pkg-qemu/vgabios.git -Build-Depends: debhelper (>= 7) +Homepage: https://savannah.nongnu.org/projects/vgabios/ +Vcs-Browser: https://anonscm.debian.org/git/collab-maint/vgabios.git +Vcs-Git: https://anonscm.debian.org/git/collab-maint/vgabios.git +Build-Depends: debhelper (>= 9) Build-Depends-Indep: bcc, bin86, gawk | awk -Standards-Version: 3.9.4 +Standards-Version: 3.9.8 Package: vgabios Architecture: all Depends: ${misc:Depends} -Conflicts: bochs (<< 2.1.1+20040903-1) Multi-Arch: foreign Description: VGA BIOS software for the Bochs and Qemu emulated VGA card The goal of this project is to provide a Video BIOS for Bochs and Qemu. diff -Nru vgabios-0.7a/debian/copyright vgabios-0.7a/debian/copyright --- vgabios-0.7a/debian/copyright 2012-02-06 14:18:38.000000000 +0000 +++ vgabios-0.7a/debian/copyright 2016-04-09 00:41:05.000000000 +0000 @@ -1,40 +1,20 @@ -This package was debianized by Robert Millan on -Sat, 1 Sep 2001 17:01:45 +0200. - -Now maintained by Guillem Jover . - -It was downloaded from - -Upstream Authors: - - Christophe Bothamy - Jeroen Janssen - Kevin Lawton - Volker Ruppert - and others - -Copyright Holders: - - Copyright © 2001-2003 Christophe Bothamy - Copyright © 2002 Jeroen Janssen - Copyright © 2002 Kevin Lawton - Copyright © 2002-2003, 2005-2006, 2008 Volker Ruppert - -License: - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -On Debian systems, the complete text of the GNU Lesser General -Public License can be found in '/usr/share/common-licenses/LGPL-2.1'. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: VGABios +Source: http://download.savannah.gnu.org/releases/vgabios/ + +Files: * +Copyright: 2001-2003 Christophe Bothamy + 2002 Jeroen Janssen + 2002 Kevin Lawton + 2002-2003, 2005-2006, 2008 Volker Ruppert +License: LGPL-2.1 + +Files: debian/* +Copyright: 2001-2004 Robert Millan + 2004-2012 Guillem Jover + 2012-2014 Michael Tokarev +License: LGPL-2.1 + +License: LGPL-2.1 + On Debian systems, the complete text of the GNU Lesser General + Public License can be found in '/usr/share/common-licenses/LGPL-2.1'. diff -Nru vgabios-0.7a/debian/patches/qxga_resolutions.patch vgabios-0.7a/debian/patches/qxga_resolutions.patch --- vgabios-0.7a/debian/patches/qxga_resolutions.patch 1970-01-01 00:00:00.000000000 +0000 +++ vgabios-0.7a/debian/patches/qxga_resolutions.patch 2016-04-09 00:41:05.000000000 +0000 @@ -0,0 +1,16 @@ +Author: Sven Schnelle +Description: Add support for QXGA resolutions +Bug-Debian: https://bugs.debian.org/669114 + +--- a/vbetables-gen.c ++++ b/vbetables-gen.c +@@ -85,6 +85,9 @@ + { 1920, 1080, 16 , 0x190}, + { 1920, 1080, 24 , 0x191}, + { 1920, 1080, 32 , 0x192}, ++{ 2048, 1536, 16 , 0x193}, ++{ 2048, 1536, 24 , 0x194}, ++{ 2048, 1536, 32 , 0x195}, + { 0, }, + }; + diff -Nru vgabios-0.7a/debian/patches/reproducible_build.patch vgabios-0.7a/debian/patches/reproducible_build.patch --- vgabios-0.7a/debian/patches/reproducible_build.patch 1970-01-01 00:00:00.000000000 +0000 +++ vgabios-0.7a/debian/patches/reproducible_build.patch 2016-04-09 00:41:05.000000000 +0000 @@ -0,0 +1,18 @@ +Author: Reiner Herrmann +Description: Use SOURCE_DATE_EPOCH as build date + +--- a/Makefile ++++ b/Makefile +@@ -9,7 +9,11 @@ + AS86 = as86 + + RELEASE = `pwd | sed "s-.*/--"` +-RELDATE = `date '+%d %b %Y'` ++ifdef SOURCE_DATE_EPOCH ++ RELDATE = `LC_ALL=C date -u -d "@$(SOURCE_DATE_EPOCH)" "+%d %b %Y"` ++else ++ RELDATE = `date '+%d %b %Y'` ++endif + RELVERS = `pwd | sed "s-.*/--" | sed "s/vgabios//" | sed "s/-//"` + + VGABIOS_DATE = "-DVGABIOS_DATE=\"$(RELDATE)\"" diff -Nru vgabios-0.7a/debian/patches/series vgabios-0.7a/debian/patches/series --- vgabios-0.7a/debian/patches/series 2012-06-14 07:23:48.000000000 +0000 +++ vgabios-0.7a/debian/patches/series 2016-04-09 00:41:05.000000000 +0000 @@ -1,3 +1,5 @@ 05-Add-qemu-vmware-vga-pci-bios 06-Add-qemu-qxl-vga-pci-bios disable-1280x768-and-1280x720-modes.patch +reproducible_build.patch +qxga_resolutions.patch diff -Nru vgabios-0.7a/debian/rules vgabios-0.7a/debian/rules --- vgabios-0.7a/debian/rules 2013-11-23 19:31:57.000000000 +0000 +++ vgabios-0.7a/debian/rules 2016-04-09 00:41:05.000000000 +0000 @@ -4,10 +4,7 @@ debbiosdir := debian/vgabios$(biosdir) %: - +dh $@ - -override_dh_auto_configure override_dh_auto_test: -# nothing to do + +dh $@ --parallel override_dh_auto_install: set -e; \ diff -Nru vgabios-0.7a/debian/watch vgabios-0.7a/debian/watch --- vgabios-0.7a/debian/watch 2012-02-06 14:18:38.000000000 +0000 +++ vgabios-0.7a/debian/watch 2016-04-09 00:41:05.000000000 +0000 @@ -1,4 +1,2 @@ -# You can run the "uscan" command to check for upstream updates and more. -# Site Directory Pattern Version Script version=3 http://download.sv.gnu.org/releases/vgabios/ vgabios-(.*)\.tgz debian uupdate