Rebased ref, commits from common ancestor:
commit 1228fdcc3e62fb00358b37270776bbe882e6ad85
Author: Chris Lamb <[EMAIL PROTECTED]>
Date: Thu Jul 3 00:41:05 2008 +0100
Fix changelog formatting.
Signed-off-by: Chris Lamb <[EMAIL PROTECTED]>
diff --git a/debian/changelog b/debian/changelog
index b56ac8b..c933d7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,7 +11,8 @@ xserver-xorg-video-nouveau (1:0.0.10~git+20080702+48c2116-1)
experimental; urgen
- 7cb0eed6... Fixup and add some license statements.
- 27c7c884... change hack to work with latest drm changes..
- 99a4b686... NV50: unbreak kms and implement a basic off mode/dpms
- - 1a23dbd1... nv50: stub out NV50SorSetClockMode for LVDS, it doesn't
work there
+ - 1a23dbd1... nv50: stub out NV50SorSetClockMode for LVDS, it doesn't work
+ there
- 2ccc80bd... nv50: bring in int10-constole-restore hack from nv driver
- 73b4fcc2... fix non-kms build/run
- 75d8947d... NV50: Some basic code to get kernel modesetting going.
@@ -19,8 +20,8 @@ xserver-xorg-video-nouveau (1:0.0.10~git+20080702+48c2116-1)
experimental; urgen
- 1813559a... More DCB 1.5 TV variants (#16252 and #16342)
- 29c4a58b... Be a little more discerning about the BIT bios signature
- e8c79072... LVDS_INIT should not always use head A
- - fc137f23... NV50: lvds is probably still broken, but it's a step in the
right
- direction
+ - fc137f23... NV50: lvds is probably still broken, but it's a step in the
+ right direction
* Add Vcs-Git and Vcs-Browser fields to debian/control
* Bump Standards-Version to 3.8.0 (no changes).
commit 28a026eaa1f1e56f5201dc4b679af4e9da0d0fdc
Author: Chris Lamb <[EMAIL PROTECTED]>
Date: Thu Jul 3 00:37:54 2008 +0100
Bump libdrm-dev dependency.
Signed-off-by: Chris Lamb <[EMAIL PROTECTED]>
diff --git a/debian/control b/debian/control
index 41ec117..fdc0167 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Chris Lamb <[EMAIL PROTECTED]>, Matthew Johnson <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>=
2:1.2.99.902), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev,
x11proto-randr-dev (>= 1.2), x11proto-render-dev, x11proto-xext-dev, libdrm-dev
(= 2.3.1~git+20080602+ac4da86-1), x11proto-xf86dri-dev, x11proto-gl-dev,
mesa-common-dev, git-core, automake, libtool, xutils-dev, xserver-xorg-dev
+Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>=
2:1.2.99.902), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev,
x11proto-randr-dev (>= 1.2), x11proto-render-dev, x11proto-xext-dev, libdrm-dev
(= 2.3.1~git+20080703+301d984-1), x11proto-xf86dri-dev, x11proto-gl-dev,
mesa-common-dev, git-core, automake, libtool, xutils-dev, xserver-xorg-dev
Standards-Version: 3.8.0
Homepage: http://nouveau.freedesktop.org/wiki/
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-nouveau
commit 23ff132213ed50a8bdb169f64d4ab467b3cc6e4f
Author: Chris Lamb <[EMAIL PROTECTED]>
Date: Thu Jul 3 00:37:19 2008 +0100
Update to 0.0.10~git+20080702+48c2116-1
Signed-off-by: Chris Lamb <[EMAIL PROTECTED]>
diff --git a/debian/changelog b/debian/changelog
index 9cf196a..b56ac8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-nouveau (1:0.0.10~git+20080602+e034616-2) UNRELEASED;
urgency=low
+xserver-xorg-video-nouveau (1:0.0.10~git+20080702+48c2116-1) experimental;
urgency=low
* Re-upload latest snapshot fixed copyright in various upstream files
after REJECT. (Closes: #418889)
@@ -24,7 +24,7 @@ xserver-xorg-video-nouveau (1:0.0.10~git+20080602+e034616-2)
UNRELEASED; urgency
* Add Vcs-Git and Vcs-Browser fields to debian/control
* Bump Standards-Version to 3.8.0 (no changes).
- -- Chris Lamb <[EMAIL PROTECTED]> Fri, 06 Jun 2008 05:55:22 +0100
+ -- Chris Lamb <[EMAIL PROTECTED]> Thu, 03 Jul 2008 00:35:47 +0100
xserver-xorg-video-nouveau (1:0.0.10~git+20080602+e034616-1) experimental;
urgency=low
commit a223981464efec2a3b24b43bbd119408fcc10bf7
Author: Chris Lamb <[EMAIL PROTECTED]>
Date: Thu Jul 3 00:09:57 2008 +0100
Truncate long description.
Signed-off-by: Chris Lamb <[EMAIL PROTECTED]>
diff --git a/debian/control b/debian/control
index 54dc6f1..41ec117 100644
--- a/debian/control
+++ b/debian/control
@@ -27,4 +27,4 @@ Description: X.Org X server -- Nouveau display driver
(experimental)
include the necessary files. Users requiring 3D support should use the
non-free
"nvidia" driver.
.
- This package is built from the FreeDesktop.org xf86-video-nouveau driver
module.
+ This package is built from the FreeDesktop.org xf86-video-nouveau driver.
commit 53ec6e190a43c6fa0cc6a19d75f67fcce2070a22
Author: Chris Lamb <[EMAIL PROTECTED]>
Date: Thu Jul 3 00:09:12 2008 +0100
Tidy imported changelog
Signed-off-by: Chris Lamb <[EMAIL PROTECTED]>
diff --git a/debian/changelog b/debian/changelog
index 2371338..9cf196a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,7 +19,8 @@ xserver-xorg-video-nouveau (1:0.0.10~git+20080602+e034616-2)
UNRELEASED; urgency
- 1813559a... More DCB 1.5 TV variants (#16252 and #16342)
- 29c4a58b... Be a little more discerning about the BIT bios signature
- e8c79072... LVDS_INIT should not always use head A
- - fc137f23... NV50: lvds is probably still broken, but it's a step in the
right direction
+ - fc137f23... NV50: lvds is probably still broken, but it's a step in the
right
+ direction
* Add Vcs-Git and Vcs-Browser fields to debian/control
* Bump Standards-Version to 3.8.0 (no changes).
commit d8f963637330c7b3cf1569ceae60db9f5ae2770b
Author: Chris Lamb <[EMAIL PROTECTED]>
Date: Thu Jul 3 00:08:50 2008 +0100
Bump Standards-Version to 3.8.0 (no changes).
diff --git a/debian/changelog b/debian/changelog
index 84d4f4e..2371338 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ xserver-xorg-video-nouveau (1:0.0.10~git+20080602+e034616-2)
UNRELEASED; urgency
- e8c79072... LVDS_INIT should not always use head A
- fc137f23... NV50: lvds is probably still broken, but it's a step in the
right direction
* Add Vcs-Git and Vcs-Browser fields to debian/control
+ * Bump Standards-Version to 3.8.0 (no changes).
-- Chris Lamb <[EMAIL PROTECTED]> Fri, 06 Jun 2008 05:55:22 +0100
diff --git a/debian/control b/debian/control
index cdd073b..54dc6f1 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Chris Lamb <[EMAIL PROTECTED]>, Matthew Johnson <[EMAIL PROTECTED]>
Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>=
2:1.2.99.902), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev,
x11proto-randr-dev (>= 1.2), x11proto-render-dev, x11proto-xext-dev, libdrm-dev
(= 2.3.1~git+20080602+ac4da86-1), x11proto-xf86dri-dev, x11proto-gl-dev,
mesa-common-dev, git-core, automake, libtool, xutils-dev, xserver-xorg-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
Homepage: http://nouveau.freedesktop.org/wiki/
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-nouveau
Vcs-Browser:
http://git.debian.org/?=pkg-xorg/driver/xserver-xorg-video-nouveau.git
commit 569dd6d1dbddfebb1a3f0f29dcd895e6606f50f1
Author: Chris Lamb <[EMAIL PROTECTED]>
Date: Thu Jul 3 00:05:54 2008 +0100
Re-upload latest snapshot fixed copyright in various upstream files
* Re-upload latest snapshot fixed copyright in various upstream files
- 48c2116f... NV50_KMS: no int10 please
- 11102af2... Backport console font save/restore from nouveau_ms
- ca2c55df... randr12: fix mode detection for when screen size changes
- 9c6eb667... NV04-NV4E: Save and restore FB_START
- 82fe9a21... NV50_KMS: switch to output dpms
- 13ce1f4c... Properly close drm when exiting + misc cleanup.
- 7cb0eed6... Fixup and add some license statements.
- 27c7c884... change hack to work with latest drm changes..
- 99a4b686... NV50: unbreak kms and implement a basic off mode/dpms
- 1a23dbd1... nv50: stub out NV50SorSetClockMode for LVDS, it doesn't
work there
- 2ccc80bd... nv50: bring in int10-constole-restore hack from nv driver
- 73b4fcc2... fix non-kms build/run
- 75d8947d... NV50: Some basic code to get kernel modesetting going.
- df52dc46... No need for G80+ LVDS conf bits reports
- 1813559a... More DCB 1.5 TV variants (#16252 and #16342)
- 29c4a58b... Be a little more discerning about the BIT bios signature
- e8c79072... LVDS_INIT should not always use head A
- fc137f23... NV50: lvds is probably still broken, but it's a step in
the right direction
diff --git a/debian/changelog b/debian/changelog
index 6655876..84d4f4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,25 @@
xserver-xorg-video-nouveau (1:0.0.10~git+20080602+e034616-2) UNRELEASED;
urgency=low
- * Re-upload latest snapshot with fixed copyright in various upstream files
+ * Re-upload latest snapshot fixed copyright in various upstream files
after REJECT. (Closes: #418889)
+ - 48c2116f... NV50_KMS: no int10 please
+ - 11102af2... Backport console font save/restore from nouveau_ms
+ - ca2c55df... randr12: fix mode detection for when screen size changes
+ - 9c6eb667... NV04-NV4E: Save and restore FB_START
+ - 82fe9a21... NV50_KMS: switch to output dpms
+ - 13ce1f4c... Properly close drm when exiting + misc cleanup.
+ - 7cb0eed6... Fixup and add some license statements.
+ - 27c7c884... change hack to work with latest drm changes..
+ - 99a4b686... NV50: unbreak kms and implement a basic off mode/dpms
+ - 1a23dbd1... nv50: stub out NV50SorSetClockMode for LVDS, it doesn't
work there
+ - 2ccc80bd... nv50: bring in int10-constole-restore hack from nv driver
+ - 73b4fcc2... fix non-kms build/run
+ - 75d8947d... NV50: Some basic code to get kernel modesetting going.
+ - df52dc46... No need for G80+ LVDS conf bits reports
+ - 1813559a... More DCB 1.5 TV variants (#16252 and #16342)
+ - 29c4a58b... Be a little more discerning about the BIT bios signature
+ - e8c79072... LVDS_INIT should not always use head A
+ - fc137f23... NV50: lvds is probably still broken, but it's a step in the
right direction
* Add Vcs-Git and Vcs-Browser fields to debian/control
-- Chris Lamb <[EMAIL PROTECTED]> Fri, 06 Jun 2008 05:55:22 +0100
commit bcd8ec3aa40a06aeec18eca45af69325806920a6
Author: Chris Lamb <[EMAIL PROTECTED]>
Date: Wed Jul 2 23:55:16 2008 +0100
Re-upload latest snapshot with fixed copyright in various upstream files
after REJECT. (Closes: #418889)
diff --git a/debian/changelog b/debian/changelog
index f419d3a..6655876 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
xserver-xorg-video-nouveau (1:0.0.10~git+20080602+e034616-2) UNRELEASED;
urgency=low
+ * Re-upload latest snapshot with fixed copyright in various upstream files
+ after REJECT. (Closes: #418889)
* Add Vcs-Git and Vcs-Browser fields to debian/control
-- Chris Lamb <[EMAIL PROTECTED]> Fri, 06 Jun 2008 05:55:22 +0100
commit 0bf49fdb1d8b8c5c061a66dbb62dd4ae4254f71f
Author: Chris Lamb <[EMAIL PROTECTED]>
Date: Fri Jun 6 05:58:47 2008 +0100
Remove X.org "endorsements"
diff --git a/debian/control b/debian/control
index 514a551..cdd073b 100644
--- a/debian/control
+++ b/debian/control
@@ -27,9 +27,4 @@ Description: X.Org X server -- Nouveau display driver
(experimental)
include the necessary files. Users requiring 3D support should use the
non-free
"nvidia" driver.
.
- More information about X.Org can be found at:
- <URL:http://www.X.org>
- <URL:http://xorg.freedesktop.org>
- <URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
- .
- This package is built from the X.org xf86-video-nouveau driver module.
+ This package is built from the FreeDesktop.org xf86-video-nouveau driver
module.
commit 1cd2c5c0219857e772fe4638c30bf76974ea7981
Author: Chris Lamb <[EMAIL PROTECTED]>
Date: Fri Jun 6 05:58:22 2008 +0100
Add Vcs-Git and Vcs-Browser fields to debian/control
diff --git a/debian/changelog b/debian/changelog
index e65cfa2..f419d3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-nouveau (1:0.0.10~git+20080602+e034616-2) UNRELEASED;
urgency=low
+
+ * Add Vcs-Git and Vcs-Browser fields to debian/control
+
+ -- Chris Lamb <[EMAIL PROTECTED]> Fri, 06 Jun 2008 05:55:22 +0100
+
xserver-xorg-video-nouveau (1:0.0.10~git+20080602+e034616-1) experimental;
urgency=low
* First upload to Debian experimental based on Christopher James Halse
diff --git a/debian/control b/debian/control
index b9b9c77..514a551 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,8 @@ Uploaders: Chris Lamb <[EMAIL PROTECTED]>, Matthew Johnson
<[EMAIL PROTECTED]
Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>=
2:1.2.99.902), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev,
x11proto-randr-dev (>= 1.2), x11proto-render-dev, x11proto-xext-dev, libdrm-dev
(= 2.3.1~git+20080602+ac4da86-1), x11proto-xf86dri-dev, x11proto-gl-dev,
mesa-common-dev, git-core, automake, libtool, xutils-dev, xserver-xorg-dev
Standards-Version: 3.7.3
Homepage: http://nouveau.freedesktop.org/wiki/
+Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-nouveau
+Vcs-Browser:
http://git.debian.org/?=pkg-xorg/driver/xserver-xorg-video-nouveau.git
Package: xserver-xorg-video-nouveau
Architecture: any
commit 39222e5b0390963e0162d65366f0cee118cb331d
Author: Chris Lamb <[EMAIL PROTECTED]>
Date: Fri Jun 6 05:43:42 2008 +0100
Cosmetic changes to debian/rules
diff --git a/debian/changelog b/debian/changelog
index 4d02bc1..e65cfa2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ xserver-xorg-video-nouveau (1:0.0.10~git+20080602+e034616-1)
experimental; urgen
to Uploaders.
- Bump Standards-Version to 3.7.3
- Add Homepage: field
+ * debian/rules:
+ - Misc. cosmetic changes
* Update debian/xsfbs/xsfbs.{mk,sh}
* Update debian/copyright.
diff --git a/debian/rules b/debian/rules
index 4ca6e40..9426014 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,4 @@
#!/usr/bin/make -f
-# debian/rules for the Debian xserver-xorg-driver-nv package.
-# Copyright © 2004 Scott James Remnant <[EMAIL PROTECTED]>
-# Copyright © 2005 Daniel Stone <[EMAIL PROTECTED]>
-# Copyright © 2005 David Nusinow <[EMAIL PROTECTED]>
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-include debian/xsfbs/xsfbs.mk
@@ -22,6 +15,7 @@ endif
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
confflags += --build=$(DEB_HOST_GNU_TYPE)
else
@@ -31,25 +25,31 @@ endif
# kbd_drv.a isn't phenomenally useful; kbd_drv.so more so
confflags += --disable-static
+get-orig-source:
+ git clone git://anongit.freedesktop.org/git/nouveau/xf86-video-nouveau
&& \
+ cd xf86-video-nouveau && autoreconf -v --install && \
+ REVISION=$$(git show --pretty=format:"%h" HEAD | head -n1) && cd .. && \
+ PREFIX=xserver-xorg-video-nouveau_0.0.10~git+$$(date
+%Y%m%d)+$$REVISION && \
+ tar czf $$PREFIX.orig.tar.gz --exclude=autom4te.cache
xf86-video-nouveau && \
+ rm -rf xf86-video-nouveau
+
build: build-stamp
build-stamp:
dh_testdir
-
test -d obj-$(DEB_BUILD_GNU_TYPE) || mkdir obj-$(DEB_BUILD_GNU_TYPE)
cd obj-$(DEB_BUILD_GNU_TYPE) && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
- CFLAGS="$(CFLAGS)"
+ CFLAGS="$(CFLAGS)"
cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
-
- touch build-stamp
+ touch $@
clean:
dh_testdir
dh_testroot
rm -f build-stamp
- -$(MAKE) distclean
+ [ ! -f Makefile ] || $(MAKE) distclean
rm -f config.cache config.log config.status
rm -f */config.cache */config.log */config.status
@@ -67,11 +67,9 @@ install: build
cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp
install
-# Build architecture-dependent files here.
binary-arch: build install serverabi
dh_testdir
dh_testroot
-
dh_installdocs
dh_installchangelogs
dh_install --sourcedir=debian/tmp --list-missing
@@ -85,19 +83,7 @@ binary-arch: build install serverabi
dh_md5sums
dh_builddeb
-# Build architecture-independent files here.
binary-indep: build install
-# Nothing to do
-
-SOURCE_DIR=xserver-xorg-video-nouveau-0.0.10~git$(shell date +%Y%m%d)
-get-orig-source:
-# We don't want to make dist - that doesn't ship the kernel modules
- git clone git://anongit.freedesktop.org/git/nouveau/xf86-video-nouveau \
- $(SOURCE_DIR) && \
- autoreconf -v --install $(SOURCE_DIR) && \
- tar czvf xserver-xorg-video-nouveau_0.0.10~git$(shell date
+%Y%m%d).orig.tar.gz --exclude=autom4te.cache $(SOURCE_DIR) && \
- rm -rf $(SOURCE_DIR)
-
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install get-orig-source
commit b16b6df7a62af903ed15292ed282ee471e540d3d
Author: Chris Lamb <[EMAIL PROTECTED]>
Date: Fri Jun 6 05:43:22 2008 +0100
Cosmetic changes to long description
diff --git a/debian/control b/debian/control
index a9b155d..b9b9c77 100644
--- a/debian/control
+++ b/debian/control
@@ -18,11 +18,11 @@ Description: X.Org X server -- Nouveau display driver
(experimental)
provides support for NVIDIA Riva, TNT, GeForce, and Quadro cards.
.
Note that these drivers are INCOMPLETE, and are only really useful for testing
- at this point. People needing a stable driver should use the "nv" driver
+ at this point. People needing a stable driver should use the "nv" driver
instead.
.
- Although the nouveau drivers provide some 3d support, these packages do not
- include the necessary files. Users requiring 3d support should use the binary
+ Although the nouveau drivers provide some 3D support, these packages do not
+ include the necessary files. Users requiring 3D support should use the
non-free
"nvidia" driver.
.
More information about X.Org can be found at:
commit e3ecd78d914d594d739fc4336a525b712db7d6a0
Author: Chris Lamb <[EMAIL PROTECTED]>
Date: Fri Jun 6 05:42:55 2008 +0100
Append (experimental) to package description
diff --git a/debian/control b/debian/control
index c53f124..a9b155d 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
${xserver:Depends}, linux-nouveau-m
Provides: ${xviddriver:Provides}
Replaces: xserver-xorg (<< 6.8.2-35), nvidia-glx
Conflicts: nvidia-glx
-Description: X.Org X server -- Nouveau display driver
+Description: X.Org X server -- Nouveau display driver (experimental)
This driver for the X.Org X server (see xserver-xorg for a further
description)
provides support for NVIDIA Riva, TNT, GeForce, and Quadro cards.
.
commit 930c8bd4d167686042a4057b9032e1ca8a2e5bca
Author: Chris Lamb <[EMAIL PROTECTED]>
Date: Fri Jun 6 05:40:05 2008 +0100
Update build-depends to match libdrm-snapshot
diff --git a/debian/control b/debian/control
index 968cf7b..c53f124 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Chris Lamb <[EMAIL PROTECTED]>, Matthew Johnson <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>=
2:1.2.99.902), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev,
x11proto-randr-dev (>= 1.2), x11proto-render-dev, x11proto-xext-dev, libdrm-dev
(>= 2.3.1~git20070831), x11proto-xf86dri-dev, x11proto-gl-dev, mesa-common-dev,
git-core, automake, libtool, xutils-dev, xserver-xorg-dev
+Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>=
2:1.2.99.902), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev,
x11proto-randr-dev (>= 1.2), x11proto-render-dev, x11proto-xext-dev, libdrm-dev
(= 2.3.1~git+20080602+ac4da86-1), x11proto-xf86dri-dev, x11proto-gl-dev,
mesa-common-dev, git-core, automake, libtool, xutils-dev, xserver-xorg-dev
Standards-Version: 3.7.3
Homepage: http://nouveau.freedesktop.org/wiki/
commit cdfc46594564ac75e9d8d243636887d3c9d418d9
Author: Chris Lamb <[EMAIL PROTECTED]>
Date: Fri Jun 6 05:39:27 2008 +0100
Bump Standards-Version to 3.7.3
diff --git a/debian/changelog b/debian/changelog
index bc27302..4d02bc1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ xserver-xorg-video-nouveau (1:0.0.10~git+20080602+e034616-1)
experimental; urgen
* debian/control:
- Set Maintainer to Debian X Strike Force, add Matthew Johnson and myself
to Uploaders.
+ - Bump Standards-Version to 3.7.3
- Add Homepage: field
* Update debian/xsfbs/xsfbs.{mk,sh}
* Update debian/copyright.
diff --git a/debian/control b/debian/control
index e141811..968cf7b 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Chris Lamb <[EMAIL PROTECTED]>, Matthew Johnson <[EMAIL PROTECTED]>
Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>=
2:1.2.99.902), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev,
x11proto-randr-dev (>= 1.2), x11proto-render-dev, x11proto-xext-dev, libdrm-dev
(>= 2.3.1~git20070831), x11proto-xf86dri-dev, x11proto-gl-dev, mesa-common-dev,
git-core, automake, libtool, xutils-dev, xserver-xorg-dev
-Standards-Version: 3.7.2.2
+Standards-Version: 3.7.3
Homepage: http://nouveau.freedesktop.org/wiki/
Package: xserver-xorg-video-nouveau
commit 039fc712509ddc24d66d093ae1e69666dd4e7d72
Author: Chris Lamb <[EMAIL PROTECTED]>
Date: Fri Jun 6 05:38:16 2008 +0100
Add Homepage field
diff --git a/debian/changelog b/debian/changelog
index 85f9ace..bc27302 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ xserver-xorg-video-nouveau (1:0.0.10~git+20080602+e034616-1)
experimental; urgen
* debian/control:
- Set Maintainer to Debian X Strike Force, add Matthew Johnson and myself
to Uploaders.
+ - Add Homepage: field
* Update debian/xsfbs/xsfbs.{mk,sh}
* Update debian/copyright.
diff --git a/debian/control b/debian/control
index b093f50..e141811 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Chris Lamb <[EMAIL PROTECTED]>, Matthew Johnson <[EMAIL PROTECTED]>
Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>=
2:1.2.99.902), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev,
x11proto-randr-dev (>= 1.2), x11proto-render-dev, x11proto-xext-dev, libdrm-dev
(>= 2.3.1~git20070831), x11proto-xf86dri-dev, x11proto-gl-dev, mesa-common-dev,
git-core, automake, libtool, xutils-dev, xserver-xorg-dev
Standards-Version: 3.7.2.2
+Homepage: http://nouveau.freedesktop.org/wiki/
Package: xserver-xorg-video-nouveau
Architecture: any
commit f49a9b24fd814ea4691bc2cfdb28cb2910c6c3a9
Author: Chris Lamb <[EMAIL PROTECTED]>
Date: Fri Jun 6 05:37:42 2008 +0100
Set Maintainer to Debian X Strike Force, set Uploaders
diff --git a/debian/changelog b/debian/changelog
index 243ee86..85f9ace 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ xserver-xorg-video-nouveau (1:0.0.10~git+20080602+e034616-1)
experimental; urgen
* First upload to Debian experimental based on Christopher James Halse
Rogers's packages for Ubuntu (Closes: #418889)
+ * debian/control:
+ - Set Maintainer to Debian X Strike Force, add Matthew Johnson and myself
+ to Uploaders.
* Update debian/xsfbs/xsfbs.{mk,sh}
* Update debian/copyright.
diff --git a/debian/control b/debian/control
index 7edd05b..b093f50 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
Source: xserver-xorg-video-nouveau
Section: x11
Priority: optional
-Maintainer: Christopher James Halse Rogers (RAOF) <[EMAIL PROTECTED]>
+Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
+Uploaders: Chris Lamb <[EMAIL PROTECTED]>, Matthew Johnson <[EMAIL PROTECTED]>
Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>=
2:1.2.99.902), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev,
x11proto-randr-dev (>= 1.2), x11proto-render-dev, x11proto-xext-dev, libdrm-dev
(>= 2.3.1~git20070831), x11proto-xf86dri-dev, x11proto-gl-dev, mesa-common-dev,
git-core, automake, libtool, xutils-dev, xserver-xorg-dev
Standards-Version: 3.7.2.2
commit 3ad7c940ee1cf17ec60102b12c938215f7d84b8e
Author: Chris Lamb <[EMAIL PROTECTED]>
Date: Fri Jun 6 05:34:52 2008 +0100
Update debian/copyright
diff --git a/debian/changelog b/debian/changelog
index 25f64b7..243ee86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-video-nouveau (1:0.0.10~git+20080602+e034616-1)
experimental; urgen
* First upload to Debian experimental based on Christopher James Halse
Rogers's packages for Ubuntu (Closes: #418889)
* Update debian/xsfbs/xsfbs.{mk,sh}
+ * Update debian/copyright.
-- Chris Lamb <[EMAIL PROTECTED]> Mon, 26 May 2008 04:56:08 +0100
diff --git a/debian/copyright b/debian/copyright
index cad7191..7223f87 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,20 +1,53 @@
-Copyright (c) 2007 NVIDIA, Corporation
+This package was debianized by Chris Lamb <[EMAIL PROTECTED]> on
+Fri, 30 May 2008 19:37:14 +0100 based on work by Christopher James Halse
+Rogers <[EMAIL PROTECTED]>.
-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, sublicense, 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:
+It was downloaded from <http://nouveau.freedesktop.org/wiki/>.
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
+License:
-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 NONINFRINGEMENT.
-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) 1993-2007 NVIDIA, Corporation
+ Copyright (C) 1994 X Consortium
+ Copyright (C) 1996-1997 David J. McKay
+ Copyright (C) 1996 Stephen Early
+ Copyright (C) 1997 Mark Eichin
+ Copyright (C) 1998-2005, 2007 Branden Robinson
+ Copyright (C) 1999 The XFree86 Project Inc.
+ Copyright (C) 2005-2006 Erik Waling
+ Copyright (C) 2005 Adam Jackson
+ Copyright (C) 2005 David Nusinow
+ Copyright (C) 2005 Eugene Konev
+ Copyright (C) 2005 Sun Microsystems, Inc.
+ Copyright (C) 2006 Stephane Marchesin
+ Copyright (C) 2006 Dave Airlie
+ Copyright (C) 2007, 2008 Maarten Maathui
+ Copyright (C) 2007-2008 Stuart Bennett
+ Copyright (C) 2007 Arthur Huillet
+ Copyright (C) 2007 Jeremy Kolb
+ Copyright (C) 2007 Patrice Mandin
+ Copyright (C) 2007 Ben Skeggs
+ Copyright (C) 2007 Peter Winters
+ Copyright (C) 2007 Nouveau Project
+
+ 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, sublicense, 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 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 NONINFRINGEMENT.
+ 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.
+ DEALINGS IN THE SOFTWARE.
+
+The Debian packaging is (C) 2008, Chris Lamb <[EMAIL PROTECTED]> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
commit 7a7a2a6588f18e28a93f9676e912926bd4679eb7
Author: Chris Lamb <[EMAIL PROTECTED]>
Date: Fri Jun 6 05:34:33 2008 +0100
Update debian/xsfbs/xsfbs.{mk,sh}
diff --git a/debian/changelog b/debian/changelog
index f755fac..25f64b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-video-nouveau (1:0.0.10~git+20080602+e034616-1)
experimental; urgen
* First upload to Debian experimental based on Christopher James Halse
Rogers's packages for Ubuntu (Closes: #418889)
+ * Update debian/xsfbs/xsfbs.{mk,sh}
-- Chris Lamb <[EMAIL PROTECTED]> Mon, 26 May 2008 04:56:08 +0100
diff --git a/debian/xsfbs/xsfbs-autoreconf.mk b/debian/xsfbs/xsfbs-autoreconf.mk
deleted file mode 100644
index dce8fc8..0000000
--- a/debian/xsfbs/xsfbs-autoreconf.mk
+++ /dev/null
@@ -1,150 +0,0 @@
-#!/usr/bin/make -f
-# $Id$
-
-# Automagical conversion of autoreconf results into quilt patches.
-
-# Copyright 2006 Eugene Konev
-#
-# Licensed under the GNU General Public License, version 2. See the file
-# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
-
-# The idea behind this is storing changes produced by autoreconf as a
-# separate patch on quilt stack (on top of stack actually).
-# The only usable target here is 'autoreconf`. Other targets are not
-# supposed to be called directly. DO NOT invoke them, unless you know what
-# you are doing.
-# The autoreconf target will check if files with names in $(RECONF_CHECKFILES)
-# were changed during patching (from upstream version or from previously
-# autoreconfed version) and call actual autoreconfing if they were.
-# The actual autoreconfing target (doautoreconf) WILL FAIL after
-# calling autoreconf and pushing changes into quilt stack by design. It
-# should never be invoked by automatic build process.
-# The proposed use is adding autoreconf into clean's prerequisites before
-# xsfclean like:
-# - clean: xsfclean
-# + clean: autoreconf xsfclean
-# This will ensure it is called when you build package with dpkg-buildpackage.
-
-# This dir will be used for producing diff of autoreconfed tree
-RECONF_DIR := xsfautoreconf
-
-# This files will be checked for changes
-RECONF_CHECKFILES += configure.ac Makefile.am
-
-# This files will not be hardlinked but copied
-RECONF_NOLINKFILES += aclocal.m4
-
-# This files/dirs will be pruned after autoreconf run
-RECONF_PRUNEFILES += autom4te.cache config.h.in~ aclocal.m4~
-
-# Internal target. Never invoke directly.
-stampdir_target+=check.md5sum
-$(STAMP_DIR)/check.md5sum:
- dh_testdir
- $(MAKE) -f debian/rules prepare
- for F in $(RECONF_CHECKFILES); do \
- find . -wholename ./$(STAMP_DIR) -prune -o -name $$F -print | \
- LC_ALL=C sort | xargs --no-run-if-empty md5sum >>$@; \
- done
-
-# Internal target. Never invoke directly.
-$(STAMP_DIR)/clean.md5sum:
- dh_testdir
- $(MAKE) -f debian/rules unpatch
- rm -f $(STAMP_DIR)/check.md5sum
- $(MAKE) -f debian/rules $(STAMP_DIR)/check.md5sum
- mv $(STAMP_DIR)/check.md5sum $@
-
-# Internal target. Never invoke directly.
-debian/patches/patched.md5sum:
- dh_testdir
- [ -f $(STAMP_DIR)/clean.md5sum ] || \
- $(MAKE) -f debian/rules $(STAMP_DIR)/clean.md5sum
-
- $(MAKE) -f debian/rules patch
- rm -f $(STAMP_DIR)/check.md5sum
- $(MAKE) -f debian/rules $(STAMP_DIR)/check.md5sum
- if ! diff $(STAMP_DIR)/clean.md5sum \
- $(STAMP_DIR)/check.md5sum > /dev/null; then \
- $(MAKE) -f debian/rules doautoreconf; \
- else \
- mv $(STAMP_DIR)/check.md5sum $@; \
- fi
-
-# Internal target. Never invoke directly.
-,PHONY: doautoreconf
-doautoreconf: patch
- quilt push -a >>$(STAMP_DIR)/log/autoreconf 2>&1 || true
- if quilt applied | grep ^autoreconf.diff$$ > /dev/null; then \
- quilt pop -a >>$(STAMP_DIR)/log/autoreconf 2>&1; \
- quilt rename -p autoreconf.diff autoreconf-old.diff \
- >>$(STAMP_DIR)/log/autoreconf 2>&1; \
- quilt delete autoreconf-old.diff >>$(STAMP_DIR)/log/autoreconf 2>&1; \
- quilt push -a >>$(STAMP_DIR)/log/autoreconf 2>&1; \
- fi
-
- if [ -e $(RECONF_DIR) ]; then \
- echo "ERROR: $(RECONF_DIR) already exists. Cleanup by hand"; \
- exit 1; \
- fi
-
- mkdir -p $(RECONF_DIR)/before
- find . -maxdepth 1 -mindepth 1 ! -wholename ./$(RECONF_DIR) \
- -a ! -wholename ./debian -a ! -wholename ./patches \
- -a ! -wholename ./.pc -a ! -wholename ./$(STAMP_DIR) | \
- xargs -i{} cp -al {} $(RECONF_DIR)/before/
-
- for F in $(RECONF_PRUNEFILES); do \
- find $(RECONF_DIR)/before -name $$F -print | \
- xargs --no-run-if-empty rm -r; \
- done
-
- cp -al $(RECONF_DIR)/before $(RECONF_DIR)/after
-
- for F in $(RECONF_NOLINKFILES); do \
- find . -wholename ./$(RECONF_DIR) -prune -o -wholename ./debian \
- -prune -o -wholename ./$(STAMP_DIR) -prune -o -name $$F \
- -print | \
- xargs --no-run-if-empty -i{} cp --remove-destination {} \
- $(RECONF_DIR)/after/{}; \
- done
-
- cd $(RECONF_DIR)/after && autoreconf -v --install && \
- for F in $(RECONF_PRUNEFILES); do \
- find . -name $$F -print | \
- xargs --no-run-if-empty rm -r; \
- done
-
- cd $(RECONF_DIR) && diff -Nru before after > autoreconf.diff || true
-
- quilt import $(RECONF_DIR)/autoreconf.diff \
- >>$(STAMP_DIR)/log/autoreconf 2>&1
-
- mv $(STAMP_DIR)/check.md5sum debian/patches/patched.md5sum
-
- rm -r $(RECONF_DIR) && rm -f patches/autoreconf-old.diff
-
- @echo
- @echo "****************************************************************"
- @echo " This target is made to fail INTENTIONALLY. It should NEVER "
- @echo " be invoked during automatic builds. "
- @echo
- @echo " This target was invoked because you added/removed/changed "
- @echo " patches which modify either configure.ac or Makefile.am and, "
- @echo " thus, require autoreconf run. And all autoreconfing should "
- @echo " happen before uploading. "
- @echo
- @echo " (See also debian/xsfbs/xsfbs-autoreconf.mk) "
- @echo
- @echo " If you see this message, autoreconfing actually SUCCEEDED, "
- @echo " and your build should finish successfully, when rerun. "
- @echo "****************************************************************"
- @echo
- exit 1;
-
-.PHONY: autoreconf
-autoreconf: debian/patches/patched.md5sum patch $(STAMP_DIR)/check.md5sum
- if ! diff $(STAMP_DIR)/check.md5sum \
- debian/patches/patched.md5sum > /dev/null; then \
- $(MAKE) -f debian/rules doautoreconf; \
- fi
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 5f13302..b871b3b 100644
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -21,10 +21,8 @@
# Pass $(DH_OPTIONS) into the environment for debhelper's benefit.
export DH_OPTIONS
-# force quilt to not use ~/.quiltrc
-QUILT = quilt --quiltrc /dev/null
-# force QUILT_PATCHES to the default in case it is exported in the environment
-QUILT_PATCHES = patches/
+# force quilt to not use ~/.quiltrc and to use debian/patches
+QUILT = QUILT_PATCHES=debian/patches quilt --quiltrc /dev/null
# Set up parameters for the upstream build environment.
@@ -121,19 +119,11 @@ $(STAMP_DIR)/stampdir:
# Set up the package build directory as quilt expects to find it.
.PHONY: prepare
stampdir_targets+=prepare
-prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare $(STAMP_DIR)/patches
$(STAMP_DIR)/log
+prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare $(STAMP_DIR)/log
$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir
- if [ ! -e $(STAMP_DIR)/patches ]; then \
- mkdir $(STAMP_DIR)/patches; \
- ln -s $(STAMP_DIR)/patches .pc; \
- echo 2 >$(STAMP_DIR)/patches/.version; \
- fi; \
if [ ! -e $(STAMP_DIR)/log ]; then \
mkdir $(STAMP_DIR)/log; \
fi; \
- if [ -e debian/patches ] && [ ! -e patches ]; then \
- ln -s debian/patches patches; \
- fi; \
>$@
# Apply all patches to the upstream source.
@@ -147,9 +137,11 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
fi; \
if $(QUILT) next >/dev/null 2>&1; then \
echo -n "Applying patches..."; \
- if $(QUILT) push -a -v 2>&1 | tee $(STAMP_DIR)/log/patch; then \
+ if $(QUILT) push -a -v >$(STAMP_DIR)/log/patch 2>&1; then \
+ cat $(STAMP_DIR)/log/patch; \
echo "successful."; \
else \
+ cat $(STAMP_DIR)/log/patch; \
echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \
exit 1; \
fi; \
@@ -160,13 +152,15 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
# Revert all patches to the upstream source.
.PHONY: unpatch
-unpatch:
+unpatch: $(STAMP_DIR)/prepare
rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \
- if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \
- if $(QUILT) pop -a -v 2>&1 | tee $(STAMP_DIR)/log/unpatch; then \
+ if $(QUILT) applied >/dev/null 2>/dev/null; then \
+ if $(QUILT) pop -a -v >$(STAMP_DIR)/log/unpatch 2>&1; then \
+ cat $(STAMP_DIR)/log/unpatch; \
echo "successful."; \
else \
+ cat $(STAMP_DIR)/log/unpatch; \
echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \
exit 1; \
fi; \
@@ -188,11 +182,10 @@ cleanscripts:
.PHONY: xsfclean
xsfclean: cleanscripts unpatch
dh_testdir
- rm -f .pc patches
+ rm -rf .pc
rm -rf $(STAMP_DIR) $(SOURCE_DIR)
rm -rf imports
dh_clean debian/shlibs.local \
- debian/MANIFEST.$(ARCH) debian/MANIFEST.$(ARCH).new \
debian/po/pothead
# Generate the debconf templates POT file header.
@@ -205,58 +198,6 @@ debian/po/pothead: debian/po/pothead.in
updatepo: debian/po/pothead
debian/scripts/debconf-updatepo --pot-header=pothead --verbose
-# Use the MANIFEST files to determine whether we're shipping everything we
-# expect to ship, and not shipping anything we don't expect to ship.
-.PHONY: check-manifest
-stampdir_targets+=check-manifest
-check-manifest: $(STAMP_DIR)/check-manifest
-$(STAMP_DIR)/check-manifest: $(STAMP_DIR)/install
- # Compare manifests.
- (cd debian/tmp && find -type f | LC_ALL=C sort | cut -c3-) \
- >debian/MANIFEST.$(ARCH).new
- # Construct MANIFEST files from MANIFEST.$(ARCH).in and
- # MANIFEST.$(ARCH).all or MANIFEST.all.
- if expr "$(findstring -DBuildFonts=NO,$(IMAKE_DEFINES))" \
- : "-DBuildFonts=NO" >/dev/null 2>&1; then \
- LC_ALL=C sort -u debian/MANIFEST.$(ARCH).in >debian/MANIFEST.$(ARCH);
\
- else \
- if [ -e debian/MANIFEST.$(ARCH).all ]; then \
- LC_ALL=C sort -u debian/MANIFEST.$(ARCH).in
debian/MANIFEST.$(ARCH).all >debian/MANIFEST.$(ARCH); \
- else \
- LC_ALL=C sort -u debian/MANIFEST.$(ARCH).in debian/MANIFEST.all
>debian/MANIFEST.$(ARCH); \
- fi; \
- fi
- # Confirm that the installed file list has not changed.
- if [ -e debian/MANIFEST.$(ARCH) ]; then \
- if ! cmp -s debian/MANIFEST.$(ARCH) debian/MANIFEST.$(ARCH).new; then
\
- diff -U 0 debian/MANIFEST.$(ARCH) debian/MANIFEST.$(ARCH).new ||
DIFFSTATUS=$$?; \
- case $${DIFFSTATUS:-0} in \
- 0) ;; \
- 1) if [ -n "$$IGNORE_MANIFEST_CHANGES" ]; then \
- echo 'MANIFEST check failed; ignoring problem because
\$$IGNORE_MANIFEST_CHANGES set' >&2; \
- echo 'Please ensure that the package maintainer has an
up-to-date version of the' >&2; \
- echo 'MANIFEST.$(ARCH).in file.' >&2; \
- else \
- echo 'MANIFEST check failed; please see debian/README' >&2; \
- exit 1; \
- fi; \
- ;; \
- *) echo "diff reported unexpected exit status $$DIFFSTATUS when
performing MANIFEST check" >&2; \
- exit 1; \
- ;; \
- esac; \
- fi; \
- fi
- >$@
-
-# Because we build (and install) different files depending on whether or not
-# any architecture-independent packages are being created, the list of files we
-# expect to see will differ; see the discussion of the "build" target above.
-.PHONY: check-manifest-arch check-manifest-indep
-check-manifest-arch: IMAKE_DEFINES+= -DBuildSpecsDocs=NO -DBuildFonts=NO
-DInstallHardcopyDocs=NO
-check-manifest-arch: check-manifest
-check-manifest-indep: check-manifest
-
# Remove files from the upstream source tree that we don't need, or which have
# licensing problems. It must be run before creating the .orig.tar.gz.
#
@@ -268,29 +209,6 @@ prune-upstream-tree:
dh_testdir
grep -rvh '^#' debian/prune/ | xargs --no-run-if-empty rm -rf
-# Change to what should be the correct directory, ensure it is, and if
-# so, create the .orig.tar.gz file. Exclude the debian directory and its
-# contents, and any .svn directories and their contents (so that we can safely
-# build an .orig.tar.gz from SVN checkout, not just an export).
-#
-# Note: This rule is for Debian package maintainers' convenience, and is not
-# needed for conventional build scenarios.
-#
-# This rule *IS* the recommended method for creating a new .orig.tar.gz file,
-# for the rare situations when one is needed.
-.PHONY: make-orig-tar-gz
-make-orig-tar-gz: clean prune-upstream-tree
- ( cd .. \
- && if [ $(shell basename $(CURDIR)) != $(SOURCE_NAME)-$(NO_EPOCH_VER)
]; then \
- echo "Our current working directory has the wrong name.
Renaming..." >&2; \
- mv $(CURDIR) $(SOURCE_NAME)-$(NO_EPOCH_VER); \
- fi; \
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
