Your message dated Wed, 26 Oct 2005 14:02:22 -0700
with message-id <[EMAIL PROTECTED]>
and subject line close
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--------------------------------------
Received: (at submit) by bugs.debian.org; 12 Aug 2004 09:41:18 +0000
>From [EMAIL PROTECTED] Thu Aug 12 02:41:18 2004
Return-path: <[EMAIL PROTECTED]>
Received: from frege-d-math-north-g-west.math.ethz.ch (frege.math.ethz.ch)
[129.132.145.3] (root)
by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
id 1BvC5F-00059d-00; Thu, 12 Aug 2004 02:41:17 -0700
Received: from herodot.math.ethz.ch (herodot [129.132.146.8])
by frege.math.ethz.ch (8.12.10/8.12.10) with ESMTP id i7C9fDEv015644
(version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=NO);
Thu, 12 Aug 2004 11:41:15 +0200
Received: from pfrauenf by herodot.math.ethz.ch with local (Exim 4.34)
id 1BvC56-0000Oy-CE; Thu, 12 Aug 2004 11:41:08 +0200
Date: Thu, 12 Aug 2004 11:41:08 +0200
From: Philipp Frauenfelder <[EMAIL PROTECTED]>
To: Debian Bug Tracking System <[EMAIL PROTECTED]>
Subject: nvidia-glx: patch to build the package on amd64 also
Message-ID: <[EMAIL PROTECTED]>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="vkogqOf2sHV7VnPd"
Content-Disposition: inline
X-Reportbug-Version: 2.64
X-Operating-System: Debian GNU/Linux herodot 2.6.7-5-amd64-k8
User-Agent: Mutt/1.5.6+20040803i
Sender: Philipp Frauenfelder <[EMAIL PROTECTED]>
Received-SPF: none (frege: domain of [EMAIL PROTECTED] does not designate
permitted sender hosts)
X-Virus-Scanned: by amavisd-new at math.ethz.ch
Delivered-To: [EMAIL PROTECTED]
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-8.0 required=4.0 tests=BAYES_00,HAS_PACKAGE
autolearn=no version=2.60-bugs.debian.org_2004_03_25
X-Spam-Level:
--vkogqOf2sHV7VnPd
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Package: nvidia-glx
Version: 1.0.6111-1
Severity: wishlist
Tags: patch
Hi
I have attached a patch to build the package also on an amd64
machine. I did not update the lintian overrides. The scripts
work for
ftp://download.nvidia.com/XFree86/Linux-x86_64/1.0-6111/NVIDIA-Linux-x86_64-1.0-6111-pkg2.run
which is the latest amd64 release of NVidia's binary driver at
the time of this writing. I have not included this file in the
patch -- I would have to download it manually. I tried to stick
to the layout of your scripts...
Regards
-- Package-specific info:
-- System Information:
Debian Release: 3.1
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.7-5-amd64-k8
Locale: LANG=de, LC_CTYPE=de (ignored: LC_ALL set to de_CH)
Versions of packages nvidia-glx depends on:
ii libc6 2.3.2.ds1-15 GNU C Library: Shared libraries an
ii libx11-6 4.3.0.dfsg.1-6 X Window System protocol client li
ii libxext6 4.3.0.dfsg.1-6 X Window System miscellaneous exte
ii nvidia-kernel-2. 1.0.6111-1+10.00.Custom NVIDIA binary kernel module for Li
ii xlibmesa-glu [li 4.3.0.dfsg.1-6 Mesa OpenGL utility library [XFree
ii xlibs 4.3.0.dfsg.1-6 X Window System client libraries m
ii xserver-common 4.3.0.dfsg.1-6 files and utilities common to all
-- no debconf information
--vkogqOf2sHV7VnPd
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: attachment; filename=patch
--- ./nvidia-graphics-drivers-1.0.6111/debian/control 2004-08-12
09:05:06.979508972 +0200
+++ ../nvidia/nvidia-graphics-drivers-1.0.6111/debian/control 2004-08-12
11:34:07.626311061 +0200
@@ -6,7 +6,7 @@
Standards-Version: 3.6.1
Package: nvidia-glx
-Architecture: i386
+Architecture: i386, amd64
Depends: nvidia-kernel-1.0.6111, xserver-common (>= 4.0.3), xlibmesa-glu |
libglu | libglu1, ${shlibs:Depends}
Recommends: nvidia-kernel-source (>= 1.0.6111)
Suggests: nvidia-settings
@@ -23,7 +23,7 @@
required by this package.
Package: nvidia-glx-dev
-Architecture: i386
+Architecture: i386, amd64
Depends: nvidia-glx (>= 1.0.6111), xlibmesa-gl-dev | libgl-dev,
xlibmesa-glu-dev | libglu-dev
Description: NVIDIA binary XFree86 4.x driver development files
This package contains the NVIDIA binary XFree86 4.x driver
@@ -33,7 +33,7 @@
at http://www.nvidia.com/ .
Package: nvidia-kernel-source
-Architecture: i386
+Architecture: i386, amd64
Depends: debhelper (>> 4.0.0), make, sed (>> 3.0), dpatch (>= 2.0.0)
Recommends: nvidia-glx (>= 1.0.6111), kernel-package (>= 8.082), devscripts
Conflicts: nvidia-kernel-src
--- ./nvidia-graphics-drivers-1.0.6111/debian/control.in 2004-08-12
09:05:06.970510486 +0200
+++ ../nvidia/nvidia-graphics-drivers-1.0.6111/debian/control.in
2004-08-12 09:38:49.554099913 +0200
@@ -6,7 +6,7 @@
Standards-Version: 3.6.1
Package: nvidia-glx
-Architecture: i386
+Architecture: i386, amd64
Depends: nvidia-kernel-#VERSION#, xserver-common (>= 4.0.3), xlibmesa-glu |
libglu | libglu1, ${shlibs:Depends}
Recommends: nvidia-kernel-source (>= #VERSION#)
Suggests: nvidia-settings
@@ -23,7 +23,7 @@
required by this package.
Package: nvidia-glx-dev
-Architecture: i386
+Architecture: i386, amd64
Depends: nvidia-glx (>= #VERSION#), xlibmesa-gl-dev | libgl-dev,
xlibmesa-glu-dev | libglu-dev
Description: NVIDIA binary XFree86 4.x driver development files
This package contains the NVIDIA binary XFree86 4.x driver
@@ -33,7 +33,7 @@
at http://www.nvidia.com/ .
Package: nvidia-kernel-source
-Architecture: i386
+Architecture: i386, amd64
Depends: debhelper (>> 4.0.0), make, sed (>> 3.0), dpatch (>= 2.0.0)
Recommends: nvidia-glx (>= #VERSION#), kernel-package (>= 8.082), devscripts
Conflicts: nvidia-kernel-src
--- ./nvidia-graphics-drivers-1.0.6111/debian/copyright 2004-08-12
09:05:06.980508803 +0200
+++ ../nvidia/nvidia-graphics-drivers-1.0.6111/debian/copyright 2004-08-12
11:34:07.647307526 +0200
@@ -2,7 +2,7 @@
Mon, 31 Mar 2003 23:40:05 -0800.
It was downloaded from
-ftp://download.nvidia.com/XFree86/Linux-x86/1.0-6111/NVIDIA-Linux-x86-1.0-6111-pkg0.run
+ftp://download.nvidia.com/XFree86/Linux-x86/1.0-6111/NVIDIA-Linux-x86-1.0-6111-pkg0.run
ftp://download.nvidia.com/XFree86/Linux-x86_64/1.0-6111/NVIDIA-Linux-x86_64-1.0-6111-pkg2.run
Upstream Author: NVIDIA <[EMAIL PROTECTED]>
--- ./nvidia-graphics-drivers-1.0.6111/debian/docs 2004-08-12
09:05:06.981508635 +0200
+++ ../nvidia/nvidia-graphics-drivers-1.0.6111/debian/docs 2004-08-12
11:34:07.729293722 +0200
@@ -1,5 +1,3 @@
-NVIDIA-Linux-x86-1.0-6111-pkg0/usr/share/doc/NVIDIA_Changelog
-NVIDIA-Linux-x86-1.0-6111-pkg0/usr/share/doc/README
-NVIDIA-Linux-x86-1.0-6111-pkg0/usr/share/doc/README.DE
-
-
+NVIDIA-Linux-x86_64-1.0-6111-pkg2/usr/share/doc/NVIDIA_Changelog
+NVIDIA-Linux-x86_64-1.0-6111-pkg2/usr/share/doc/README
+NVIDIA-Linux-x86_64-1.0-6111-pkg2/usr/share/doc/README.DE
--- ./nvidia-graphics-drivers-1.0.6111/debian/docs.in 2004-08-12
09:05:06.971510318 +0200
+++ ../nvidia/nvidia-graphics-drivers-1.0.6111/debian/docs.in 2004-08-12
09:09:25.299038210 +0200
@@ -1,5 +1,3 @@
-NVIDIA-Linux-x86-#UPSTREAMVERSION#-pkg0/usr/share/doc/NVIDIA_Changelog
-NVIDIA-Linux-x86-#UPSTREAMVERSION#-pkg0/usr/share/doc/README
-NVIDIA-Linux-x86-#UPSTREAMVERSION#-pkg0/usr/share/doc/README.DE
-
-
+NVIDIA-Linux-#ARCH#-#UPSTREAMVERSION#-#PKG#/usr/share/doc/NVIDIA_Changelog
+NVIDIA-Linux-#ARCH#-#UPSTREAMVERSION#-#PKG#/usr/share/doc/README
+NVIDIA-Linux-#ARCH#-#UPSTREAMVERSION#-#PKG#/usr/share/doc/README.DE
--- ./nvidia-graphics-drivers-1.0.6111/debian/nvidia-glx.examples
2004-08-12 09:05:06.981508635 +0200
+++ ../nvidia/nvidia-graphics-drivers-1.0.6111/debian/nvidia-glx.examples
2004-08-12 11:34:07.750290187 +0200
@@ -1 +1 @@
-NVIDIA-Linux-x86-1.0-6111-pkg0/usr/share/doc/XF86Config.sample
+NVIDIA-Linux-x86_64-1.0-6111-pkg2/usr/share/doc/XF86Config.sample
--- ./nvidia-graphics-drivers-1.0.6111/debian/nvidia-glx.examples.in
2004-08-12 09:05:06.973509981 +0200
+++ ../nvidia/nvidia-graphics-drivers-1.0.6111/debian/nvidia-glx.examples.in
2004-08-12 09:09:51.072700429 +0200
@@ -1 +1 @@
-NVIDIA-Linux-x86-#UPSTREAMVERSION#-pkg0/usr/share/doc/XF86Config.sample
+NVIDIA-Linux-#ARCH#-#UPSTREAMVERSION#-#PKG#/usr/share/doc/XF86Config.sample
--- ./nvidia-graphics-drivers-1.0.6111/debian/rules 2004-08-12
09:05:06.976509476 +0200
+++ ../nvidia/nvidia-graphics-drivers-1.0.6111/debian/rules 2004-08-12
09:35:21.461125738 +0200
@@ -20,8 +20,15 @@
AUTOGEN=debian/nvidia-kernel-source.README.Debian debian/control
debian/copyright debian/nvidia-glx.links debian/nvidia-glx-dev.links
debian/nvidia-glx.override debian/docs debian/nvidia-glx.examples
debian/nvidia-glx.postrm debian/nvidia-glx.init
-
-dirname=NVIDIA-Linux-x86-$(upstreamversion)-pkg0
+ifeq ($(shell dpkg --print-architecture),i386)
+arch:=x86
+pkg:=pkg0
+endif
+ifeq ($(shell dpkg --print-architecture),amd64)
+arch:=x86_64
+pkg:=pkg2
+endif
+dirname=NVIDIA-Linux-$(arch)-$(upstreamversion)-$(pkg)
#ks-package-name=nvidia-kernel-$(version)
@@ -44,11 +51,11 @@
configure-stamp: $(AUTOGEN)
dh_testdir
- ./NVIDIA-Linux-x86-${upstreamversion}-pkg0.run --extract-only
-
+ ./$(dirname).run --extract-only
+
sed 's/^nvidia-graphics-drivers/nvidia-kernel/g' debian/changelog >
debian.binary/changelog
-
-
+
+
touch configure-stamp
.PHONY: build
@@ -70,13 +77,15 @@
mkdir -p $(CURDIR)/debian/temp/modules/nvidia-kernel/debian
mkdir -p $(CURDIR)/debian/temp/modules/nvidia-kernel/nv
cp -r $(CURDIR)/debian.binary/*
$(CURDIR)/debian/temp/modules/nvidia-kernel/debian
-
+
for f in `ls $(CURDIR)/debian.binary` ; do \
perl -p \
-e 's{#BASE_VERSION#}{$(base_version)}g;' \
-e 's{#RELEASE#}{$(release)}g;' \
-e 's{#VERSION#}{$(version)}g;' \
-e 's{#UPSTREAMVERSION#}{$(upstreamversion)}g;' \
+ -e 's{#ARCH#}{$(arch)}g;' \
+ -e 's{#PKG#}{$(pkg)}g;' \
-e 's{#URL#}{$(url)}g' \
< $(CURDIR)/debian.binary/$$f >
$(CURDIR)/debian/temp/modules/nvidia-kernel/debian/$$f ; \
chmod 0644
$(CURDIR)/debian/temp/modules/nvidia-kernel/debian/$$f ; \
@@ -97,8 +106,8 @@
dh_clean
rm -fr $(dirname) nvidia-kernel-source.tar.gz
-
-
+
+
.PHONY: install
install: build-stamp build-kernel-stamp
@@ -106,10 +115,10 @@
dh_testroot
dh_clean -k
dh_installdirs
-
+
install -m 644 $(CURDIR)/nvidia-kernel-source.tar.gz
$(CURDIR)/debian/nvidia-kernel-source/usr/src
-
-
+
+
install -m 0644 $(dirname)/usr/X11R6/lib/modules/drivers/nvidia_drv.o \
$(CURDIR)/debian/nvidia-glx/usr/X11R6/lib/modules/drivers
@@ -137,35 +146,35 @@
$(CURDIR)/debian/nvidia-glx/usr/lib
sed "s/__GENERATED_BY__/Debian nvidia-graphics-drivers/"
$(dirname)/usr/lib/libGL.la | sed "s/__LIBGL_PATH__/\/usr\/lib/" >
$(CURDIR)/debian/nvidia-glx-dev/usr/lib/libGL.la
# install -m 0644 $(dirname)/usr/lib/libGL.la
$(CURDIR)/debian/nvidia-glx/usr/lib/libGL.la
-
+
# TLS (nvidia-tls new for 6106)
install $(dirname)/usr/lib/libnvidia-tls.so.${version}
$(CURDIR)/debian/nvidia-glx/usr/lib/
install $(dirname)/usr/lib/tls/libnvidia-tls.so.${version}
$(CURDIR)/debian/nvidia-glx/usr/lib/nvidia
-
+
#sed "s/__GENERATED_BY__/Debian nvidia-graphics-drivers/"
$(dirname)/usr/lib/tls/libGL.la | sed "s/__LIBGL_PATH__/\/usr\/lib\/tls/" >
$(CURDIR)/debian/nvidia-glx-dev/usr/lib/nvidia/libGL.la
# install -m 0644 $(dirname)/usr/lib/tls/libGL.la
$(CURDIR)/debian/nvidia-glx/usr/lib/nvidia/libGL.la
-
-
+
+
install
$(dirname)/usr/X11R6/lib/modules/extensions/libglx.so.${version}
$(CURDIR)/debian/nvidia-glx/usr/X11R6/lib/modules/extensions/
-
+
install $(dirname)/usr/bin/tls_test
$(CURDIR)/debian/nvidia-glx/usr/lib/nvidia
install $(dirname)/usr/bin/tls_test_dso.so
$(CURDIR)/debian/nvidia-glx/usr/lib/nvidia
install -d $(CURDIR)/debian/nvidia-glx/usr/share/lintian/overrides
install -m 0644 debian/nvidia-glx.override \
$(CURDIR)/debian/nvidia-glx/usr/share/lintian/overrides/nvidia-glx
-
+
install -m 755 $(dirname)/usr/bin/nvidia-bug-report.sh
$(CURDIR)/debian/nvidia-glx/usr/bin/
-
+
# use separate source package instead
#install -m 755 $(dirname)/usr/bin/nvidia-settings
$(CURDIR)/debian/nvidia-settings/usr/bin/
#install -m 644 $(dirname)/usr/share/doc/nvidia-settings-user-guide.txt
$(CURDIR)/debian/nvidia-settings/usr/share/doc/nvidia-settings
-
-
+
+
install $(CURDIR)/script
$(CURDIR)/debian/nvidia-glx/usr/share/bug/nvidia-glx
-
+
dh_install
@@ -197,7 +206,7 @@
# dh_python
dh_makeshlibs
dh_installdeb
- dh_shlibdeps -l$(CURDIR)/debian/nvidia-glx/usr/lib
+ dh_shlibdeps -l$(CURDIR)/debian/nvidia-glx/usr/lib
-Xlibnvidia-tls.so.1.0.6111 -Xtls_test_dso.so
dh_gencontrol
dh_md5sums
dh_builddeb
@@ -209,6 +218,8 @@
-e 's{#RELEASE#}{$(release)}g;' \
-e 's{#VERSION#}{$(version)}g;' \
-e 's{#UPSTREAMVERSION#}{$(upstreamversion)}g;' \
+ -e 's{#ARCH#}{$(arch)}g;' \
+ -e 's{#PKG#}{$(pkg)}g;' \
-e 's{#URL#}{$(url)}g' \
< $< > $@
@@ -224,4 +235,3 @@
.PHONY: version-clean
version-clean:
rm -f ${AUTOGEN} || true
-
--- ./nvidia-graphics-drivers-1.0.6111/debian/upstream_info 2004-08-12
09:05:06.977509308 +0200
+++ ../nvidia/nvidia-graphics-drivers-1.0.6111/debian/upstream_info
2004-08-12 09:19:40.878436509 +0200
@@ -1,12 +1,32 @@
+amd() {
+ ARCH=x86_64
+ PKG=pkg2
+}
+
+ia32() {
+ ARCH=x86
+ PKG=pkg0
+}
+
+url() {
+
BASE_URL=ftp://download.nvidia.com/XFree86/Linux-${ARCH}/${BASE_VERSION}-${RELEASE}
+ FILENAME=NVIDIA-Linux-${ARCH}-${BASE_VERSION}-${RELEASE}-${PKG}.run
+}
+
BASE_VERSION=1.0
RELEASE=6111
-BASE_URL=ftp://download.nvidia.com/XFree86/Linux-x86/${BASE_VERSION}-${RELEASE}
-FILENAME=NVIDIA-Linux-x86-${BASE_VERSION}-${RELEASE}-pkg0.run
VERSION=${BASE_VERSION}.${RELEASE}
UPSTREAMVERSION=${BASE_VERSION}-${RELEASE}
+
+ia32
+url
URL=${BASE_URL}/${FILENAME}
+amd
+url
+URLAMD=${BASE_URL}/${FILENAME}
+
case "$1" in
BASE_VERSION)
echo "${BASE_VERSION}"
@@ -18,7 +38,7 @@
echo "$VERSION"
;;
URL)
- echo "$URL"
+ echo "$URL" ; echo "$URLAMD"
;;
UPSTREAMVERSION)
echo "$UPSTREAMVERSION"
--vkogqOf2sHV7VnPd--
---------------------------------------
Received: (at 265232-done) by bugs.debian.org; 26 Oct 2005 21:04:05 +0000
>From [EMAIL PROTECTED] Wed Oct 26 14:04:05 2005
Return-path: <[EMAIL PROTECTED]>
Received: from clump.bawx.ca (bawx.ca) [64.251.30.168] (postfix)
by spohr.debian.org with esmtp (Exim 3.36 1 (Debian))
id 1EUsRJ-0004j3-00; Wed, 26 Oct 2005 14:04:05 -0700
Received: from localhost (localhost.bawx.ca [127.0.0.1])
by bawx.ca (Postfix) with ESMTP id A81C69035D
for <[EMAIL PROTECTED]>; Wed, 26 Oct 2005 14:04:01 -0700 (PDT)
Received: from bawx.ca ([127.0.0.1])
by localhost (clump.bawx.ca [127.0.0.1]) (amavisd-new, port 10024)
with SMTP id 11636-02 for <[EMAIL PROTECTED]>;
Wed, 26 Oct 2005 14:03:35 -0700 (PDT)
Received: from juliet.khensu.org (s0106000102c87780.pk.shawcable.net
[70.66.129.86])
(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
(Client CN "juliet.khensu.org", Issuer "The Donalds CA" (verified OK))
by bawx.ca (Postfix) with ESMTP id 2E3979036F
for <[EMAIL PROTECTED]>; Wed, 26 Oct 2005 14:03:02 -0700 (PDT)
Received: by juliet.khensu.org (Postfix, from userid 1000)
id 86BA46C0B2; Wed, 26 Oct 2005 14:02:27 -0700 (PDT)
Subject: close
From: Randall Donald <[EMAIL PROTECTED]>
To: [EMAIL PROTECTED]
Content-Type: text/plain
Content-Transfer-Encoding: 7bit
Date: Wed, 26 Oct 2005 14:02:22 -0700
Message-Id: <[EMAIL PROTECTED]>
Mime-Version: 1.0
X-Mailer: Evolution 2.2.3
X-Virus-Scanned: by amavisd-maia-1.0.0-rc5 (Debian) at bawx.ca
Delivered-To: [EMAIL PROTECTED]
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Level:
X-Spam-Status: No, hits=-2.0 required=4.0 tests=BAYES_00,ONEWORD autolearn=no
version=2.60-bugs.debian.org_2005_01_02
Hrm, why does is this still open? There are amd64 packages now.
--
--------------------------------------------
Randall Donald [EMAIL PROTECTED]
http://www.khensu.org [EMAIL PROTECTED]
Programmer/Debian Developer GnuPG: 6C27DEAB
--------------------------------------------
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
