xserver-xorg-video-tga: Changes to 'debian-experimental'
.cvsignore | 19
.gitignore | 20
ChangeLog | 359
Makefile.in | 674 -
aclocal.m4 | 8175 ------------
config.guess | 1500 --
config.h.in | 66
config.sub | 1616 --
configure |22683 ----------------------------------
configure.ac | 20
debian/README.source | 73
debian/changelog | 49
debian/control | 27
debian/patches/01_gen_pci_ids.diff | 18
debian/patches/series | 1
debian/rules | 29
debian/xserver-xorg-video-tga.install | 1
debian/xsfbs/repack.sh | 32
debian/xsfbs/xsfbs-autoreconf.mk | 150
debian/xsfbs/xsfbs.mk | 188
debian/xsfbs/xsfbs.sh | 533
depcomp | 530
install-sh | 323
ltmain.sh | 6871 ----------
missing | 360
mkinstalldirs | 158
src/.cvsignore | 6
src/.gitignore | 6
src/Makefile.am | 3
src/Makefile.in | 569
src/tga.h | 4
src/tga_driver.c | 203
src/tga_line.c | 4
src/tga_pcirename.h | 122
34 files changed, 1000 insertions(+), 44392 deletions(-)
New commits:
commit 1f24ebd374862f9ac1cff6b53c573d1d0c30df87
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Oct 16 21:22:50 2010 +0200
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index a260d31..af16158 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-tga (1:1.2.1-3) UNRELEASED; urgency=low
+xserver-xorg-video-tga (1:1.2.1-3) experimental; urgency=low
* Build against Xserver 1.9.1 rc1.
* Add myself to Uploaders.
- -- Cyril Brulebois <kibi@debian.org> Sat, 16 Oct 2010 21:22:28 +0200
+ -- Cyril Brulebois <kibi@debian.org> Sat, 16 Oct 2010 21:22:48 +0200
xserver-xorg-video-tga (1:1.2.1-2) unstable; urgency=medium
commit 68d420406f7d3a8ceb52c3d4120ce212674c87bb
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Oct 16 21:22:44 2010 +0200
Add myself to Uploaders.
diff --git a/debian/changelog b/debian/changelog
index 532f896..a260d31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-video-tga (1:1.2.1-3) UNRELEASED; urgency=low
* Build against Xserver 1.9.1 rc1.
+ * Add myself to Uploaders.
-- Cyril Brulebois <kibi@debian.org> Sat, 16 Oct 2010 21:22:28 +0200
diff --git a/debian/control b/debian/control
index 67a15e9..4cf9ad6 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-video-tga
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Brice Goglin <bgoglin@debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Brice Goglin <bgoglin@debian.org>, Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 5.0.0),
automake,
commit 86c638ed89a3a47c35829f8a7303699ddb2bb23e
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Oct 16 21:22:31 2010 +0200
Build against Xserver 1.9.1 rc1.
diff --git a/debian/changelog b/debian/changelog
index 4f70636..532f896 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-tga (1:1.2.1-3) UNRELEASED; urgency=low
+
+ * Build against Xserver 1.9.1 rc1.
+
+ -- Cyril Brulebois <kibi@debian.org> Sat, 16 Oct 2010 21:22:28 +0200
+
xserver-xorg-video-tga (1:1.2.1-2) unstable; urgency=medium
* Update xsfbs, use new ${xviddriver:Depends} substvar.
diff --git a/debian/control b/debian/control
index 5adc85a..67a15e9 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends:
libtool,
xutils-dev,
pkg-config,
- xserver-xorg-dev (>= 2:1.7.6.901),
+ xserver-xorg-dev (>= 2:1.9.0.901),
x11proto-video-dev,
x11proto-xext-dev,
x11proto-xf86dga-dev,
commit 3e8499f3f99dde41fbdb0317c1db48e0d8e43f99
Author: Julien Cristau <jcristau@debian.org>
Date: Sat May 15 16:25:52 2010 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 37bf862..4f70636 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-video-tga (1:1.2.1-2) UNRELEASED; urgency=low
+xserver-xorg-video-tga (1:1.2.1-2) unstable; urgency=medium
* Update xsfbs, use new ${xviddriver:Depends} substvar.
- -- Julien Cristau <jcristau@debian.org> Sat, 15 May 2010 16:25:12 +0200
+ -- Julien Cristau <jcristau@debian.org> Sat, 15 May 2010 16:25:36 +0200
xserver-xorg-video-tga (1:1.2.1-1) unstable; urgency=low
commit a6da8ca5f5248c67502fb053a4f9affbf49cf17d
Author: Julien Cristau <jcristau@debian.org>
Date: Sat May 15 16:25:29 2010 +0200
Update xsfbs, use new ${xviddriver:Depends} substvar.
diff --git a/debian/changelog b/debian/changelog
index d4f52d6..37bf862 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-tga (1:1.2.1-2) UNRELEASED; urgency=low
+
+ * Update xsfbs, use new ${xviddriver:Depends} substvar.
+
+ -- Julien Cristau <jcristau@debian.org> Sat, 15 May 2010 16:25:12 +0200
+
xserver-xorg-video-tga (1:1.2.1-1) unstable; urgency=low
[ Timo Aaltonen ]
diff --git a/debian/control b/debian/control
index c22b5c7..5adc85a 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends:
libtool,
xutils-dev,
pkg-config,
- xserver-xorg-dev (>= 2:1.7),
+ xserver-xorg-dev (>= 2:1.7.6.901),
x11proto-video-dev,
x11proto-xext-dev,
x11proto-xf86dga-dev,
@@ -23,7 +23,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-tga.git
Package: xserver-xorg-video-tga
Architecture: alpha amd64 arm armeb armel hppa hurd-i386 i386 ia64 kfreebsd-i386 m68k mips mipsel netbsd-i386 powerpc
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xviddriver:Depends}
Provides: ${xviddriver:Provides}
Replaces: xserver-xorg (<< 6.8.2-35), xserver-xorg-driver-tga
Conflicts: xserver-xorg-driver-tga
commit 1a31a932d72bc9fe88d2b6fe36915deaf1b21626
Author: Mikhail Gusarov <dottedmag@debian.org>
Date: Fri May 7 18:58:59 2010 +0700
Remove duplicate xorg.fd.o URL and confusing mailing list URL from debian/control
diff --git a/debian/control b/debian/control
index 228bc5c..c22b5c7 100644
--- a/debian/control
+++ b/debian/control
@@ -33,7 +33,5 @@ Description: X.Org X server -- TGA display 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-tga driver module.
commit 81fc271788605b52e85c2d11635a0371fb44605e
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun May 2 02:14:45 2010 +0200
Add xorg-driver-{video,input} to Provides.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 77c4a39..3c59c20 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -261,8 +261,8 @@ INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null)
# these two can be removed post-squeeze
VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null)
-VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
-INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI)
+VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI), xorg-driver-video
+INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI), xorg-driver-input
ifeq ($(PACKAGE),)
PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
commit b045afbd8277ad0c44e29d7c45802053c4335ccd
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Apr 16 22:14:46 2010 +0200
Update serverabi rule for xserver 1.7.6.901
Add new variables ${xviddriver:Depends} and ${xinpdriver:Depends} for
drivers. The ${xserver:Depends} variable is deprecated.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 351fea5..77c4a39 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -253,25 +253,33 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
# debian/*.prerm
>$@
-SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null)
+# Compute dependencies for drivers
+#
+VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null)
+INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null)
+
+# these two can be removed post-squeeze
VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null)
-SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS))
VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI)
+
ifeq ($(PACKAGE),)
PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
endif
.PHONY: serverabi
serverabi: install
-ifeq ($(SERVERMINVERS),)
- @echo error: xserver-xorg-dev needs to be installed
+ifeq ($(VIDEODEP),)
+ @echo 'error: xserver-xorg-dev >= 1.7.6.901 needs to be installed'
@exit 1
else
- echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars
+ echo "xviddriver:Depends=$(VIDEODEP)" >> debian/$(PACKAGE).substvars
+ echo "xinpdriver:Depends=$(INPUTDEP)" >> debian/$(PACKAGE).substvars
+ # the following is there for compatibility...
echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars
echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars
+ echo "xserver:Depends=$(VIDEODEP), $(INPUTDEP)" >> debian/$(PACKAGE).substvars
endif
# vim:set noet ai sts=8 sw=8 tw=0:
commit 8bd2e9b523da35493db1bd781d4ef6bfbbeb2eff
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Apr 13 14:06:33 2010 +0200
xsfbs.mk: don't use a directory as a make target
The timestamp on the directory gets updated each time a file is added in
it, which causes useless rebuilds.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 5e16b10..351fea5 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -110,14 +110,15 @@ $(STAMP_DIR)/stampdir:
.PHONY: prepare
stampdir_targets+=prepare
prepare: $(STAMP_DIR)/prepare
-$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts
+$(STAMP_DIR)/prepare: $(STAMP_DIR)/logdir $(STAMP_DIR)/genscripts
>$@
-.PHONY: log
-stampdir_targets+=log
-log: $(STAMP_DIR)/log
-$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir
+.PHONY: logdir
+stampdir_targets+=logdir
+logdir: $(STAMP_DIR)/logdir
+$(STAMP_DIR)/logdir: $(STAMP_DIR)/stampdir
mkdir -p $(STAMP_DIR)/log
+ >$@
# Apply all patches to the upstream source.
.PHONY: patch
@@ -145,7 +146,7 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
# Revert all patches to the upstream source.
.PHONY: unpatch
-unpatch: $(STAMP_DIR)/log
+unpatch: $(STAMP_DIR)/logdir
rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \
if $(QUILT) applied >/dev/null 2>/dev/null; then \
commit 734e3b2d1dcfe5db07cb19902617fd1212c0c186
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Apr 1 20:49:15 2010 +0200
Fix typo.
diff --git a/debian/README.source b/debian/README.source
index 34ab4bf..b09a1ab 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -25,7 +25,7 @@ just need to be pulled into git.debian.org in a "upstream-*" branch.
Otherwise, the upstream sources are manually installed in the Debian
git repository.
-The .orig.tar.gz upstream source file could be generated this
+The .orig.tar.gz upstream source file could be generated using this
"upstream-*" branch in the Debian git repository but it is actually
copied from upstream tarballs directly.
commit 8c08367db03220e59fd6932a7541f6a64bff23e8
Author: Brice Goglin <bgoglin@debian.org>
Date: Sun Mar 14 19:43:00 2010 +0100
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 76f8d13..d4f52d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-tga (1:1.2.1-1) UNRELEASED; urgency=low
+xserver-xorg-video-tga (1:1.2.1-1) unstable; urgency=low
[ Timo Aaltonen ]
* New upstream release, closes: #569423.
@@ -11,8 +11,9 @@ xserver-xorg-video-tga (1:1.2.1-1) UNRELEASED; urgency=low
[ Brice Goglin ]
* Bump Standards-Version to 3.8.4, no changes needed.
* Drop the XS- prefix from Vcs-* control fields.
+ * Add myself to Uploaders.
- -- Timo Aaltonen <tjaalton@ubuntu.com> Sat, 05 Dec 2009 11:01:22 +0200
+ -- Brice Goglin <bgoglin@debian.org> Sun, 14 Mar 2010 19:42:54 +0100
xserver-xorg-video-tga (1:1.2.0-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index e8c9255..228bc5c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-video-tga
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Brice Goglin <bgoglin@debian.org>
Build-Depends:
debhelper (>= 5.0.0),
automake,
commit 7e42d9f1b45f71db2bf217b26396ae93c6fd2d3a
Author: Brice Goglin <bgoglin@debian.org>
Date: Sun Mar 14 19:41:53 2010 +0100
Drop the XS- prefix from Vcs-* control fields.
diff --git a/debian/changelog b/debian/changelog
index 486ba97..76f8d13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ xserver-xorg-video-tga (1:1.2.1-1) UNRELEASED; urgency=low
[ Brice Goglin ]
* Bump Standards-Version to 3.8.4, no changes needed.
+ * Drop the XS- prefix from Vcs-* control fields.
-- Timo Aaltonen <tjaalton@ubuntu.com> Sat, 05 Dec 2009 11:01:22 +0200
diff --git a/debian/control b/debian/control
index 733a371..e8c9255 100644
--- a/debian/control
+++ b/debian/control
@@ -18,8 +18,8 @@ Build-Depends:
x11proto-randr-dev,
x11proto-render-dev
Standards-Version: 3.8.4
-XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-tga
-XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-tga.git
+Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-tga
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-tga.git
Package: xserver-xorg-video-tga
Architecture: alpha amd64 arm armeb armel hppa hurd-i386 i386 ia64 kfreebsd-i386 m68k mips mipsel netbsd-i386 powerpc
commit 51e986271c7505b97c310ebda951de81722c36c1
Author: Brice Goglin <bgoglin@debian.org>
Date: Sun Mar 14 19:41:19 2010 +0100
Bump Standards-Version to 3.8.4
diff --git a/debian/changelog b/debian/changelog
index 78d8a75..486ba97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,13 +2,15 @@ xserver-xorg-video-tga (1:1.2.1-1) UNRELEASED; urgency=low
[ Timo Aaltonen ]
* New upstream release, closes: #569423.
- * Bump Standards-Version to 3.8.3.
* Build against Xserver 1.7.
[ Julien Cristau ]
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
good reason. Thanks, Colin Watson!
+ [ Brice Goglin ]
+ * Bump Standards-Version to 3.8.4, no changes needed.
+
-- Timo Aaltonen <tjaalton@ubuntu.com> Sat, 05 Dec 2009 11:01:22 +0200
xserver-xorg-video-tga (1:1.2.0-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index d56bee4..733a371 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
x11proto-fonts-dev,
x11proto-randr-dev,
x11proto-render-dev
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-tga
XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-tga.git
commit 822a82ec46b3f76c93c05847841e32f90264af5c
Author: Brice Goglin <bgoglin@debian.org>
Date: Sun Mar 14 19:40:08 2010 +0100
Add bug closer
diff --git a/debian/changelog b/debian/changelog
index d3d893a..78d8a75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
xserver-xorg-video-tga (1:1.2.1-1) UNRELEASED; urgency=low
[ Timo Aaltonen ]
- * New upstream release.
+ * New upstream release, closes: #569423.
* Bump Standards-Version to 3.8.3.
* Build against Xserver 1.7.
commit 62683980d3f00ca8929fe8d84c01f129fe912128
Author: Julien Cristau <julien@radis.liafa.jussieu.fr>
Date: Sat Jan 16 16:48:47 2010 +0000
Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good reason. Thanks, Colin Watson!
diff --git a/debian/changelog b/debian/changelog
index e482f92..d3d893a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
xserver-xorg-video-tga (1:1.2.1-1) UNRELEASED; urgency=low
+ [ Timo Aaltonen ]
* New upstream release.
* Bump Standards-Version to 3.8.3.
* Build against Xserver 1.7.
+ [ Julien Cristau ]
+ * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
+ good reason. Thanks, Colin Watson!
+
-- Timo Aaltonen <tjaalton@ubuntu.com> Sat, 05 Dec 2009 11:01:22 +0200
xserver-xorg-video-tga (1:1.2.0-1) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index f6aef27..85e5391 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,12 +36,12 @@ build: build-stamp
build-stamp:
dh_testdir
autoreconf -vfi
- mkdir -p obj-$(DEB_BUILD_GNU_TYPE)
- cd obj-$(DEB_BUILD_GNU_TYPE) && \
+ mkdir -p build
+ cd build && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
CFLAGS="$(CFLAGS)"
- cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
+ cd build && $(MAKE)
>$@
clean:
@@ -53,7 +53,7 @@ clean:
rm -f */config.cache */config.log */config.status
rm -f conftest* */conftest*
rm -rf autom4te.cache */autom4te.cache
- rm -rf obj-*
+ rm -rf build
rm -f aclocal.m4 config.guess config.sub config.h.in configure
rm -f depcomp install-sh ltmain.sh missing mkinstalldirs
rm -f $$(find -name Makefile.in)
@@ -66,7 +66,7 @@ install: build
dh_clean -k
dh_installdirs
- cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+ cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
# Build architecture-dependent files here.
binary-arch: build install serverabi
commit 4c1afb427123e41a6139e71a71d7bb5579e73f22
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Sat Dec 5 13:47:47 2009 +0200
Fix the changelog.
diff --git a/debian/changelog b/debian/changelog
index b4557cb..e482f92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-tga (1:1.2.0-2) UNRELEASED; urgency=low
+xserver-xorg-video-tga (1:1.2.1-1) UNRELEASED; urgency=low
* New upstream release.
* Bump Standards-Version to 3.8.3.
commit b42d987e02e9fa374f3344e91d0c7473d3c7a6dd
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Sat Dec 5 11:05:51 2009 +0200
Build against Xserver 1.7.
diff --git a/debian/changelog b/debian/changelog
index 172e9d4..b4557cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-video-tga (1:1.2.0-2) UNRELEASED; urgency=low
* New upstream release.
* Bump Standards-Version to 3.8.3.
+ * Build against Xserver 1.7.
-- Timo Aaltonen <tjaalton@ubuntu.com> Sat, 05 Dec 2009 11:01:22 +0200
diff --git a/debian/control b/debian/control
index 8bcafe7..d56bee4 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends:
libtool,
xutils-dev,
pkg-config,
- xserver-xorg-dev (>= 2:1.4),
+ xserver-xorg-dev (>= 2:1.7),
x11proto-video-dev,
x11proto-xext-dev,
x11proto-xf86dga-dev,
commit 0c4eaacb536ea3c9e81b6873c0cd86b468c953bb
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Sat Dec 5 11:04:28 2009 +0200
Bump Standards-Version to 3.8.3.
diff --git a/debian/changelog b/debian/changelog
index f4e08cc..172e9d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-video-tga (1:1.2.0-2) UNRELEASED; urgency=low
* New upstream release.
+ * Bump Standards-Version to 3.8.3.
-- Timo Aaltonen <tjaalton@ubuntu.com> Sat, 05 Dec 2009 11:01:22 +0200
diff --git a/debian/control b/debian/control
index f3b72b1..8bcafe7 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
x11proto-fonts-dev,
x11proto-randr-dev,
x11proto-render-dev
-Standards-Version: 3.7.2.2
+Standards-Version: 3.8.3
XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-tga
XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-tga.git
commit 2ee088fd0b65f3c1f3e71799fb1d82fa5a5a26fc
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Sat Dec 5 11:02:27 2009 +0200
Update the changelogs.
diff --git a/ChangeLog b/ChangeLog
index 65104f5..3b74889 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,44 @@
+commit f8ab003b1bf36ee9bd336689f79c3f4f2801f7f4
+Author: Dave Airlie <airlied@redhat.com>
+Date: Mon Sep 7 14:51:16 2009 +1000
+
+ bump to 1.2.1
+
+commit 0922506f4c4627e4a0b6041c3569656e5314e937
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jul 28 15:22:41 2009 +1000
+
+ tga: change to using ABI version check
+
+commit 2e5ad88716038229563e0682b2665f156aab0d33
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jul 28 13:32:39 2009 +1000
+
+ tga: update for resources/RAC API removal
+
+commit 60a7cad2c07bd23f58de07e927d0abbadd5e3bc8
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Jul 16 11:57:07 2009 +1000
+
+ Update to xextproto 7.1 support.
+
+ DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers
+ need to include dpmsconst.h if xextproto 7.1 is available.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit a1de18228b0e6743f9615d820229a7b144f3f5ac
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu May 28 15:22:15 2009 -0400
+
+ Remove useless loader symbol lists.
+
+commit 72e3e402ef00ff1ef910e6e0319b87182ae668b0
+Author: Julien Cristau <jcristau@debian.org>
+Date: Fri May 15 02:53:13 2009 +0200
+
+ Add unistd.h include for getpagesize() and usleep()
+
commit 2ab537c3cfe2dbb498ee2f46bf3448c094d7e76b
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Sep 3 18:16:13 2008 -0400
diff --git a/debian/changelog b/debian/changelog
index 5695f6d..f4e08cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-tga (1:1.2.0-2) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Sat, 05 Dec 2009 11:01:22 +0200
+
xserver-xorg-video-tga (1:1.2.0-1) unstable; urgency=low
[ Brice Goglin ]
commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Sep 25 16:39:23 2009 +0200
xsfbs.mk: remove more obsolete code
We can use plain debconf-updatepo, and don't need to clean the 'imports'
directory or shlibs.local.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 82eb45f..5e16b10 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -177,19 +177,7 @@ xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
rm -rf $(STAMP_DIR)
- rm -rf imports
- dh_clean debian/shlibs.local \
- debian/po/pothead
-
-# Generate the debconf templates POT file header.
-debian/po/pothead: debian/po/pothead.in
- sed -e 's/SOURCE_VERSION/$(SOURCE_VERSION)/' \
- -e 's/DATE/$(shell date "+%F %X%z"/)' <$< >$@
-
-# Update POT and PO files.
-.PHONY: updatepo
-updatepo: debian/po/pothead
- debian/scripts/debconf-updatepo --pot-header=pothead --verbose
+ dh_clean
# 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.
commit 9a4314c976e0d22e8d47f5d86163791e407a6ecc
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Sep 25 15:43:28 2009 +0200
xsfbs.mk: kill obsolete DEFAULT_DCRESOLUTIONS and SOURCE_DIR usage
These variables aren't set anywhere.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 1f86848..82eb45f 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -176,7 +176,7 @@ cleanscripts:
xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
- rm -rf $(STAMP_DIR) $(SOURCE_DIR)
+ rm -rf $(STAMP_DIR)
rm -rf imports
dh_clean debian/shlibs.local \
debian/po/pothead
@@ -252,7 +252,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
| sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \
sed -e 's/@SOURCE_VERSION@/$(SOURCE_VERSION)/' \
-e 's/@OFFICIAL_BUILD@/$(OFFICIAL_BUILD)/' \
- -e 's/@DEFAULT_DCRESOLUTIONS@/$(DEFAULT_DCRESOLUTIONS)/' \
<$$MAINTSCRIPT.tmp >$$MAINTSCRIPT; \
rm $$MAINTSCRIPT.tmp; \
fi; \
commit bda208ec00d0b7b3632f57fb27e014684cdf73ba
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Sep 25 15:33:39 2009 +0200
xsfbs.sh: fix typo and remove svn keyword
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 45acd59..813fd8d 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -1,5 +1,3 @@
-# $Id$
-
# This is the X Strike Force shell library for X Window System package
# maintainer scripts. It serves to define shell functions commonly used by
# such packages, and performs some error checking necessary for proper operation
@@ -8,7 +6,7 @@
# removal tasks.
# If you are reading this within a Debian package maintainer script (e.g.,
-# /var/lib/dpkg)info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can
+# /var/lib/dpkg/info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can
# skip past this library by scanning forward in this file to the string
# "GOBSTOPPER".
commit f8ab003b1bf36ee9bd336689f79c3f4f2801f7f4
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Sep 7 14:51:16 2009 +1000
bump to 1.2.1
diff --git a/configure.ac b/configure.ac
index 3ff2dfb..c357ab3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-tga],
- 1.2.0,
+ 1.2.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-tga)
commit 5693792171d885769e58dcccc053c08b11acd12a
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 26 18:53:36 2009 +0200
xsfbs.mk: no need for shlibs.local
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index f0f8953..1f86848 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -265,10 +265,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
# debian/*.prerm
>$@
-# Generate the shlibs.local file.
-debian/shlibs.local:
- cat debian/*.shlibs >$@
-
SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null)
VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null)
commit 1f858adff1ce2687cf542dd9b69b81137412f8a4
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 26 18:47:09 2009 +0200
xsfbs.sh: remove unused reject_whitespace function
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index b3f4bbe..45acd59 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -93,22 +93,6 @@ reject_nondigits () {
done
}
-reject_whitespace () {
- # syntax: reject_whitespace [ operand ]
- #
- # scan operand (typically a shell variable whose value cannot be trusted) for
- # whitespace characters and barf if any are found
- if [ -n "$1" ]; then
- # does the operand contain any whitespace?
- if expr "$1" : "[[:space:]]" > /dev/null 2>&1; then
- # can't use die(), because I want to avoid forward references
- echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_whitespace() encountered" \
- "possibly malicious garbage \"$1\"" >&2
- exit $SHELL_LIB_THROWN_ERROR
- fi
- fi
-}
-
reject_unlikely_path_chars () {
# syntax: reject_unlikely_path_chars [ operand ... ]
#
commit 0dd71e12416aa7dc60ed68af8127e04609b125f4
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 26 18:23:53 2009 +0200
xsfbs.sh: remove unused find_culprits function
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 7dbb196..b3f4bbe 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -199,53 +199,6 @@ usage_error () {
exit $SHELL_LIB_USAGE_ERROR
}
-find_culprits () {
- local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \
- msg
-
- reject_whitespace "$1"
- message "Searching for overlapping packages..."
- dpkg_info_dir=/var/lib/dpkg/info
- if [ -d $dpkg_info_dir ]; then
- if [ "$(echo $dpkg_info_dir/*.list)" != "$dpkg_info_dir/*.list" ]; then
- possible_culprits=$(ls -1 $dpkg_info_dir/*.list | egrep -v \
- "(xbase-clients|x11-common|xfs|xlibs)")
- if [ -n "$possible_culprits" ]; then
- smoking_guns=$(grep -l "$1" $possible_culprits || true)
- if [ -n "$smoking_guns" ]; then
- bad_packages=$(printf "\\n")
- for f in $smoking_guns; do
- # too bad you can't nest parameter expansion voodoo
- p=${f%*.list} # strip off the trailing ".list"
- package=${p##*/} # strip off the directories
- bad_packages=$(printf "%s\n%s" "$bad_packages" "$package")
- done
- msg=$(cat <<EOF
-The following packages appear to have file overlaps with the X.Org packages;
-these packages are either very old, or in violation of Debian Policy. Try
-upgrading each of these packages to the latest available version if possible:
-for example, with the command "apt-get install". If no newer version of a
-package is available, you will have to remove it; for example, with the command
-"apt-get remove". If even the latest available version of the package has
-this file overlap, please file a bug against that package with the Debian Bug
-Tracking System. You may want to refer the package maintainer to section 12.8
-of the Debian Policy manual.
-EOF
-)
- message "$msg"
- message "The overlapping packages are: $bad_packages"
- else
- message "no overlaps found."
- fi
- fi
- else
- message "cannot search; no matches for $dpkg_info_dir/*.list."
- fi
- else
- message "cannot search; $dpkg_info_dir does not exist."
- fi
-}
-
font_update () {
# run $UPDATECMDS in $FONTDIRS
commit b6c6eceec66066ebac16c85cc75bfa8a4f6cf58a
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 26 18:23:06 2009 +0200
xsfbs.sh: remove unused maplink function
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index f869274..7dbb196 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -199,37 +199,6 @@ usage_error () {
exit $SHELL_LIB_USAGE_ERROR
}
-
-maplink () {
- # returns what symlink should point to; i.e., what the "sane" answer is
- # Keep this in sync with the debian/*.links files.
- # This is only needed for symlinks to directories.
- #
- # XXX: Most of these look wrong in the X11R7 world and need to be fixed.
- # If we've stopped using this function, fixing it might enable us to re-enable
- # it again and catch more errors.
- case "$1" in
- /etc/X11/xkb/compiled) echo /var/lib/xkb ;;
- /etc/X11/xkb/xkbcomp) echo /usr/X11R6/bin/xkbcomp ;;
- /usr/X11R6/lib/X11/app-defaults) echo /etc/X11/app-defaults ;;
- /usr/X11R6/lib/X11/fs) echo /etc/X11/fs ;;
- /usr/X11R6/lib/X11/lbxproxy) echo /etc/X11/lbxproxy ;;
- /usr/X11R6/lib/X11/proxymngr) echo /etc/X11/proxymngr ;;
- /usr/X11R6/lib/X11/rstart) echo /etc/X11/rstart ;;
- /usr/X11R6/lib/X11/twm) echo /etc/X11/twm ;;
- /usr/X11R6/lib/X11/xdm) echo /etc/X11/xdm ;;
- /usr/X11R6/lib/X11/xinit) echo /etc/X11/xinit ;;
- /usr/X11R6/lib/X11/xkb) echo /etc/X11/xkb ;;
- /usr/X11R6/lib/X11/xserver) echo /etc/X11/xserver ;;
- /usr/X11R6/lib/X11/xsm) echo /etc/X11/xsm ;;
- /usr/bin/X11) echo ../X11R6/bin ;;
- /usr/bin/rstartd) echo ../X11R6/bin/rstartd ;;
- /usr/include/X11) echo ../X11R6/include/X11 ;;
- /usr/lib/X11) echo ../X11R6/lib/X11 ;;
- *) internal_error "maplink() called with unknown path \"$1\"" ;;
- esac
-}
-
find_culprits () {
local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \
msg
commit 8eb3d6a5ce9964876e48ea56048f1a5135ef4f28
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 26 18:21:34 2009 +0200
xsfbs.sh: remove unused analyze_path
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 4461b1a..f869274 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -230,32 +230,6 @@ maplink () {
esac
}
-analyze_path () {
- # given a supplied set of pathnames, break each one up by directory and do an
- # ls -dl on each component, cumulatively; i.e.
- # analyze_path /usr/X11R6/bin -> ls -dl /usr /usr/X11R6 /usr/X11R6/bin
- # Thanks to Randolph Chung for this clever hack.
Reply to: