Hello community,
here is the log from the commit of package vbetool
checked in at Wed Jul 26 16:14:43 CEST 2006.
--------
--- arch/i386/vbetool/vbetool.changes 2006-07-19 10:16:43.000000000 +0200
+++ vbetool/vbetool.changes 2006-07-26 08:47:17.000000000 +0200
@@ -1,0 +2,10 @@
+Wed Jul 26 08:44:38 CEST 2006 - seife@suse.de
+
+- update to version 0.7 which includes:
+ * Apply splitup patches to allow vbetool to be linked into S2ram
+ binary (from Pavel Machek).
+ * Increase size of mapped real-mode memory (from Bart Oldeman)
+ This should help with some ATI BIOSes.
+- remove vbetool-0.6-panelid.diff, merged upstream.
+
+-------------------------------------------------------------------
Old:
----
copyright
vbetool-0.6-64bit-compilefix.diff
vbetool-0.6-panelid.diff
vbetool_0.6-1.1.tar.gz
New:
----
vbetool_0.7-1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vbetool.spec ++++++
--- /var/tmp/diff_new_pack.9XQQ4c/_old 2006-07-26 16:14:23.000000000 +0200
+++ /var/tmp/diff_new_pack.9XQQ4c/_new 2006-07-26 16:14:23.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package vbetool (Version 0.6)
+# spec file for package vbetool (Version 0.7)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,16 +12,13 @@
Name: vbetool
BuildRequires: pciutils-devel
-Version: 0.6
-Release: 2
+Version: 0.7
+Release: 1
Summary: A tool to save and restore the VBE state of graphics cards.
License: GPL
URL: http://www.srcf.ucam.org/~mjg59/vbetool/
Group: System/Console
-Source: %{name}_%{version}-1.1.tar.gz
-Source1: copyright
-Patch1: vbetool-0.6-64bit-compilefix.diff
-Patch2: vbetool-0.6-panelid.diff
+Source: %{name}_%{version}-1.tar.gz
Patch10: vbetool-quiet-braindead-warnings.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -38,10 +35,7 @@
%prep
rm -rf $RPM_BUILD_ROOT
%setup -q
-%patch1 -p0
-%patch2 -p0
%patch10 -p1
-cp %{S:1} .
%build
export CFLAGS="$RPM_OPT_FLAGS"
@@ -65,9 +59,17 @@
%defattr (-,root,root)
/usr/sbin/vbetool
%doc %{_mandir}/man1/vbetool.1.gz
-%doc copyright
+%doc debian/copyright
+%doc debian/changelog
%changelog -n vbetool
+* Wed Jul 26 2006 - seife@suse.de
+- update to version 0.7 which includes:
+ * Apply splitup patches to allow vbetool to be linked into S2ram
+ binary (from Pavel Machek).
+ * Increase size of mapped real-mode memory (from Bart Oldeman)
+ This should help with some ATI BIOSes.
+- remove vbetool-0.6-panelid.diff, merged upstream.
* Wed Jul 19 2006 - seife@suse.de
- added vbetool-0.6-panelid.diff which lets the code do what is
actually described in the manpage.
++++++ vbetool-quiet-braindead-warnings.diff ++++++
--- /var/tmp/diff_new_pack.9XQQ4c/_old 2006-07-26 16:14:24.000000000 +0200
+++ /var/tmp/diff_new_pack.9XQQ4c/_new 2006-07-26 16:14:24.000000000 +0200
@@ -1,20 +1,11 @@
-diff -ruP vbetool-0.2~/vbetool.c vbetool-0.2/vbetool.c
---- vbetool-0.2~/vbetool.c 2005-02-14 01:02:58.000000000 +0100
-+++ vbetool-0.2/vbetool.c 2005-04-23 17:59:14.000000000 +0200
-@@ -245,6 +245,7 @@
- struct LRMI_regs r;
- void *buffer;
- unsigned int size;
-+ int tmp;
+--- vbetool-0.7/vbetool.c
++++ vbetool-0.7/vbetool.c
+@@ -347,7 +347,7 @@
+ char *buffer = __save_state(&size);
- memset(&r, 0, sizeof(r));
-
-@@ -285,7 +286,7 @@
- fprintf(stderr, "Save video state failed\n");
- }
-
-- write(1, buffer, size);
-+ tmp=write(1, buffer, size);
+ if (buffer)
+- write(1, buffer, size); /* FIXME: should retry on short write); */
++ (void)write(1, buffer, size); /* FIXME: should retry on short write); */
}
int do_blank(int state)
++++++ vbetool_0.6-1.1.tar.gz -> vbetool_0.7-1.tar.gz ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vbetool-0.6/Makefile.am new/vbetool-0.7/Makefile.am
--- old/vbetool-0.6/Makefile.am 2006-06-30 22:03:57.000000000 +0200
+++ new/vbetool-0.7/Makefile.am 2006-07-26 03:21:31.000000000 +0200
@@ -6,11 +6,11 @@
if WITH_X86EMU
x86 = thunk.c x86-common.c
-vbetool_LDADD = x86emu/libx86emu.a /usr/lib/libpci.a
+vbetool_LDADD = x86emu/libx86emu.a $(libdir)/libpci.a
else
x86 = lrmi.c x86-common.c
x86lib = ""
-vbetool_LDADD = /usr/lib/libpci.a
+vbetool_LDADD = $(libdir)/libpci.a
endif
man_MANS = vbetool.1
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vbetool-0.6/Makefile.in new/vbetool-0.7/Makefile.in
--- old/vbetool-0.6/Makefile.in 2006-06-30 22:06:41.000000000 +0200
+++ new/vbetool-0.7/Makefile.in 2006-07-26 03:26:30.000000000 +0200
@@ -57,9 +57,9 @@
@WITH_X86EMU_TRUE@am__objects_1 = thunk.$(OBJEXT) x86-common.$(OBJEXT)
am_vbetool_OBJECTS = vbetool.$(OBJEXT) $(am__objects_1)
vbetool_OBJECTS = $(am_vbetool_OBJECTS)
-@WITH_X86EMU_FALSE@vbetool_DEPENDENCIES = /usr/lib/libpci.a
+@WITH_X86EMU_FALSE@vbetool_DEPENDENCIES = $(libdir)/libpci.a
@WITH_X86EMU_TRUE@vbetool_DEPENDENCIES = x86emu/libx86emu.a \
-@WITH_X86EMU_TRUE@ /usr/lib/libpci.a
+@WITH_X86EMU_TRUE@ $(libdir)/libpci.a
DEFAULT_INCLUDES = -I. -I$(srcdir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -174,8 +174,8 @@
SUBDIRS = x86emu
@WITH_X86EMU_FALSE@x86 = lrmi.c x86-common.c
@WITH_X86EMU_TRUE@x86 = thunk.c x86-common.c
-@WITH_X86EMU_FALSE@vbetool_LDADD = /usr/lib/libpci.a
-@WITH_X86EMU_TRUE@vbetool_LDADD = x86emu/libx86emu.a /usr/lib/libpci.a
+@WITH_X86EMU_FALSE@vbetool_LDADD = $(libdir)/libpci.a
+@WITH_X86EMU_TRUE@vbetool_LDADD = x86emu/libx86emu.a $(libdir)/libpci.a
@WITH_X86EMU_FALSE@x86lib = ""
man_MANS = vbetool.1
vbetool_SOURCES = vbetool.c $(x86)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vbetool-0.6/debian/changelog new/vbetool-0.7/debian/changelog
--- old/vbetool-0.6/debian/changelog 2006-06-30 22:16:54.000000000 +0200
+++ new/vbetool-0.7/debian/changelog 2006-07-26 03:29:16.000000000 +0200
@@ -1,3 +1,13 @@
+vbetool (0.7-1) unstable; urgency=low
+
+ * Add copyright information. Closes: #375159
+ * Apply splitup patches to allow vbetool to be linked into S2ram
+ binary (from Pavel Machek)
+ * Fix build for systems that don't use /usr/lib (from Stefan Seyfried)
+ * Increase size of mapped real-mode memory (from Bart Oldeman)
+
+ -- Matthew Garrett
participants (1)
-
root@suse.de