xserver-xorg-video-openchrome: Changes to 'debian-unstable'
debian/changelog | 23 +++
debian/compat | 2
debian/control | 61 +++------
debian/copyright | 105 ++++++++---------
debian/gbp.conf | 4
debian/links | 2
debian/patches/Fix_spelling_error.patch | 16 ++
debian/patches/Reproducible_build.patch | 17 ++
debian/patches/series | 2
debian/rules | 9 -
debian/source/format | 1
debian/watch | 5
debian/xserver-xorg-video-openchrome.install | 2
debian/xserver-xorg-video-openchrome.lintian-overrides | 8 -
14 files changed, 146 insertions(+), 111 deletions(-)
New commits:
commit 6b7cd94004485f099d8d245b0dd7176293ce581f
Author: Dylan Aïssi <bob.dybian@gmail.com>
Date: Wed Dec 7 22:22:04 2016 +0100
Enable hardened build (Closes: #734640)
diff --git a/debian/changelog b/debian/changelog
index 0f9f405..08d8631 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ xserver-xorg-video-openchrome (1:0.5.0-1) UNRELEASED; urgency=medium
* Switch from -dbg to -dbgsym package.
* Bump Build-Depends xserver-xorg-dev to >= 2:1.17.
* Add a patch to enable reproducible build (Closes: #831405).
+ * Enable hardened build (Closes: #734640).
-- Dylan Aïssi <bob.dybian@gmail.com> Thu, 01 Dec 2016 23:17:22 +0100
diff --git a/debian/rules b/debian/rules
index d709911..838fbf2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
DEB_CONFIGURE_EXTRA_FLAGS := \
--disable-maintainer-mode \
--disable-dependency-tracking \
commit a93526bdbf0da9b2b5e9adf660580bacedbb5472
Author: Dylan Aïssi <bob.dybian@gmail.com>
Date: Wed Dec 7 22:15:53 2016 +0100
Add myself to Uploaders
diff --git a/debian/changelog b/debian/changelog
index 10a261f..0f9f405 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,5 @@
xserver-xorg-video-openchrome (1:0.5.0-1) UNRELEASED; urgency=medium
- * Team upload.
* New upstream release. (LP: #1640787)
* Update VCS fields.
* Update lintian overrides.
diff --git a/debian/control b/debian/control
index 3369d02..7dadf47 100644
--- a/debian/control
+++ b/debian/control
@@ -2,6 +2,7 @@ Source: xserver-xorg-video-openchrome
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
+Uploaders: Dylan Aïssi <bob.dybian@gmail.com>
Build-Depends:
debhelper (>= 10),
libdrm-dev (>> 2.0) [!hurd-i386],
commit e9f91e4b742035b3b9989f195497d0c27b38c291
Author: Dylan Aïssi <bob.dybian@gmail.com>
Date: Wed Dec 7 22:08:08 2016 +0100
Add a patch to enable reproducible build (Closes: #831405).
diff --git a/debian/changelog b/debian/changelog
index eccde8c..10a261f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ xserver-xorg-video-openchrome (1:0.5.0-1) UNRELEASED; urgency=medium
* Add a patch to fix a spelling error.
* Switch from -dbg to -dbgsym package.
* Bump Build-Depends xserver-xorg-dev to >= 2:1.17.
+ * Add a patch to enable reproducible build (Closes: #831405).
-- Dylan Aïssi <bob.dybian@gmail.com> Thu, 01 Dec 2016 23:17:22 +0100
diff --git a/debian/patches/Reproducible_build.patch b/debian/patches/Reproducible_build.patch
new file mode 100644
index 0000000..8c7c70b
--- /dev/null
+++ b/debian/patches/Reproducible_build.patch
@@ -0,0 +1,17 @@
+Author: Chris Lamb
+Description: Make the build reproducible.
+Origin: https://bugs.debian.org/831405
+Forwarded: https://bugs.freedesktop.org/show_bug.cgi?id=98896
+
+--- a/src/Makefile.am 2016-07-15 17:56:15.066700891 +0200
+--- b/src/Makefile.am 2016-07-15 18:22:08.362042386 +0200
+@@ -113,6 +113,9 @@
+ if [ -d .svn ]; then \
+ echo '#define BUILDCOMMENT "(development build, at revision '\
+ "`svnversion -nc .. | sed -e s/^[^:]*://`"')"' > $@.tmp; \
++ elif [ "$$SOURCE_DATE_EPOCH" ]; then \
++ printf '#define BUILDCOMMENT "(compiled with SOURCE_DATE_EPOCH: %s)"' $$SOURCE_DATE_EPOCH \
++ > $@.tmp; \
+ else \
+ date +'#define BUILDCOMMENT "(development build, compiled on %c)"' \
+ > $@.tmp; \
commit cf2e9c9f43d24909d2c36999916601162470365d
Author: Dylan Aïssi <bob.dybian@gmail.com>
Date: Wed Dec 7 22:01:39 2016 +0100
Bump Build-Depends xserver-xorg-dev to >= 2:1.17 (Recommended upstream)
diff --git a/debian/changelog b/debian/changelog
index b5ceceb..eccde8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ xserver-xorg-video-openchrome (1:0.5.0-1) UNRELEASED; urgency=medium
* Bump debhelper compat to 10.
* Add a patch to fix a spelling error.
* Switch from -dbg to -dbgsym package.
+ * Bump Build-Depends xserver-xorg-dev to >= 2:1.17.
-- Dylan Aïssi <bob.dybian@gmail.com> Thu, 01 Dec 2016 23:17:22 +0100
diff --git a/debian/control b/debian/control
index 680068e..3369d02 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends:
x11proto-video-dev,
x11proto-xext-dev,
x11proto-xf86dri-dev,
- xserver-xorg-dev (>= 2:1.9.4),
+ xserver-xorg-dev (>= 2:1.17),
xutils-dev
Build-Conflicts:
autoconf2.13
commit 4b739caae58f7daeebc94ab35c06fbcdfe47adc4
Author: Dylan Aïssi <bob.dybian@gmail.com>
Date: Wed Dec 7 22:00:03 2016 +0100
Update changelog
diff --git a/debian/changelog b/debian/changelog
index cccf3c2..b5ceceb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,12 @@
xserver-xorg-video-openchrome (1:0.5.0-1) UNRELEASED; urgency=medium
* Team upload.
- * New upstream release.
+ * New upstream release. (LP: #1640787)
* Update VCS fields.
* Update lintian overrides.
* Add debian/source/format file.
* Architectures:
- - Remove LPIA discontinuted.
+ - Remove LPIA discontinued.
- Add x32 (Closes: #775201).
* Remove libdrm-dev from Build-Depend for Hurd (Closes: #672546).
* Update debian/watch.
commit 1189a6d4fdf2d6e4a7b7a879dd5e0a172abfe75d
Author: Dylan Aïssi <bob.dybian@gmail.com>
Date: Tue Dec 6 18:37:08 2016 +0100
Switch from dbg to dbgsym
diff --git a/debian/changelog b/debian/changelog
index 1c6431d..cccf3c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ xserver-xorg-video-openchrome (1:0.5.0-1) UNRELEASED; urgency=medium
* Update and convert d/copyright to DEP5.
* Bump debhelper compat to 10.
* Add a patch to fix a spelling error.
+ * Switch from -dbg to -dbgsym package.
-- Dylan Aïssi <bob.dybian@gmail.com> Thu, 01 Dec 2016 23:17:22 +0100
diff --git a/debian/control b/debian/control
index f03cb90..680068e 100644
--- a/debian/control
+++ b/debian/control
@@ -48,26 +48,3 @@ Description: X.Org X server -- VIA display driver
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.
-
-Package: xserver-xorg-video-openchrome-dbg
-Architecture: amd64 hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 x32
-Section: debug
-Priority: extra
-Depends:
- xserver-xorg-video-openchrome (= ${binary:Version}),
- ${misc:Depends}
-Description: X.Org X server -- VIA display driver -- debugging symbols
- OpenChrome is a project for the development of free and open-source drivers
- for the VIA UniChrome video chipsets.
- .
- 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 contains debugging symbols for OpenChrome driver.
diff --git a/debian/rules b/debian/rules
index 2615388..d709911 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ override_dh_shlibdeps:
dh_shlibdeps -- --warnings=6
override_dh_strip:
- dh_strip --dbg-package=xserver-xorg-video-openchrome-dbg
+ dh_strip --dbgsym-migration='xserver-xorg-video-openchrome-dbg (<< 1:0.5.0-1~)'
%:
dh $@ --with quilt,xsf --builddirectory=build/
commit ea9c1b1b7b74ccda3cc1783505bb26be8eecc4bf
Author: Dylan Aïssi <bob.dybian@gmail.com>
Date: Tue Dec 6 18:29:43 2016 +0100
Add patch to fix spelling error
diff --git a/debian/changelog b/debian/changelog
index d6cf99a..1c6431d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ xserver-xorg-video-openchrome (1:0.5.0-1) UNRELEASED; urgency=medium
- Remove DM-Upload-Allowed field.
* Update and convert d/copyright to DEP5.
* Bump debhelper compat to 10.
+ * Add a patch to fix a spelling error.
-- Dylan Aïssi <bob.dybian@gmail.com> Thu, 01 Dec 2016 23:17:22 +0100
diff --git a/debian/patches/Fix_spelling_error.patch b/debian/patches/Fix_spelling_error.patch
new file mode 100644
index 0000000..5d601d1
--- /dev/null
+++ b/debian/patches/Fix_spelling_error.patch
@@ -0,0 +1,16 @@
+Author: Dylan Aïssi
+Description: Fix spelling error.
+Last-Update: 2016-12-06
+Forwarded: TODO
+
+--- a/src/via_xv.c
++++ b/src/via_xv.c
+@@ -357,7 +357,7 @@
+ memEfficiency = (float)SINGLE_3205_133;
+ break;
+ default:
+- ErrorF("Unknow DRAM Type!\n");
++ ErrorF("Unknown DRAM Type!\n");
+ mClock = 166;
+ memEfficiency = (float)SINGLE_3205_133;
+ break;
diff --git a/debian/patches/series b/debian/patches/series
index a82d1b4..b234234 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-#placeholder
+Fix_spelling_error.patch
commit fe4ac74ccc018c34ab79a38c972de658c50944a0
Author: Dylan Aïssi <bob.dybian@gmail.com>
Date: Tue Dec 6 18:06:49 2016 +0100
Remove unnecessary reference to autoreconf since debhelper 10
diff --git a/debian/control b/debian/control
index 9576def..f03cb90 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,6 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Build-Depends:
debhelper (>= 10),
- dh-autoreconf,
libdrm-dev (>> 2.0) [!hurd-i386],
libgl1-mesa-dev | libgl1-dev,
libx11-dev,
diff --git a/debian/rules b/debian/rules
index 6a110ae..2615388 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,7 +35,7 @@ override_dh_strip:
dh_strip --dbg-package=xserver-xorg-video-openchrome-dbg
%:
- dh $@ --with quilt,autoreconf,xsf --builddirectory=build/
+ 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/-.*$$//')
commit 4d135aad1b327e0b0eff0733b0609fde704b4d7b
Author: Dylan Aïssi <bob.dybian@gmail.com>
Date: Sat Dec 3 00:20:18 2016 +0100
wrap-and-sort -a -s
diff --git a/debian/control b/debian/control
index 37b8fb2..9576def 100644
--- a/debian/control
+++ b/debian/control
@@ -2,25 +2,27 @@ Source: xserver-xorg-video-openchrome
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Build-Depends: debhelper (>= 10),
- dh-autoreconf,
- libdrm-dev (>> 2.0) [!hurd-i386],
- libgl1-mesa-dev | libgl1-dev,
- libx11-dev,
- libxvmc-dev,
- pkg-config,
- quilt,
- x11proto-core-dev,
- x11proto-fonts-dev,
- x11proto-gl-dev,
- x11proto-randr-dev,
- x11proto-render-dev,
- x11proto-video-dev,
- x11proto-xext-dev,
- x11proto-xf86dri-dev,
- xserver-xorg-dev (>= 2:1.9.4),
- xutils-dev
-Build-Conflicts: autoconf2.13
+Build-Depends:
+ debhelper (>= 10),
+ dh-autoreconf,
+ libdrm-dev (>> 2.0) [!hurd-i386],
+ libgl1-mesa-dev | libgl1-dev,
+ libx11-dev,
+ libxvmc-dev,
+ pkg-config,
+ quilt,
+ x11proto-core-dev,
+ x11proto-fonts-dev,
+ x11proto-gl-dev,
+ x11proto-randr-dev,
+ x11proto-render-dev,
+ x11proto-video-dev,
+ x11proto-xext-dev,
+ x11proto-xf86dri-dev,
+ xserver-xorg-dev (>= 2:1.9.4),
+ xutils-dev
+Build-Conflicts:
+ autoconf2.13
Standards-Version: 3.9.8
Homepage: https://www.freedesktop.org/wiki/Openchrome/
Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-video-openchrome.git
@@ -28,8 +30,12 @@ Vcs-Browser: https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-video-o
Package: xserver-xorg-video-openchrome
Architecture: amd64 hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 x32
-Depends: ${misc:Depends}, ${shlibs:Depends}, ${xviddriver:Depends}
-Provides: ${xviddriver:Provides}
+Depends:
+ ${misc:Depends},
+ ${shlibs: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.
@@ -48,7 +54,9 @@ Package: xserver-xorg-video-openchrome-dbg
Architecture: amd64 hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 x32
Section: debug
Priority: extra
-Depends: xserver-xorg-video-openchrome (= ${binary:Version}), ${misc:Depends}
+Depends:
+ xserver-xorg-video-openchrome (= ${binary:Version}),
+ ${misc:Depends}
Description: X.Org X server -- VIA display driver -- debugging symbols
OpenChrome is a project for the development of free and open-source drivers
for the VIA UniChrome video chipsets.
commit b0b24b9f8c84b4fa7a43b77e574d7186f5e73b1e
Author: Dylan Aïssi <bob.dybian@gmail.com>
Date: Fri Dec 2 23:03:48 2016 +0100
Bump debhelper compat to 10
diff --git a/debian/changelog b/debian/changelog
index 31b96e0..d6cf99a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ xserver-xorg-video-openchrome (1:0.5.0-1) UNRELEASED; urgency=medium
* Bump Standards-Version to 3.9.8:
- Remove DM-Upload-Allowed field.
* Update and convert d/copyright to DEP5.
+ * Bump debhelper compat to 10.
-- Dylan Aïssi <bob.dybian@gmail.com> Thu, 01 Dec 2016 23:17:22 +0100
diff --git a/debian/compat b/debian/compat
index 45a4fb7..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+10
diff --git a/debian/control b/debian/control
index af24917..37b8fb2 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-video-openchrome
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Build-Depends: debhelper (>= 8),
+Build-Depends: debhelper (>= 10),
dh-autoreconf,
libdrm-dev (>> 2.0) [!hurd-i386],
libgl1-mesa-dev | libgl1-dev,
diff --git a/debian/rules b/debian/rules
index 9835f25..6a110ae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,8 @@
DEB_CONFIGURE_EXTRA_FLAGS := \
--disable-maintainer-mode \
- --disable-dependency-tracking
+ --disable-dependency-tracking \
+ --libdir=/usr/lib
ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
DEB_CONFIGURE_EXTRA_FLAGS += \
@@ -34,7 +35,7 @@ override_dh_strip:
dh_strip --dbg-package=xserver-xorg-video-openchrome-dbg
%:
- dh $@ --parallel --with quilt,autoreconf,xsf --builddirectory=build/
+ dh $@ --with quilt,autoreconf,xsf --builddirectory=build/
gentarball: SOURCE=xserver-xorg-video-openchrome
gentarball: UV=$(shell dpkg-parsechangelog|awk '/^Version:/ {print $$2}'|sed 's/^[0-9]*://;s/-.*$$//')
commit 1e5d429cb54b0af74b95e49b7b8e71a449bf53d2
Author: Dylan Aïssi <bob.dybian@gmail.com>
Date: Fri Dec 2 22:57:08 2016 +0100
Update and convert d/copyright to DEP5
diff --git a/debian/changelog b/debian/changelog
index 8f33f8e..31b96e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ xserver-xorg-video-openchrome (1:0.5.0-1) UNRELEASED; urgency=medium
* Update debian/watch.
* Bump Standards-Version to 3.9.8:
- Remove DM-Upload-Allowed field.
+ * Update and convert d/copyright to DEP5.
-- Dylan Aïssi <bob.dybian@gmail.com> Thu, 01 Dec 2016 23:17:22 +0100
diff --git a/debian/copyright b/debian/copyright
index 39167f9..c3162b9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,65 +1,64 @@
-This package was debianized by Mario Limonciello <superm1@ubuntu.com> on
-Tue, 27 July 2007 16:41:23 -0500
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: xf86-video-openchrome
+Upstream-Contact: Kevin Brace <kevinbrace at gmx.com>
+Source: https://xorg.freedesktop.org/releases/individual/driver/
-This original source for this package was obtained via the upstream
-svn branch at http://svn.openchrome.org/svn/trunk
+Files: *
+Copyright: 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+ 2000 VA Linux Systems, Inc.
+ 1998-2003 VIA Technologies, Inc. All Rights Reserved.
+ 2000 Intel Corporation. All rights reserved.
+ 2001-2003 S3 Graphics, Inc. All Rights Reserved.
+ 2003 Red Hat, Inc. All Rights Reserved.
+ 2004-2005 The Unichrome Project. All rights reserved.
+ 2004-2006 Andreas Robinson. All Rights Reserved.
+ 2004-2006 Bernhard Rosenkraenzer. All Rights Reserved.
+ 2004-2006 Ivor Hewitt. All Rights Reserved.
+ 2004-2006 Luc Verhaegen. All Rights Reserved.
+ 2004-2006 Terry Barnaby. All Rights Reserved.
+ 2004-2006 Thomas Hellstrom. All Rights Reserved.
+ 2007-2008 Gabriel Mansi.
+ 2005-2016 The OpenChrome Project
+ 2015-2016 Kevin Brace
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sub license,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice (including the
+ next paragraph) shall be included in all copies or substantial portions
+ of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
-Copyright (c) 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-Copyright (c) 2000 VA Linux Systems, Inc.
-Copyright (c) 1998-2003 VIA Technologies, Inc. All Rights Reserved.
-Copyright (c) 2000 Intel Corporation. All rights reserved.
-Copyright (c) 2001-2003 S3 Graphics, Inc. All Rights Reserved.
-Copyright (c) 2003 Red Hat, Inc. All Rights Reserved.
-Copyright (c) 2004-2005 The Unichrome Project. All rights reserved.
-Copyright (c) 2004-2006 Andreas Robinson. All Rights Reserved.
-Copyright (c) 2004-2006 Bernhard Rosenkraenzer. All Rights Reserved.
-Copyright (c) 2004-2006 Ivor Hewitt. All Rights Reserved.
-Copyright (c) 2004-2006 Luc Verhaegen. All Rights Reserved.
-Copyright (c) 2004-2006 Terry Barnaby. All Rights Reserved.
-Copyright (c) 2004-2006 Thomas Hellstrom. All Rights Reserved.
-Copyright (c) 2005-2008 The Openchrome Project [openchrome.org]
-Copyright (c) 2007-2008 Gabriel Mansi.
-
-Driver (upstream) License:
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sub license,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-
-Packaging License:
+Files: debian/*
+Copyright: Eric Work <work.eric@gmail.com>
+ 2007 Mario Limonciello <superm1@ubuntu.com>
+ 2007-2008 Raphael Geissert <atomo64@gmail.com>
+ 2010-2015 Julien Viard de Galbert <julien@vdg.blogsite.org>
+License: GPL-3+
This packaging 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 3 of the License, or (at your option) any later version.
-
+ .
This packaging 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
+ 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 package; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-On Debian systems, a complete copy of the GPL can be found under
-/usr/share/common-licenses/GPL-3
-
-The Debian packaging is Copyright 2010- by Julien Viard de Galbert <julien@vdg.blogsite.org>
-based on Copyright 2007-2008 by Raphael Geissert <atomo64@gmail.com>
-based on the work © 2007 by Mario Limonciello <superm1@ubuntu.com> which was
-based upon the work by Eric Work <work.eric@gmail.com> and is licensed
-under the GPL.
+ .
+ On Debian systems, the full text of the GNU General Public License
+ version 3 can be found in `/usr/share/common-licenses/GPL-3'.
commit a5b6fd6dea9b02d0cba0681ef489e80d5460c63b
Author: Dylan Aïssi <bob.dybian@gmail.com>
Date: Fri Dec 2 22:35:24 2016 +0100
wrap-and-sort
diff --git a/debian/control b/debian/control
index c431d66..af24917 100644
--- a/debian/control
+++ b/debian/control
@@ -2,25 +2,24 @@ Source: xserver-xorg-video-openchrome
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Build-Depends:
- debhelper (>= 8),
- dh-autoreconf,
- pkg-config,
- xserver-xorg-dev (>= 2:1.9.4),
- xutils-dev,
- x11proto-core-dev,
- x11proto-fonts-dev,
- x11proto-randr-dev,
- x11proto-render-dev,
- x11proto-xext-dev,
- x11proto-xf86dri-dev,
- x11proto-video-dev,
- x11proto-gl-dev,
- libdrm-dev (>> 2.0) [!hurd-i386],
- libx11-dev,
- libgl1-mesa-dev | libgl1-dev,
- libxvmc-dev,
- quilt
+Build-Depends: debhelper (>= 8),
+ dh-autoreconf,
+ libdrm-dev (>> 2.0) [!hurd-i386],
+ libgl1-mesa-dev | libgl1-dev,
+ libx11-dev,
+ libxvmc-dev,
+ pkg-config,
+ quilt,
+ x11proto-core-dev,
+ x11proto-fonts-dev,
+ x11proto-gl-dev,
+ x11proto-randr-dev,
+ x11proto-render-dev,
+ x11proto-video-dev,
+ x11proto-xext-dev,
+ x11proto-xf86dri-dev,
+ xserver-xorg-dev (>= 2:1.9.4),
+ xutils-dev
Build-Conflicts: autoconf2.13
Standards-Version: 3.9.8
Homepage: https://www.freedesktop.org/wiki/Openchrome/
@@ -28,13 +27,9 @@ Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-video-openc
Vcs-Browser: https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-video-openchrome.git
Package: xserver-xorg-video-openchrome
-Architecture: i386 amd64 x32 hurd-i386 kfreebsd-i386 kfreebsd-amd64
-Depends:
- ${shlibs:Depends},
- ${misc:Depends},
- ${xviddriver:Depends},
-Provides:
- ${xviddriver:Provides}
+Architecture: amd64 hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 x32
+Depends: ${misc:Depends}, ${shlibs: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.
@@ -50,12 +45,10 @@ Description: X.Org X server -- VIA display driver
and open-source drivers is to use this version of the driver.
Package: xserver-xorg-video-openchrome-dbg
-Architecture: i386 amd64 x32 hurd-i386 kfreebsd-i386 kfreebsd-amd64
+Architecture: amd64 hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 x32
Section: debug
Priority: extra
-Depends:
- xserver-xorg-video-openchrome (= ${binary:Version}),
- ${misc:Depends}
+Depends: xserver-xorg-video-openchrome (= ${binary:Version}), ${misc:Depends}
Description: X.Org X server -- VIA display driver -- debugging symbols
OpenChrome is a project for the development of free and open-source drivers
for the VIA UniChrome video chipsets.
diff --git a/debian/copyright b/debian/copyright
index 52aef14..39167f9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -61,5 +61,5 @@ On Debian systems, a complete copy of the GPL can be found under
The Debian packaging is Copyright 2010- by Julien Viard de Galbert <julien@vdg.blogsite.org>
based on Copyright 2007-2008 by Raphael Geissert <atomo64@gmail.com>
based on the work © 2007 by Mario Limonciello <superm1@ubuntu.com> which was
-based upon the work by Eric Work <work.eric@gmail.com> and is licensed
+based upon the work by Eric Work <work.eric@gmail.com> and is licensed
under the GPL.
diff --git a/debian/links b/debian/links
index aedc5bd..1aec25c 100644
--- a/debian/links
+++ b/debian/links
@@ -1 +1 @@
-usr/share/bug/xserver-xorg-core/script usr/share/bug/xserver-xorg-video-openchrome/script
\ No newline at end of file
+usr/share/bug/xserver-xorg-core/script usr/share/bug/xserver-xorg-video-openchrome/script
diff --git a/debian/xserver-xorg-video-openchrome.install b/debian/xserver-xorg-video-openchrome.install
index b9c0996..9768350 100644
--- a/debian/xserver-xorg-video-openchrome.install
+++ b/debian/xserver-xorg-video-openchrome.install
@@ -1,3 +1,3 @@
-usr/lib/xorg/modules/drivers/*.so
usr/lib/*/libchromeXvMC*
+usr/lib/xorg/modules/drivers/*.so
usr/share/man
commit 6e73e32b3b482a2002c8d9d92bbcacb6fdbd393d
Author: Dylan Aïssi <bob.dybian@gmail.com>
Date: Fri Dec 2 22:33:12 2016 +0100
Bump Standards-Version to 3.9.8
diff --git a/debian/changelog b/debian/changelog
index 4291726..8f33f8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ xserver-xorg-video-openchrome (1:0.5.0-1) UNRELEASED; urgency=medium
- Add x32 (Closes: #775201).
* Remove libdrm-dev from Build-Depend for Hurd (Closes: #672546).
* Update debian/watch.
+ * Bump Standards-Version to 3.9.8:
+ - Remove DM-Upload-Allowed field.
-- Dylan Aïssi <bob.dybian@gmail.com> Thu, 01 Dec 2016 23:17:22 +0100
diff --git a/debian/control b/debian/control
index 9942606..c431d66 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,6 @@ Source: xserver-xorg-video-openchrome
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-DM-Upload-Allowed: yes
Build-Depends:
debhelper (>= 8),
dh-autoreconf,
@@ -23,7 +22,7 @@ Build-Depends:
libxvmc-dev,
quilt
Build-Conflicts: autoconf2.13
-Standards-Version: 3.9.3
+Standards-Version: 3.9.8
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 2aa9e048a8b531e144e265896c61c71743ddcb49
Author: Dylan Aïssi <bob.dybian@gmail.com>
Date: Fri Dec 2 00:13:27 2016 +0100
Update watch file
diff --git a/debian/changelog b/debian/changelog
index 1677eaf..4291726 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ xserver-xorg-video-openchrome (1:0.5.0-1) UNRELEASED; urgency=medium
- Remove LPIA discontinuted.
- Add x32 (Closes: #775201).
* Remove libdrm-dev from Build-Depend for Hurd (Closes: #672546).
+ * Update debian/watch.
-- Dylan Aïssi <bob.dybian@gmail.com> Thu, 01 Dec 2016 23:17:22 +0100
diff --git a/debian/watch b/debian/watch
index 5edf1c3..14bee62 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,2 @@
-version=3
-
-http://xorg.freedesktop.org/archive/individual/driver//xf86-video-openchrome-(\d.*)\.tar\.gz
+version=4
+https://xorg.freedesktop.org/releases/individual/driver/ xf86-video-openchrome-(\d.*)\.tar\.gz
commit bb786e3a1ac6fd4b9f117caa8c4c5af6a6052b2e
Author: Dylan Aïssi <bob.dybian@gmail.com>
Date: Fri Dec 2 00:02:57 2016 +0100
Remove libdrm-dev from Build-Depend for Hurd (Closes: #672546)
diff --git a/debian/changelog b/debian/changelog
index 0884de5..1677eaf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ xserver-xorg-video-openchrome (1:0.5.0-1) UNRELEASED; urgency=medium
* Architectures:
- Remove LPIA discontinuted.
- Add x32 (Closes: #775201).
+ * Remove libdrm-dev from Build-Depend for Hurd (Closes: #672546).
-- Dylan Aïssi <bob.dybian@gmail.com> Thu, 01 Dec 2016 23:17:22 +0100
diff --git a/debian/control b/debian/control
index 3079eba..9942606 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
x11proto-xf86dri-dev,
x11proto-video-dev,
x11proto-gl-dev,
- libdrm-dev (>> 2.0),
+ libdrm-dev (>> 2.0) [!hurd-i386],
libx11-dev,
libgl1-mesa-dev | libgl1-dev,
libxvmc-dev,
commit 5162cf22092c7523e352fab8269cf243804fb944
Author: Dylan Aïssi <bob.dybian@gmail.com>
Date: Thu Dec 1 23:54:39 2016 +0100
Add x32 architecture
diff --git a/debian/changelog b/debian/changelog
index 710ba10..0884de5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xserver-xorg-video-openchrome (1:0.5.0-1) UNRELEASED; urgency=medium
* Add debian/source/format file.
* Architectures:
- Remove LPIA discontinuted.
+ - Add x32 (Closes: #775201).
-- Dylan Aïssi <bob.dybian@gmail.com> Thu, 01 Dec 2016 23:17:22 +0100
diff --git a/debian/control b/debian/control
index 890ae0d..3079eba 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,7 @@ Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-video-openc
Vcs-Browser: https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-video-openchrome.git
Package: xserver-xorg-video-openchrome
-Architecture: i386 amd64 hurd-i386 kfreebsd-i386 kfreebsd-amd64
+Architecture: i386 amd64 x32 hurd-i386 kfreebsd-i386 kfreebsd-amd64
Depends:
${shlibs:Depends},
${misc:Depends},
@@ -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: xserver-xorg-video-openchrome-dbg
-Architecture: i386 amd64 hurd-i386 kfreebsd-i386 kfreebsd-amd64
+Architecture: i386 amd64 x32 hurd-i386 kfreebsd-i386 kfreebsd-amd64
Section: debug
Priority: extra
Depends:
commit 9f9010aad1d184cc399327a27277b6f1cbb01506
Author: Dylan Aïssi <bob.dybian@gmail.com>
Date: Thu Dec 1 23:52:47 2016 +0100
Remove LPIA architecture, discontinued
diff --git a/debian/changelog b/debian/changelog
index bc07104..710ba10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ xserver-xorg-video-openchrome (1:0.5.0-1) UNRELEASED; urgency=medium
* Update VCS fields.
* Update lintian overrides.
* Add debian/source/format file.
+ * Architectures:
+ - Remove LPIA discontinuted.
-- Dylan Aïssi <bob.dybian@gmail.com> Thu, 01 Dec 2016 23:17:22 +0100
diff --git a/debian/control b/debian/control
index ce5e2c5..890ae0d 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,7 @@ Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-video-openc
Vcs-Browser: https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-video-openchrome.git
Package: xserver-xorg-video-openchrome
-Architecture: i386 amd64 hurd-i386 kfreebsd-i386 kfreebsd-amd64 lpia
+Architecture: i386 amd64 hurd-i386 kfreebsd-i386 kfreebsd-amd64
Depends:
${shlibs:Depends},
${misc:Depends},
@@ -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: xserver-xorg-video-openchrome-dbg
-Architecture: i386 amd64 hurd-i386 kfreebsd-i386 kfreebsd-amd64 lpia
+Architecture: i386 amd64 hurd-i386 kfreebsd-i386 kfreebsd-amd64
Section: debug
Priority: extra
Depends:
commit b10535b57ed1f6114497978e852adbe7df2fc66f
Author: Dylan Aïssi <bob.dybian@gmail.com>
Date: Thu Dec 1 23:45:18 2016 +0100
Add debian/source/format file
diff --git a/debian/changelog b/debian/changelog
index 3ee445f..bc07104 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xserver-xorg-video-openchrome (1:0.5.0-1) UNRELEASED; urgency=medium
* New upstream release.
* Update VCS fields.
* Update lintian overrides.
+ * Add debian/source/format file.
-- Dylan Aïssi <bob.dybian@gmail.com> Thu, 01 Dec 2016 23:17:22 +0100
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..d3827e7
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+1.0
commit e768832e5440e86ac0e71e3ea59516f2b9e4ba0a
Author: Dylan Aïssi <bob.dybian@gmail.com>
Date: Thu Dec 1 23:36:52 2016 +0100
Update lintian overrides
diff --git a/debian/changelog b/debian/changelog
index 740f0ad..3ee445f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-video-openchrome (1:0.5.0-1) UNRELEASED; urgency=medium
* Team upload.
* New upstream release.
* Update VCS fields.
+ * Update lintian overrides.
-- Dylan Aïssi <bob.dybian@gmail.com> Thu, 01 Dec 2016 23:17:22 +0100
diff --git a/debian/xserver-xorg-video-openchrome.lintian-overrides b/debian/xserver-xorg-video-openchrome.lintian-overrides
index e441ab4..d6a62d3 100644
--- a/debian/xserver-xorg-video-openchrome.lintian-overrides
+++ b/debian/xserver-xorg-video-openchrome.lintian-overrides
@@ -1,5 +1,5 @@
-xserver-xorg-video-openchrome: non-dev-pkg-with-shlib-symlink usr/lib/libchromeXvMCPro.so.1.0.0 usr/lib/libchromeXvMCPro.so
-xserver-xorg-video-openchrome: non-dev-pkg-with-shlib-symlink usr/lib/libchromeXvMC.so.1.0.0 usr/lib/libchromeXvMC.so
+xserver-xorg-video-openchrome: non-dev-pkg-with-shlib-symlink
+xserver-xorg-video-openchrome: non-dev-pkg-with-shlib-symlink
xserver-xorg-video-openchrome: package-name-doesnt-match-sonames libchromeXvMC1 libchromeXvMCPro1
-xserver-xorg-video-openchrome: no-symbols-control-file usr/lib/libchromeXvMCPro.so.1.0.0
-xserver-xorg-video-openchrome: no-symbols-control-file usr/lib/libchromeXvMC.so.1.0.0
+xserver-xorg-video-openchrome: no-symbols-control-file
+xserver-xorg-video-openchrome: no-symbols-control-file
commit 591226c3e3c849b433b803128709a6ef193c72e3
Author: Dylan Aïssi <bob.dybian@gmail.com>
Date: Thu Dec 1 23:31:57 2016 +0100
Update VCS fields
diff --git a/debian/changelog b/debian/changelog
index 11b4b38..740f0ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-video-openchrome (1:0.5.0-1) UNRELEASED; urgency=medium
* Team upload.
* New upstream release.
+ * Update VCS fields.
-- Dylan Aïssi <bob.dybian@gmail.com> Thu, 01 Dec 2016 23:17:22 +0100
diff --git a/debian/control b/debian/control
index 4afae50..ce5e2c5 100644
--- a/debian/control
+++ b/debian/control
@@ -25,8 +25,8 @@ Build-Depends:
Build-Conflicts: autoconf2.13
Standards-Version: 3.9.3
Homepage: https://www.freedesktop.org/wiki/Openchrome/
-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-openchrome
-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-openchrome.git
+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
Package: xserver-xorg-video-openchrome
Architecture: i386 amd64 hurd-i386 kfreebsd-i386 kfreebsd-amd64 lpia
Reply to: