[pkg-nvidia-devel] r1193 - in /packages/nvidia-graphics-drivers/trunk/debian: README.source changelog control libgl1-nvidia-glx-ia32.lintian-overrides.in libgl1-nvidia-glx-ia32.symbols libgl1-nvidia-glx.lintian-overrides.in libgl1-nvidia-glx.symbols rules
anbe-guest at users.alioth.debian.org
anbe-guest at users.alioth.debian.org
Mon Jun 28 02:52:28 UTC 2010
Author: anbe-guest
Date: Mon Jun 28 02:52:27 2010
New Revision: 1193
URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=1193
Log:
rename nvidia-libgl1* to libgl1-nvidia{,-glx}*
Modified:
packages/nvidia-graphics-drivers/trunk/debian/README.source
packages/nvidia-graphics-drivers/trunk/debian/changelog
packages/nvidia-graphics-drivers/trunk/debian/control
packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.lintian-overrides.in
packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.symbols
packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.lintian-overrides.in
packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.symbols
packages/nvidia-graphics-drivers/trunk/debian/rules
Modified: packages/nvidia-graphics-drivers/trunk/debian/README.source
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/README.source?rev=1193&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/README.source (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/README.source Mon Jun 28 02:52:27 2010
@@ -57,6 +57,9 @@
building the kernel modules, which you can do without having an NVIDIA
card.
+ For uploads that have to go through the NEW queue because of added or
+ renamed binary packages, an upload of amd64 first is recommended.
+
-- Russ Allbery <rra at debian.org>, Tue, 6 Apr 2010 23:36:07 -0700
@@ -69,7 +72,11 @@
* in debian/changelog and debian/control (Source: and Package: lines)
change the package name by inserting '-legacy-42xx' into the package
- name after nvidia-glx, nvidia-kernel, nvidia-graphics-drivers
+ name after
+ - nvidia-glx
+ - libgl1-nvidia
+ - nvidia-kernel
+ - nvidia-graphics-drivers
* remove all packages that should no longer be built from debian/control
Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=1193&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Mon Jun 28 02:52:27 2010
@@ -1,12 +1,4 @@
nvidia-graphics-drivers (195.36.31-1) UNRELEASED; urgency=low
-
- * TODO BEFORE UPLOAD:
- - Can we just drop the libGL.so handling?
- - Should we rename the nvidia-libgl1* packages again?
- - Can we enable autobuilding of this non-free package?
- * NOTE: Even if 256.xx is out, I'd like to get a release of 195.36.31 first
- because I need this as a base for updating the legacy packages and 256.xx
- changes the layout of the upstream tarball significantly. Andreas
[ Andreas Beckmann ]
* New upstream release.
@@ -17,12 +9,13 @@
libGL.so.1 from the symbols file to ensure to generate a dependency on
libgl1-mesa-glx | libgl1 only. (Closes: #587091)
* Split the nvidia-glx{,-ia32} packages, move the runtime libraries to
- nvidia-libgl1{,-ia32}. (Closes: #369316)
- * Rename package nvidia-glx-dev to nvidia-libgl1-dev (add dummy).
- * Introduce virtual package nvidia-glx, add Provides/Conflicts: nvidia-glx
- to nvidia-glx, so that the legacy packages can do the same and we can stop
- listing each variant we have in Conflicts and Recommends lists.
- Same for nvidia-libgl1 and nvidia-glx-ia32.
+ libgl1-nvidia-glx{,-ia32}. (Closes: #369316)
+ * Rename package nvidia-glx-dev to libgl1-nvidia-dev (add dummy package).
+ * Introduce virtual packages nvidia-glx{,-ia32}, libgl1-nvidia-glx{,-ia32},
+ libgl1-nvidia-dev. Add a matching Provides/Conflicts: the the
+ corresponding real packages, so that the legacy packages can do the same
+ and we can stop listing each variant we have in Conflicts and Recommends
+ lists.
-- Andreas Beckmann <debian at abeckmann.de> Wed, 23 Jun 2010 08:33:44 +0200
Modified: packages/nvidia-graphics-drivers/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/control?rev=1193&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/control (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/control Mon Jun 28 02:52:27 2010
@@ -17,7 +17,7 @@
Architecture: i386 amd64
Pre-Depends: dpkg (>= 1.15.7.2)
Depends:
- nvidia-libgl1${nvidia:Legacy} (= ${binary:Version}),
+ libgl1-nvidia${nvidia:Legacy}-glx (= ${binary:Version}),
nvidia-kernel${nvidia:Legacy}-${nvidia:Version},
${shlibs:Depends}, ${misc:Depends}
Recommends: nvidia-vdpau-driver (>= ${nvidia:Version})
@@ -55,7 +55,9 @@
Package: nvidia-glx-ia32
Architecture: amd64
Pre-Depends: libc6-i386 (>= 2.9-18)
-Depends: nvidia-kernel${nvidia:Legacy}-${nvidia:Version},
+Depends:
+ libgl1-nvidia${nvidia:Legacy}-glx-ia32 (= ${binary:Version}),
+ nvidia-kernel${nvidia:Legacy}-${nvidia:Version},
${shlibs:Depends}, ${misc:Depends}
Recommends: nvidia-vdpau-driver-ia32 (>= ${nvidia:Version})
Suggests: nvidia-settings,
@@ -82,16 +84,18 @@
of supported GPUs and PCIIDs.
Package: nvidia-glx-dev
-Architecture: i386 amd64
-Depends: nvidia-libgl1${nvidia:Legacy}-dev, ${misc:Depends}
+Section: non-free/oldlibs
+Architecture: i386 amd64
+Depends: libgl1-nvidia${nvidia:Legacy}-dev, ${misc:Depends}
Description: NVIDIA OpenGL development files (transitional package)${nvidia:LegacyDesc}
This is a transitional dummy package to aid migration to
- nvidia-libgl1${nvidia:Legacy}-dev.
+ libgl1-nvidia${nvidia:Legacy}-dev.
.
For building portable OpenGL applications, please install libgl1-mesa-dev
instead.
-Package: nvidia-libgl1
+Package: libgl1-nvidia-glx
+Section: non-free/libs
Architecture: i386 amd64
Depends:
${shlibs:Depends}, ${misc:Depends}
@@ -101,10 +105,11 @@
nvidia-kernel${nvidia:Legacy}-dkms (>= ${nvidia:Version})
| nvidia-kernel${nvidia:Legacy}-source (>= ${nvidia:Version})
Provides:
- nvidia-libgl1,
+ libgl1-nvidia-glx,
Conflicts:
- nvidia-libgl1,
+ libgl1-nvidia-glx,
fglrx-glx,
+ nvidia-glx${nvidia:Legacy} (<< 195.36.31),
Replaces: nvidia-glx${nvidia:Legacy} (<< 195.36.31)
Description: NVIDIA binary OpenGL libraries${nvidia:LegacyDesc}
These binary libraries provide optimized hardware acceleration of
@@ -114,10 +119,11 @@
plus complimentary Quadros and nforce. Look at the legacy packages
for older cards.
.
- See /usr/share/doc/nvidia-libgl1${nvidia:Legacy}/README.txt.gz for a complete list
+ See /usr/share/doc/libgl1-nvidia${nvidia:Legacy}-glx/README.txt.gz for a complete list
of supported GPUs and PCIIDs.
-Package: nvidia-libgl1-ia32
+Package: libgl1-nvidia-glx-ia32
+Section: non-free/libs
Architecture: amd64
Pre-Depends: libc6-i386 (>= 2.9-18)
Depends:
@@ -128,10 +134,11 @@
nvidia-kernel${nvidia:Legacy}-dkms (>= ${nvidia:Version})
| nvidia-kernel${nvidia:Legacy}-source (>= ${nvidia:Version})
Provides:
- nvidia-libgl1-ia32,
+ libgl1-nvidia-glx-ia32,
Conflicts:
- nvidia-libgl1-ia32,
+ libgl1-nvidia-glx-ia32,
fglrx-glx-ia32,
+ nvidia-glx${nvidia:Legacy}-ia32 (<< 195.36.31),
Replaces: nvidia-glx${nvidia:Legacy}-ia32 (<< 195.36.31)
Description: NVIDIA binary OpenGL 32-bit libraries${nvidia:LegacyDesc}
These binary 32-bit libraries provide optimized hardware acceleration of
@@ -141,20 +148,21 @@
plus complimentary Quadros and nforce. Look at the legacy packages
for older cards.
.
- See /usr/share/doc/nvidia-libgl1${nvidia:Legacy}/README.txt.gz for a complete list
+ See /usr/share/doc/libgl1-nvidia${nvidia:Legacy}-glx/README.txt.gz for a complete list
of supported GPUs and PCIIDs.
-Package: nvidia-libgl1-dev
+Package: libgl1-nvidia-dev
+Section: non-free/libdevel
Architecture: i386 amd64
Depends:
- nvidia-libgl1${nvidia:Legacy} (= ${binary:Version}),
+ libgl1-nvidia${nvidia:Legacy}-glx (= ${binary:Version}),
libx11-dev,
${misc:Depends}
Recommends: libgl1-mesa-dev | libgl-dev
Provides:
- nvidia-libgl1-dev,
+ libgl1-nvidia-dev,
Conflicts:
- nvidia-libgl1-dev,
+ libgl1-nvidia-dev,
Replaces: nvidia-glx${nvidia:Legacy}-dev
Description: NVIDIA OpenGL development files${nvidia:LegacyDesc}
This package contains the development files for the NVIDIA OpenGL
Modified: packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.lintian-overrides.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.lintian-overrides.in?rev=1193&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.lintian-overrides.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.lintian-overrides.in Mon Jun 28 02:52:27 2010
@@ -1,22 +1,22 @@
# The NVIDIA license does not allow any form of modification.
-nvidia-libgl1#LEGACY#-ia32: binary-has-unneeded-section
-nvidia-libgl1#LEGACY#-ia32: shared-lib-without-dependency-information
-nvidia-libgl1#LEGACY#-ia32: shlib-with-non-pic-code
-nvidia-libgl1#LEGACY#-ia32: shlib-without-PT_GNU_STACK-section
-nvidia-libgl1#LEGACY#-ia32: spelling-error-in-binary
+libgl1-nvidia#LEGACY#-glx-ia32: binary-has-unneeded-section
+libgl1-nvidia#LEGACY#-glx-ia32: shared-lib-without-dependency-information
+libgl1-nvidia#LEGACY#-glx-ia32: shlib-with-non-pic-code
+libgl1-nvidia#LEGACY#-glx-ia32: shlib-without-PT_GNU_STACK-section
+libgl1-nvidia#LEGACY#-glx-ia32: spelling-error-in-binary
# We divert a bunch of files not provided by this package to ensure that
# programs don't pick up the wrong libGL by mistake.
-nvidia-libgl1#LEGACY#-ia32: diversion-for-unknown-file usr/lib32/libGL.so.1.2 preinst:*
+libgl1-nvidia#LEGACY#-glx-ia32: diversion-for-unknown-file usr/lib32/libGL.so.1.2 preinst:*
# We divert the original /usr/lib32/libGL.so symlink.
# In order to retain its functionality (i.e. pointing the MESA libGL.so.1)
# we ship a link pointing to the diverted library.
-nvidia-libgl1#LEGACY#-ia32: non-dev-pkg-with-shlib-symlink
+libgl1-nvidia#LEGACY#-glx-ia32: non-dev-pkg-with-shlib-symlink
# Packages built against the NVIDIA libGL should declare dependencies on
# the free version for Debian's purposes. Therefore we use a special
# combination of shlibs files (for libGL.so.1) and symbols files (for all
# other libraries).
-nvidia-libgl1#LEGACY#-ia32: shlibs-declares-dependency-on-other-package ia32-libs (>= 20090804)
-nvidia-libgl1#LEGACY#-ia32: shlib-missing-in-symbols-control-file libGL 1 for usr/lib32/libGL.so.#VERSION#
+libgl1-nvidia#LEGACY#-glx-ia32: shlibs-declares-dependency-on-other-package ia32-libs (>= 20090804)
+libgl1-nvidia#LEGACY#-glx-ia32: shlib-missing-in-symbols-control-file libGL 1 for usr/lib32/libGL.so.#VERSION#
Modified: packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.symbols
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.symbols?rev=1193&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.symbols (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.symbols Mon Jun 28 02:52:27 2010
@@ -1,1 +1,1 @@
-#include "nvidia-libgl1.symbols.common"
+#include "libgl1-nvidia-glx.symbols.common"
Modified: packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.lintian-overrides.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.lintian-overrides.in?rev=1193&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.lintian-overrides.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.lintian-overrides.in Mon Jun 28 02:52:27 2010
@@ -1,27 +1,27 @@
# The NVIDIA license does not allow any form of modification.
-nvidia-libgl1#LEGACY#: binary-has-unneeded-section
-nvidia-libgl1#LEGACY#: shared-lib-without-dependency-information
-#!i386#nvidia-libgl1#LEGACY#: shlib-with-executable-stack
-#!amd64#nvidia-libgl1#LEGACY#: shlib-with-non-pic-code
-#!amd64#nvidia-libgl1#LEGACY#: shlib-without-PT_GNU_STACK-section
-nvidia-libgl1#LEGACY#: spelling-error-in-binary
+libgl1-nvidia#LEGACY#-glx: binary-has-unneeded-section
+libgl1-nvidia#LEGACY#-glx: shared-lib-without-dependency-information
+#!i386#libgl1-nvidia#LEGACY#-glx: shlib-with-executable-stack
+#!amd64#libgl1-nvidia#LEGACY#-glx: shlib-with-non-pic-code
+#!amd64#libgl1-nvidia#LEGACY#-glx: shlib-without-PT_GNU_STACK-section
+libgl1-nvidia#LEGACY#-glx: spelling-error-in-binary
# We divert a bunch of files not provided by this package to ensure that
# programs don't pick up the wrong libGL by mistake.
-nvidia-libgl1#LEGACY#: diversion-for-unknown-file usr/lib/libGL.so preinst:*
-nvidia-libgl1#LEGACY#: diversion-for-unknown-file usr/lib/libGL.so.1.2 preinst:*
+libgl1-nvidia#LEGACY#-glx: diversion-for-unknown-file usr/lib/libGL.so preinst:*
+libgl1-nvidia#LEGACY#-glx: diversion-for-unknown-file usr/lib/libGL.so.1.2 preinst:*
# The diversions are placed here.
-nvidia-libgl1#LEGACY#: package-contains-empty-directory usr/lib/nvidia/
+libgl1-nvidia#LEGACY#-glx: package-contains-empty-directory usr/lib/nvidia/
# Packages built against the NVIDIA libGL should declare dependencies on
# the free version for Debian's purposes. Therefore we use a special
# combination of shlibs files (for libGL.so.1) and symbols files (for all
# other libraries).
-nvidia-libgl1#LEGACY#: shlibs-declares-dependency-on-other-package libgl1-mesa-glx | libgl1
-nvidia-libgl1#LEGACY#: shlib-missing-in-symbols-control-file libGL 1 for usr/lib/libGL.so.#VERSION#
+libgl1-nvidia#LEGACY#-glx: shlibs-declares-dependency-on-other-package libgl1-mesa-glx | libgl1
+libgl1-nvidia#LEGACY#-glx: shlib-missing-in-symbols-control-file libGL 1 for usr/lib/libGL.so.#VERSION#
# This package is a strange special case since it overrides standard
# libraries and diverts them, so the package name won't ever be able to
# match the library names it provides.
-nvidia-libgl1#LEGACY#: package-name-doesnt-match-sonames
+libgl1-nvidia#LEGACY#-glx: package-name-doesnt-match-sonames
Modified: packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.symbols
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.symbols?rev=1193&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.symbols (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.symbols Mon Jun 28 02:52:27 2010
@@ -1,4 +1,4 @@
-#include "nvidia-libgl1.symbols.common"
+#include "libgl1-nvidia-glx.symbols.common"
libXvMCNVIDIA_dynamic.so.1 #PACKAGE# #MINVER#
XvMCBlendSubpicture2 at Base 1.0.4349
XvMCBlendSubpicture at Base 1.0.4349
Modified: packages/nvidia-graphics-drivers/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/rules?rev=1193&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/rules Mon Jun 28 02:52:27 2010
@@ -14,11 +14,11 @@
dirname_x86 = $(NVIDIA_DIRNAME_X86)
dirname_x86_64 = $(NVIDIA_DIRNAME_X86_64)
-ALL_CONTROL := $(wildcard debian/nvidia-glx* debian/nvidia-libgl1* debian/nvidia-kernel*)
-LEGACY_CONTROL := $(wildcard debian/nvidia-glx$(legacy)* debian/nvidia-libgl1$(legacy)* debian/nvidia-kernel$(legacy)*)
+ALL_CONTROL := $(wildcard debian/nvidia-glx* debian/libgl1-nvidia* debian/nvidia-kernel*)
+LEGACY_CONTROL := $(wildcard debian/nvidia-glx$(legacy)* debian/libgl1-nvidia$(legacy)* debian/nvidia-kernel$(legacy)*)
RENAME_CONTROL = $(filter-out $(LEGACY_CONTROL),$(ALL_CONTROL))
RENAMED_CONTROL = $(patsubst debian/nvidia-glx%,debian/nvidia-glx$(legacy)%,\
- $(patsubst debian/nvidia-libgl1%,debian/nvidia-libgl1$(legacy)%,\
+ $(patsubst debian/libgl1-nvidia%,debian/libgl1-nvidia$(legacy)%,\
$(patsubst debian/nvidia-kernel%,debian/nvidia-kernel$(legacy)%,\
$(RENAME_CONTROL))))
TEMPLATES := $(wildcard debian/*.in debian/module/debian/*.in)
@@ -148,11 +148,13 @@
override_dh_makeshlibs:
dh_makeshlibs -Xvdpau/libvdpau_nvidia.so
# Redirect shlibs for libGL.so.1 to libgl1-mesa-glx | libgl1.
- sed -i -e '/^libGL 1 /s/.*/libGL 1 libgl1-mesa-glx | libgl1/' debian/nvidia-libgl1$(legacy)/DEBIAN/shlibs
- sed -i -e '/^libGL 1 /s/.*/libGL 1 ia32-libs (>= 20090804)/' debian/nvidia-libgl1$(legacy)-ia32/DEBIAN/shlibs
+ sed -i -e '/^libGL 1 /s/.*/libGL 1 libgl1-mesa-glx | libgl1/' debian/libgl1-nvidia$(legacy)-glx/DEBIAN/shlibs
+ test ! -d debian/libgl1-nvidia$(legacy)-glx-ia32 || \
+ sed -i -e '/^libGL 1 /s/.*/libGL 1 ia32-libs (>= 20090804)/' debian/libgl1-nvidia$(legacy)-glx-ia32/DEBIAN/shlibs
# Remove libGL.so from symbols files in order not to override our special shlibs files.
- sed -i -e '/^libGL\.so/,/^lib/{/^libGL\.so\|^ /d}' debian/nvidia-libgl1$(legacy)/DEBIAN/symbols
- sed -i -e '/^libGL\.so/,/^lib/{/^libGL\.so\|^ /d}' debian/nvidia-libgl1$(legacy)-ia32/DEBIAN/symbols
+ sed -i -e '/^libGL\.so/,/^lib/{/^libGL\.so\|^ /d}' debian/libgl1-nvidia$(legacy)-glx/DEBIAN/symbols
+ test ! -d debian/libgl1-nvidia$(legacy)-glx-ia32 || \
+ sed -i -e '/^libGL\.so/,/^lib/{/^libGL\.so\|^ /d}' debian/libgl1-nvidia$(legacy)-glx-ia32/DEBIAN/symbols
override_dh_gencontrol:
dh_gencontrol -- -V'nvidia:Version=$(version)' -V'nvidia:Legacy=$(legacy)' \
@@ -190,7 +192,7 @@
nvidia-glx$(legacy)%: nvidia-glx%
cp -a $< $@
-nvidia-libgl1$(legacy)%: nvidia-libgl1%
+libgl1-nvidia$(legacy)%: libgl1-nvidia%
cp -a $< $@
nvidia-kernel$(legacy)%: nvidia-kernel%
More information about the Pkg-nvidia-devel
mailing list