On 2010-03-30 07:32 +0200, Sven Joachim wrote:
> On 2010-03-30 01:33 +0200, Cyril Brulebois wrote:
>
>> Cyril Brulebois <k...@debian.org> (30/03/2010):
>>
>>> I've already some patches on top of your current branch (like the
>>> dh_shlibdeps one), I'll wait for your answer to my previous mail
>>> about a possible rebase of your branch before pushing your branch
>>> and those changes (current + above-mentioned) to the repository.
>>
>> In the meanwhile, I've pushed a kibi-debian-experimental branch to:
>> http://git.debian.org/?p=users/kibi/pkg-xorg/xserver-xorg-video-nouveau.git
>
> Thanks, I'll cherry-pick the changes to my reworked branch where
> applicable and publish that later today.
Available at
http://git.debian.org/?p=users/joachim-guest/xserver-xorg-video-nouveau.git.
This one I consider suitable for merging into the pkg-xorg's
repository. At least, it does not screw things up irreversibly like
merging the "upstream"-ubuntu branch would have done.
Note that I have not included a fix for the NV_DRIVER_DATE problem since
there is no complete consensus, but a patch based on your work is attached.
> I have made a new upstream tarball, since there were a few more bugfixes
> since the version in Ubuntu; the changes since then seem safe to me, and
> I'm already running the updated version.
The xserver-xorg-video-nouveau_0.0.15+git20100329+7858345.orig.tar.gz
tarball can be checked out from the pristine-tar branch.
I have some work pending writing a README.Debian describing kernel
requirements, incompatibilities with other drivers (especially the
binary Nvidia 3D driver), the need to disable Compiz because it's
probably horribly slow (did not test that!) etc. Most things are
explained in the nouveau Wiki, but not everyone has permanent Internet
access or feels compatible using a text browser in the case X does not
start.
Cheers,
Sven
>From 6d64918437d35ceb723d13c63a59739a31e5f909 Mon Sep 17 00:00:00 2001
From: Cyril Brulebois <k...@debian.org>
Date: Tue, 30 Mar 2010 10:57:21 +0200
Subject: [PATCH] Set NV_DRIVER_DATE from ChangeLog.
Add build-dependency on quilt. Make clean depend on xsfclean to make
sure everything gets cleaned up, and patches unapplied.
---
debian/changelog | 5 +++++
debian/control | 1 +
.../01-set-NV_DRIVER_DATE-from-ChangeLog.diff | 14 ++++++++++++++
debian/patches/series | 1 +
debian/rules | 6 +++---
5 files changed, 24 insertions(+), 3 deletions(-)
create mode 100644 debian/patches/01-set-NV_DRIVER_DATE-from-ChangeLog.diff
create mode 100644 debian/patches/series
diff --git a/debian/changelog b/debian/changelog
index ddad1ff..d44d5d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,11 @@ xserver-xorg-video-nouveau (1:0.0.15+git20100329+7858345-1) UNRELEASED; urgency=
- Remove ChangeLog from .gitignore file.
- Run “git log > ChangeLog” against the upstream branch to generate
it, as it's done for other drivers.
+ * Use quilt to apply patches, and make clean depend on xsfclean to make
+ sure everything gets cleaned up, and patches unapplied.
+ * Add patch:
+ - 01-set-NV_DRIVER_DATE-from-ChangeLog.diff to make sure to pick
+ NV_DRIVER_DATE from the ChangeLog instead of the output of git log.
-- Sven Joachim <svenj...@gmx.de> Mon, 29 Mar 2010 10:10:00 +0200
diff --git a/debian/control b/debian/control
index 52c6a15..11b2227 100644
--- a/debian/control
+++ b/debian/control
@@ -20,6 +20,7 @@ Build-Depends:
automake,
libtool,
xutils-dev,
+ quilt,
Standards-Version: 3.8.4
Homepage: http://nouveau.freedesktop.org/wiki/
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-nouveau
diff --git a/debian/patches/01-set-NV_DRIVER_DATE-from-ChangeLog.diff b/debian/patches/01-set-NV_DRIVER_DATE-from-ChangeLog.diff
new file mode 100644
index 0000000..4bf4633
--- /dev/null
+++ b/debian/patches/01-set-NV_DRIVER_DATE-from-ChangeLog.diff
@@ -0,0 +1,14 @@
+Make sure to set NV_DRIVER_DATE properly, using ChangeLog instead of the
+output of git log, since most of the time, building won't happen from
+the git repository.
+--- a/configure.ac
++++ b/configure.ac
+@@ -36,7 +36,7 @@ AC_DEFINE_UNQUOTED([NV_PATCHLEVEL],
+ [$(echo $PACKAGE_VERSION | sed -e 's/^[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)/\1/')],
+ [Patch version])
+ AC_DEFINE_UNQUOTED([NV_DRIVER_DATE],
+- [$(echo -n \";git log |head -3|tail -1|tr -d '\n';echo -n \")],
++ [$(echo -n \";cat $CURDIR/ChangeLog |head -3|tail -1|tr -d '\n';echo -n \")],
+ [Driver date])
+
+ AC_CONFIG_SRCDIR([Makefile.am])
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d6892cf
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-set-NV_DRIVER_DATE-from-ChangeLog.diff
diff --git a/debian/rules b/debian/rules
index 1fcd935..15c8667 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,15 +41,15 @@ build-stamp: configure
cd build && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
- CFLAGS="$(CFLAGS)"
+ CFLAGS="$(CFLAGS)" CURDIR=$(CURDIR)
cd build && $(MAKE)
touch $@
-configure:
+configure: $(STAMP_DIR)/patch
dh_testdir
autoreconf -vfi
-clean:
+clean: xsfclean
dh_testdir
dh_testroot
rm -f build-stamp
--
1.7.0.3
