debian/changelog | 12 ++++++++++++ debian/control | 30 ++++++++++++++---------------- debian/openchrome-tool.manpages | 2 +- debian/rules | 13 +++++++++---- debian/via_regs_dump.1 | 40 ---------------------------------------- debian/via_regs_dump.8 | 40 ++++++++++++++++++++++++++++++++++++++++ 6 files changed, 76 insertions(+), 61 deletions(-)
New commits: commit 8bc029f8931a42ab48936f3947a0c41372d6a624 Author: Dylan Aïssi <[email protected]> Date: Sat Sep 2 00:23:03 2017 +0200 Bump Standards-Version to 4.1.0 diff --git a/debian/changelog b/debian/changelog index 082b682..a328b1d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ xserver-xorg-video-openchrome (1:0.6.0-3) UNRELEASED; urgency=medium * Install manpage of via_regs_dump in right section (from .1 to .8). * Really adopt the package (Closes: #808784). * Do not explicitly parse d/changelog. + * Bump Standards-Version to 4.1.0. -- Dylan Aïssi <[email protected]> Fri, 01 Sep 2017 23:30:17 +0200 diff --git a/debian/control b/debian/control index 56c7409..3d92320 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,7 @@ Build-Depends: xutils-dev Build-Conflicts: autoconf2.13 -Standards-Version: 4.0.0 +Standards-Version: 4.1.0 Homepage: https://www.freedesktop.org/wiki/Openchrome/ Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-video-openchrome.git Vcs-Browser: https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-video-openchrome.git commit e996a00163d723eda3a89b02e7db42934e8a895e Author: Dylan Aïssi <[email protected]> Date: Sat Sep 2 00:10:49 2017 +0200 Do not explicitly parse d/changelog diff --git a/debian/changelog b/debian/changelog index d0185de..082b682 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ xserver-xorg-video-openchrome (1:0.6.0-3) UNRELEASED; urgency=medium * Update descriptions of binary packages. * Install manpage of via_regs_dump in right section (from .1 to .8). * Really adopt the package (Closes: #808784). + * Do not explicitly parse d/changelog. -- Dylan Aïssi <[email protected]> Fri, 01 Sep 2017 23:30:17 +0200 diff --git a/debian/rules b/debian/rules index 29941c6..160e15a 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,7 @@ #!/usr/bin/make -f +include /usr/share/dpkg/pkg-info.mk + DEB_CONFIGURE_EXTRA_FLAGS := \ --disable-maintainer-mode \ --disable-dependency-tracking \ @@ -48,7 +50,5 @@ override_dh_strip: %: dh $@ --with quilt,xsf --builddirectory=build/ -gentarball: SOURCE=xserver-xorg-video-openchrome -gentarball: UV=$(shell dpkg-parsechangelog|awk '/^Version:/ {print $$2}'|sed 's/^[0-9]*://;s/-.*$$//') gentarball: - git archive --format=tar upstream-unstable --prefix=$(SOURCE)-$(UV)/ | gzip -9 > ../$(SOURCE)_$(UV).orig.tar.gz + git archive --format=tar upstream-unstable --prefix=$(DEB_SOURCE)-$(DEB_VERSION_UPSTREAM)/ | gzip -9 > ../$(DEB_SOURCE)_$(DEB_VERSION_UPSTREAM).orig.tar.gz commit 1560c85b0378233b3c441f0541f2d75a8d4221d9 Author: Dylan Aïssi <[email protected]> Date: Fri Sep 1 23:51:46 2017 +0200 Really adopt the package (Closes: #808784) diff --git a/debian/changelog b/debian/changelog index f071f86..d0185de 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ xserver-xorg-video-openchrome (1:0.6.0-3) UNRELEASED; urgency=medium (Closes: #873463). * Update descriptions of binary packages. * Install manpage of via_regs_dump in right section (from .1 to .8). + * Really adopt the package (Closes: #808784). -- Dylan Aïssi <[email protected]> Fri, 01 Sep 2017 23:30:17 +0200 commit 8b51f966c32d24c06bc689cbcf6c332368efe108 Author: Dylan Aïssi <[email protected]> Date: Fri Sep 1 23:46:10 2017 +0200 Install manpage of via_regs_dump in right section (from .1 to .8) diff --git a/debian/changelog b/debian/changelog index 1fdc207..f071f86 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ xserver-xorg-video-openchrome (1:0.6.0-3) UNRELEASED; urgency=medium * Disable the building of via_regs_dump on Hurd because FTBFS. (Closes: #873463). * Update descriptions of binary packages. + * Install manpage of via_regs_dump in right section (from .1 to .8). -- Dylan Aïssi <[email protected]> Fri, 01 Sep 2017 23:30:17 +0200 diff --git a/debian/openchrome-tool.manpages b/debian/openchrome-tool.manpages index c5c4b1a..616d873 100644 --- a/debian/openchrome-tool.manpages +++ b/debian/openchrome-tool.manpages @@ -1 +1 @@ -debian/via_regs_dump.1 +debian/via_regs_dump.8 diff --git a/debian/via_regs_dump.1 b/debian/via_regs_dump.1 deleted file mode 100644 index 05f0e27..0000000 --- a/debian/via_regs_dump.1 +++ /dev/null @@ -1,40 +0,0 @@ -.\" -.TH VIA_REGS_DUMP 1 "June 2017" "" -.SH NAME -via_regs_dump \- tool for debugging the OpenChrome (VIA) graphics driver -.SH SYNOPSIS -.B via_regs_dump -[\fIoptions\fR] -.SH DESCRIPTION -The Openchrome project is committed to providing and supporting fully -free and Open Source drivers that take full advantage of the hardware -acceleration of VIA chipsets featuring the VIA UniChrome, UniChrome -Pro and Chrome9 integrated graphics processors. -.SH OPTIONS -.TP -\fB\-h\fR, \fB\-\-help\fR -Display this usage message. -.TP -\fB\-d\fR, \fB\-\-dump\fR -Dump all registers. -.TP -\fB\-p\fR, \fB\-\-pll\fR -Display PLL. -.TP -\fB\-m\fR, \fB\-\-mode\fR -Display modes. -.TP -\fB\-r\fR, \fB\-\-read\fR -Read register. Example : $0 -r 3d5.17 -.TP -\fB\-w\fR, \fB\-\-write\fR -Write register. Example : $0 -w 3d5.17 0xa3 -.TP -\fB\-g\fR, \fB\-\-gpio\fR -Display GPIO state. -.PP -.SH SEE ALSO -.BR https://www.freedesktop.org/wiki/Openchrome/ -.SH COPYRIGHT -via-chrome-tool (C) 2009 by VIA Technologies, Inc. -This is FREE SOFTWARE with ABSOLUTELY NO WARRANTY diff --git a/debian/via_regs_dump.8 b/debian/via_regs_dump.8 new file mode 100644 index 0000000..8e4fc96 --- /dev/null +++ b/debian/via_regs_dump.8 @@ -0,0 +1,40 @@ +.\" +.TH VIA_REGS_DUMP 8 "September 2017" "" +.SH NAME +via_regs_dump \- tool for debugging the OpenChrome display driver +.SH SYNOPSIS +.B via_regs_dump +[\fIoptions\fR] +.SH DESCRIPTION +The OpenChrome project is committed to providing and supporting fully +free and Open Source drivers that take full advantage of the hardware +acceleration of VIA chipsets featuring the VIA UniChrome, UniChrome +Pro and Chrome9 integrated graphics processors. +.SH OPTIONS +.TP +\fB\-h\fR, \fB\-\-help\fR +Display this usage message. +.TP +\fB\-d\fR, \fB\-\-dump\fR +Dump all registers. +.TP +\fB\-p\fR, \fB\-\-pll\fR +Display PLL. +.TP +\fB\-m\fR, \fB\-\-mode\fR +Display modes. +.TP +\fB\-r\fR, \fB\-\-read\fR +Read register. Example : $0 -r 3d5.17 +.TP +\fB\-w\fR, \fB\-\-write\fR +Write register. Example : $0 -w 3d5.17 0xa3 +.TP +\fB\-g\fR, \fB\-\-gpio\fR +Display GPIO state. +.PP +.SH SEE ALSO +.BR https://www.freedesktop.org/wiki/Openchrome/ +.SH COPYRIGHT +via-chrome-tool (C) 2009 by VIA Technologies, Inc. +This is FREE SOFTWARE with ABSOLUTELY NO WARRANTY commit d5ac2926b5b88d0d828ce3c7b39e6ae95f3a6865 Author: Dylan Aïssi <[email protected]> Date: Fri Sep 1 23:37:49 2017 +0200 Update descriptions of binary packages diff --git a/debian/changelog b/debian/changelog index b302e28..1fdc207 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ xserver-xorg-video-openchrome (1:0.6.0-3) UNRELEASED; urgency=medium * Disable the building of via_regs_dump on Hurd because FTBFS. (Closes: #873463). + * Update descriptions of binary packages. - -- Dylan Aïssi <dylan@Dell> Sun, 27 Aug 2017 23:22:05 +0200 + -- Dylan Aïssi <[email protected]> Fri, 01 Sep 2017 23:30:17 +0200 xserver-xorg-video-openchrome (1:0.6.0-2) unstable; urgency=medium diff --git a/debian/control b/debian/control index 61253bd..56c7409 100644 --- a/debian/control +++ b/debian/control @@ -36,19 +36,15 @@ Depends: ${xviddriver:Depends} Provides: ${xviddriver:Provides} -Description: X.Org X server -- VIA display driver - OpenChrome is a project for the development of free and open-source drivers - for the VIA UniChrome video chipsets. +Description: X.Org X server -- OpenChrome display driver + This package provides the 'openchrome' driver for the VIA Technologies + UniChrome and Chrome9 IGPs chipsets. The following chips should be + supported: CLE266, KM400(A), KN400(A), P4M800, K8M800, K8N800, PM800, + PN800, PM880, CN333, CN400, P4M800 Pro, VN800, CN700, CX700, VX700, + P4M890, VN890, CN800, K8M890, K8N890, P4M900, VN896, CN896, VX800, VX820, + VX855, VX875, VX900. . - Originally called the 'snapshot' release, since it was a snapshot of an - experimental branch of the unichrome cvs code, this is a continued development - of the open source unichrome driver (from http://unichrome.sf.net) which - also incorporates support for the unichrome-pro chipsets. - . - Support for hardware acceleration (XvMC) for all chipsets has subsequently - been ripped out of the unichrome.sf.net driver. Therefore your only option if - you wish to make use of the acceleration features of your VIA chip with free - and open-source drivers is to use this version of the driver. + This package is built from the FreeDesktop.org xf86-video-openchrome driver. Package: openchrome-tool Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386 x32 @@ -56,5 +52,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, xserver-xorg-video-openchrome (= ${binary:Version}) -Description: tool for debugging the OpenChrome (VIA) graphics driver - via_regs_dump is a registers dumper tool for debugging the driver. +Description: Tool for debugging the OpenChrome display driver + via_regs_dump is a registers dumper tool for debugging the OpenChrome driver. + This tool can read and write registers and display some others information + useful for debugging the driver. commit c3b1bd8babcd3826f7b5c3b823f5b5d587a84dc9 Author: Dylan Aïssi <[email protected]> Date: Fri Sep 1 23:27:09 2017 +0200 Closes: #873463 diff --git a/debian/changelog b/debian/changelog index 05ea410..b302e28 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ xserver-xorg-video-openchrome (1:0.6.0-3) UNRELEASED; urgency=medium * Disable the building of via_regs_dump on Hurd because FTBFS. + (Closes: #873463). -- Dylan Aïssi <dylan@Dell> Sun, 27 Aug 2017 23:22:05 +0200 commit c7abb000727697330693157c9a26e7fa090e7ff6 Author: Dylan Aïssi <[email protected]> Date: Sun Aug 27 23:26:29 2017 +0200 Disable the building of via_regs_dump on Hurd because FTBFS diff --git a/debian/changelog b/debian/changelog index a0afaa5..05ea410 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-openchrome (1:0.6.0-3) UNRELEASED; urgency=medium + + * Disable the building of via_regs_dump on Hurd because FTBFS. + + -- Dylan Aïssi <dylan@Dell> Sun, 27 Aug 2017 23:22:05 +0200 + xserver-xorg-video-openchrome (1:0.6.0-2) unstable; urgency=medium * Build new binary package which contain the tool via_regs_dump. diff --git a/debian/control b/debian/control index f8f918c..61253bd 100644 --- a/debian/control +++ b/debian/control @@ -51,7 +51,7 @@ Description: X.Org X server -- VIA display driver and open-source drivers is to use this version of the driver. Package: openchrome-tool -Architecture: amd64 hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 x32 +Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386 x32 Depends: ${misc:Depends}, ${shlibs:Depends}, diff --git a/debian/rules b/debian/rules index 9a73d4d..29941c6 100755 --- a/debian/rules +++ b/debian/rules @@ -3,8 +3,13 @@ DEB_CONFIGURE_EXTRA_FLAGS := \ --disable-maintainer-mode \ --disable-dependency-tracking \ - --libdir=/usr/lib \ + --libdir=/usr/lib + +# The via_regs_dump tool FTBFS on Hurd +ifneq ($(DEB_HOST_ARCH_OS), hurd) +DEB_CONFIGURE_EXTRA_FLAGS += \ --enable-viaregtool +endif ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS))) DEB_CONFIGURE_EXTRA_FLAGS += \
