[Pkg-fglrx-devel] r1301 - in fglrx-driver/branches/13.11-experimental/debian: . module
Andreas Beckmann
anbe at alioth.debian.org
Sun Nov 10 17:05:04 UTC 2013
Author: anbe
Date: 2013-11-10 17:05:02 +0000 (Sun, 10 Nov 2013)
New Revision: 1301
Modified:
fglrx-driver/branches/13.11-experimental/debian/README.source
fglrx-driver/branches/13.11-experimental/debian/changelog
fglrx-driver/branches/13.11-experimental/debian/control
fglrx-driver/branches/13.11-experimental/debian/module/control.template.in
fglrx-driver/branches/13.11-experimental/debian/rules
fglrx-driver/branches/13.11-experimental/debian/switchlibGL
Log:
merge changes from 1:13.4-4 (trunk @ r 1300)
Modified: fglrx-driver/branches/13.11-experimental/debian/README.source
===================================================================
--- fglrx-driver/branches/13.11-experimental/debian/README.source 2013-11-10 16:59:41 UTC (rev 1300)
+++ fglrx-driver/branches/13.11-experimental/debian/README.source 2013-11-10 17:05:02 UTC (rev 1301)
@@ -6,7 +6,7 @@
DEB_BUILD_OPTIONS="VER=11-1" debian/rules get-orig-source
This will wget version 11-1 of fglrx-driver from the upstream download
- resource, and repackage it under "../".
+ resource, and repackage it in the current directory.
* Sometimes the (beta) release does not contain a signature which will
result in displaying an unwanted watermark. The signature file needs to
Modified: fglrx-driver/branches/13.11-experimental/debian/changelog
===================================================================
--- fglrx-driver/branches/13.11-experimental/debian/changelog 2013-11-10 16:59:41 UTC (rev 1300)
+++ fglrx-driver/branches/13.11-experimental/debian/changelog 2013-11-10 17:05:02 UTC (rev 1301)
@@ -1,3 +1,9 @@
+fglrx-driver (1:13.11~betav1-2) UNRELEASED; urgency=low
+
+ * Merge changes from 1:13.4-4.
+
+ -- Andreas Beckmann <anbe at debian.org> Sun, 10 Nov 2013 18:03:06 +0100
+
fglrx-driver (1:13.11~betav1-1) experimental; urgency=low
* New upstream beta release 13.11-betav1 (2013-10-01).
@@ -29,19 +35,30 @@
* 13.4-2013.05.29.diff: New patch containing the changes from upstream
re-release 13.4 (2013-05-29) (12.104)
+ * Make libgl1-fglrx-glx-i386:i386 a real package depending on
+ libgl1-fglrx-glx:i386 and set M-A: foreign, s.t. the Recommends in
+ libgl1-fglrx-glx:amd64 actually works.
+ * Improve support for hybrid graphics that need the fglrx Xserver module and
+ the MESA libGL library for igpu operation. (Closes: #699879)
+ * Bump glx-alternative-fglrx dependency to 0.4.1 to ensure the
+ /usr/lib/fglrx/igpu alternative is available.
* amd-opencl-dev: Provides/Conflicts/Replaces: opencl-dev.
+ * Prefer amd-opencl-icd over the virtual opencl-icd. (Closes: #695884)
* amd-libopencl1: Provide virtual packages libopencl-1.1-1 and
libopencl-1.2-1 and update description.
- * amd-libopencl1.symbols: New. Distinguish the neccessary dependency on
+ * amd-libopencl1.symbols: New. Distinguish the necessary dependency on
libopencl-{1.1,1.2}-1 via the versioned symbols being used.
* Move the libOpenCL.so symlink from amd-libopencl1 to amd-opencl-dev and
adjust Depends/Breaks/Replaces accordingly.
* d/rules{,.defs}: Add support for yet another upstream file naming scheme.
* Don't explicitly request xz compression - dpkg 1.17 does this by default.
* Drop empty Description paragraphs that worked around dpkg bug #680871.
+ * get-orig-source: Place tarball in current directory. (Closes: #718220)
+ * Update Homepage URLs.
+ * debian/module/control.template.in: Sync with debian/control.
* Update lintian overrides.
- -- Andreas Beckmann <anbe at debian.org> Fri, 26 Jul 2013 01:04:26 +0200
+ -- Andreas Beckmann <anbe at debian.org> Thu, 17 Oct 2013 22:18:40 +0200
fglrx-driver (1:13.4-3) unstable; urgency=low
Modified: fglrx-driver/branches/13.11-experimental/debian/control
===================================================================
--- fglrx-driver/branches/13.11-experimental/debian/control 2013-11-10 16:59:41 UTC (rev 1300)
+++ fglrx-driver/branches/13.11-experimental/debian/control 2013-11-10 17:05:02 UTC (rev 1301)
@@ -27,7 +27,7 @@
Vcs-Svn: svn://anonscm.debian.org/pkg-fglrx/fglrx-driver/trunk
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-fglrx/fglrx-driver/trunk/
XS-Autobuild: yes
-Homepage: http://support.amd.com/us/gpudownload/linux/Pages/radeon_linux.aspx
+Homepage: http://support.amd.com/en-us/download/desktop?os=Linux%20x86
# ${fglrx}-driver
Package: fglrx-driver
@@ -36,7 +36,7 @@
lib${fglrx} (= ${binary:Version}),
${fglrx:XorgDepends},
xserver-xorg-core,
- glx-alternative-fglrx (>= 0.3),
+ glx-alternative-fglrx (>= 0.4.1~),
${shlibs:Depends},
${misc:Depends}
Recommends:
@@ -165,7 +165,6 @@
${misc:Depends}
Provides:
libgl1-fglrx-glx-virtual,
- libgl1-${fglrx}-glx-i386 [i386],
Conflicts:
libgl1-fglrx-glx-virtual,
fglrx-glx,
@@ -183,6 +182,19 @@
.
This package provides the proprietary libGL shipped by ATI/AMD.
+#Package: libgl1-${fglrx}-glx-i386
+Package: libgl1-fglrx-glx-i386
+Architecture: i386
+Multi-Arch: foreign
+Depends:
+ libgl1-${fglrx}-glx,
+ ${shlibs:Depends},
+ ${misc:Depends}
+Description: ATI/AMD binary OpenGL 32-bit libraries${nvidia:LegacyDesc}
+ This metapackage helps the automatic installation of the 32-bit ATI/AMD
+ OpenGL libraries when installing libgl1-${fglrx}-glx
+ on amd64 with foreign architecture i386 enabled.
+
# ${fglrx}-modules-dkms
Package: fglrx-modules-dkms
Section: non-free/kernel
@@ -301,7 +313,7 @@
Pre-Depends:
${misc:Pre-Depends}
Depends:
- libopencl1,
+ ocl-icd-libopencl1 | amd-libopencl1 | libopencl1,
${shlibs:Depends},
${misc:Depends}
Enhances:
@@ -315,7 +327,7 @@
amd-app,
Replaces:
amd-opencl-icd-virtual,
-Homepage: http://developer.amd.com/zones/openclzone/pages/default.aspx
+Homepage: http://developer.amd.com/resources/heterogeneous-computing/opencl-zone/
Description: AMD OpenCL ICD${fglrx:VariantDescSuffix}
OpenCL (Open Computing Language) is a multivendor open standard for
general-purpose parallel programming of heterogeneous systems that include
@@ -336,7 +348,7 @@
${shlibs:Depends},
${misc:Depends}
Recommends:
- opencl-icd | amd-opencl-icd,
+ amd-opencl-icd | opencl-icd,
Provides:
libopencl1,
libopencl-1.1-1,
@@ -345,10 +357,10 @@
libopencl1,
amd-app,
Breaks:
- amd-opencl-dev (<< 1:13.4-4),
+ amd-opencl-dev (<< 1:13.4-4~),
Replaces:
libopencl1,
-Homepage: http://developer.amd.com/zones/openclzone/pages/default.aspx
+Homepage: http://developer.amd.com/resources/heterogeneous-computing/opencl-zone/
Description: AMD OpenCL ICD Loader library
OpenCL (Open Computing Language) is a multivendor open standard for
general-purpose parallel programming of heterogeneous systems that include
@@ -376,7 +388,7 @@
opencl-dev,
Replaces:
opencl-dev,
- amd-libopencl1 (<< 1:13.4-4),
+ amd-libopencl1 (<< 1:13.4-4~),
Description: AMD OpenCL development files
OpenCL (Open Computing Language) is a multi-vendor open standard for
general-purpose parallel programming of heterogeneous systems that include
@@ -390,8 +402,8 @@
${shlibs:Depends},
${misc:Depends}
Recommends:
- opencl-icd | amd-opencl-icd,
-Homepage: http://developer.amd.com/zones/openclzone/pages/default.aspx
+ amd-opencl-icd | opencl-icd,
+Homepage: http://developer.amd.com/resources/heterogeneous-computing/opencl-zone/
Description: AMD OpenCL info utility
OpenCL (Open Computing Language) is a multivendor open standard for
general-purpose parallel programming of heterogeneous systems that include
Modified: fglrx-driver/branches/13.11-experimental/debian/module/control.template.in
===================================================================
--- fglrx-driver/branches/13.11-experimental/debian/module/control.template.in 2013-11-10 16:59:41 UTC (rev 1300)
+++ fglrx-driver/branches/13.11-experimental/debian/module/control.template.in 2013-11-10 17:05:02 UTC (rev 1301)
@@ -6,13 +6,12 @@
Patrick Matthäi <pmatthaei at debian.org>,
Michael Gilbert <mgilbert at debian.org>,
Andreas Beckmann <debian at abeckmann.de>,
-DM-Upload-Allowed: yes
Build-Depends: debhelper (>= 8)
-Standards-Version: 3.9.3
-Vcs-Svn: svn://svn.debian.org/svn/pkg-fglrx/fglrx-driver/trunk
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-fglrx/fglrx-driver/trunk/
+Standards-Version: 3.9.4
+Vcs-Svn: svn://anonscm.debian.org/pkg-fglrx/fglrx-driver/trunk
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-fglrx/fglrx-driver/trunk/
XS-Autobuild: yes
-Homepage: http://ati.amd.com/support/drivers/linux/linux-radeon.html
+Homepage: http://support.amd.com/en-us/download/desktop?os=Linux%20x86
Package: _FGLRX_-kernel-#KVERS#
Architecture: i386 amd64
Modified: fglrx-driver/branches/13.11-experimental/debian/rules
===================================================================
--- fglrx-driver/branches/13.11-experimental/debian/rules 2013-11-10 16:59:41 UTC (rev 1300)
+++ fglrx-driver/branches/13.11-experimental/debian/rules 2013-11-10 17:05:02 UTC (rev 1301)
@@ -218,7 +218,7 @@
[ ! -s $(CACHEDIR)/$(INSTALLER) ] || cp -a $(CACHEDIR)/$(INSTALLER) .
[ -s $(INSTALLER) ] || unzip $(CACHEDIR)/$(INSTALLER_ZIP)
-../$(packagename)_$(REAL_UPSTREAM_VERSION).orig.tar.xz: $(INSTALLER) debian/rules
+$(packagename)_$(REAL_UPSTREAM_VERSION).orig.tar.xz: $(INSTALLER) debian/rules
rm -fr $(packagename)-$(REAL_UPSTREAM_VERSION).orig
sh $(INSTALLER) --extract $(packagename)-$(REAL_UPSTREAM_VERSION).orig
@set -x ; \
@@ -233,7 +233,6 @@
tar -cJf $(packagename)_$(REAL_UPSTREAM_VERSION).orig.tar.xz \
--owner=root --group=src \
$(packagename)-$(REAL_UPSTREAM_VERSION).orig
- mv $(packagename)_$(REAL_UPSTREAM_VERSION).orig.tar.xz ../
# Cleanup.
rm -fr $(packagename)-$(REAL_UPSTREAM_VERSION).orig
@@ -241,7 +240,7 @@
$(MAKE) -f debian/rules repack_upstream_archive
rm -f $(INSTALLER)
-repack_upstream_archive: ../$(packagename)_$(REAL_UPSTREAM_VERSION).orig.tar.xz
+repack_upstream_archive: $(packagename)_$(REAL_UPSTREAM_VERSION).orig.tar.xz
else
get-orig-source:
# This target needs DEB_BUILD_OPTIONS to contain the version specification
Modified: fglrx-driver/branches/13.11-experimental/debian/switchlibGL
===================================================================
--- fglrx-driver/branches/13.11-experimental/debian/switchlibGL 2013-11-10 16:59:41 UTC (rev 1300)
+++ fglrx-driver/branches/13.11-experimental/debian/switchlibGL 2013-11-10 17:05:02 UTC (rev 1301)
@@ -21,7 +21,7 @@
get_current()
{
case "$(update-alternatives --query glx | sed -ne 's/^Value: //p')" in
- /usr/lib/mesa-diverted)
+ /usr/lib/fglrx/igpu)
echo "intel"
;;
/usr/lib/fglrx)
@@ -38,7 +38,7 @@
update-alternatives --set glx /usr/lib/fglrx
;;
intel)
- update-alternatives --set glx /usr/lib/mesa-diverted
+ update-alternatives --set glx /usr/lib/fglrx/igpu
;;
query)
get_current
More information about the Pkg-fglrx-devel
mailing list