ChangeLog | 27 ++
aclocal.m4 | 2
configure | 20 +-
configure.ac | 2
debian/changelog | 20 +-
debian/compat | 2
debian/control | 4
debian/rules | 2
debian/xsfbs/xsfbs-autoreconf.mk | 150 ---------------
debian/xsfbs/xsfbs.mk | 51 +----
debian/xsfbs/xsfbs.sh | 387 +++++++++++++++++++++------------------
ltmain.sh | 2
src/i128IBMDAC.c | 1
src/i128_driver.c | 45 ++--
src/i128accel.c | 6
src/i128exa.c | 2
src/i128init.c | 2
src/i128pcirename.h | 6
18 files changed, 320 insertions(+), 411 deletions(-)
New commits:
commit 84d57007e8e0545c75bb89dcff441679b0fcc223
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Thu Sep 4 20:17:22 2008 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index e9cfa1e..663c1b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-i128 (1:1.3.1-1) UNRELEASED; urgency=low
+xserver-xorg-video-i128 (1:1.3.1-1) experimental; urgency=low
* New upstream release.
* Build against xserver 1.5.
- -- Julien Cristau <[EMAIL PROTECTED]> Thu, 04 Sep 2008 20:05:40 +0200
+ -- Julien Cristau <[EMAIL PROTECTED]> Thu, 04 Sep 2008 20:17:18 +0200
xserver-xorg-video-i128 (1:1.3.0-1) unstable; urgency=low
commit 135334ce50037af7a9ed75eb64517a4714779aa9
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Thu Sep 4 20:17:14 2008 +0200
Build against xserver 1.5.
diff --git a/debian/changelog b/debian/changelog
index be96bca..e9cfa1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-video-i128 (1:1.3.1-1) UNRELEASED; urgency=low
* New upstream release.
+ * Build against xserver 1.5.
-- Julien Cristau <[EMAIL PROTECTED]> Thu, 04 Sep 2008 20:05:40 +0200
diff --git a/debian/control b/debian/control
index a5321aa..e6e4936 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: David Nusinow <[EMAIL PROTECTED]>, Julien Cristau <[EMAIL
PROTECTED]>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, xserver-xorg-dev (>=
2:1.4), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev,
x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev, dpkg-dev (>=
1.14.17)
+Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, xserver-xorg-dev (>=
2:1.5), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev,
x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev, dpkg-dev (>=
1.14.17)
Standards-Version: 3.7.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-i128
Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-i128.git
commit d5ca4336d046d075a3004ce460e4541e7f177570
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Thu Sep 4 20:14:45 2008 +0200
autoreconf
diff --git a/aclocal.m4 b/aclocal.m4
index ef947f1..62b902b 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -21,7 +21,7 @@ To do so, use the procedure documented by the package,
typically `autoreconf'.])
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 52 Debian 1.5.26-1 AC_PROG_LIBTOOL
+# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
diff --git a/configure b/configure
index 48cec63..efdddd6 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for xf86-video-i128 1.3.0.
+# Generated by GNU Autoconf 2.61 for xf86-video-i128 1.3.1.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='xf86-video-i128'
PACKAGE_TARNAME='xf86-video-i128'
-PACKAGE_VERSION='1.3.0'
-PACKAGE_STRING='xf86-video-i128 1.3.0'
+PACKAGE_VERSION='1.3.1'
+PACKAGE_STRING='xf86-video-i128 1.3.1'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am"
@@ -1432,7 +1432,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xf86-video-i128 1.3.0 to adapt to many kinds of
systems.
+\`configure' configures xf86-video-i128 1.3.1 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1502,7 +1502,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-video-i128 1.3.0:";;
+ short | recursive ) echo "Configuration of xf86-video-i128 1.3.1:";;
esac
cat <<\_ACEOF
@@ -1618,7 +1618,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-video-i128 configure 1.3.0
+xf86-video-i128 configure 1.3.1
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1632,7 +1632,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xf86-video-i128 $as_me 1.3.0, which was
+It was created by xf86-video-i128 $as_me 1.3.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2327,7 +2327,7 @@ fi
# Define the identity of the package.
PACKAGE='xf86-video-i128'
- VERSION='1.3.0'
+ VERSION='1.3.1'
cat >>confdefs.h <<_ACEOF
@@ -22478,7 +22478,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xf86-video-i128 $as_me 1.3.0, which was
+This file was extended by xf86-video-i128 $as_me 1.3.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -22531,7 +22531,7 @@ Report bugs to <[EMAIL PROTECTED]>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xf86-video-i128 config.status 1.3.0
+xf86-video-i128 config.status 1.3.1
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/ltmain.sh b/ltmain.sh
index 5def351..0bf3848 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -43,7 +43,7 @@ EXIT_FAILURE=1
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION="1.5.26 Debian 1.5.26-1"
+VERSION="1.5.26 Debian 1.5.26-4"
TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
commit 303b4a44440669c7caae7e330bc1ad97d76ec869
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Thu Sep 4 20:06:22 2008 +0200
update changelogs
diff --git a/ChangeLog b/ChangeLog
index 17f5313..43db9fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+commit 4be161bca1ae9fca29e882c5909405781b565cb1
+Author: Julien Cristau <[EMAIL PROTECTED]>
+Date: Thu Sep 4 19:51:58 2008 +0200
+
+ Bump to 1.3.1
+
+commit ab11b4bd9e76abdbfca5d7e5c9e9d0a7f52a4a34
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Fri Aug 15 15:30:19 2008 -0400
+
+ Don't store pScrn->monitor->DDC manually, let xf86SetDDCproperties do it.
+
+commit 3b1d9fe8694df9b63ad12c7fe5cd059f4132a8ce
+Author: Paulo Cesar Pereira de Andrade <[EMAIL PROTECTED]>
+Date: Thu Mar 13 16:31:30 2008 -0300
+
+ Replace calls to xf86usleep with calls to usleep and include unistd.h.
+
+commit 6327ba52ba39cbbe5584fe5cba6864d3d6ad38b0
+Author: Paulo Cesar Pereira de Andrade <[EMAIL PROTECTED]>
+Date: Thu Mar 13 16:42:06 2008 -0300
+
+ Compile warning fixes.
+
+ The casts for printf format are really required to pass
+ proper arguments, as pciaddr_t is a 64 bit integer.
+
commit fae990d08f50c760c3ba09fa9d949e42104ebf60
Author: Adam Jackson <[EMAIL PROTECTED]>
Date: Wed Mar 19 14:16:19 2008 -0400
diff --git a/debian/changelog b/debian/changelog
index a7e7f18..be96bca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-i128 (1:1.3.1-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Julien Cristau <[EMAIL PROTECTED]> Thu, 04 Sep 2008 20:05:40 +0200
+
xserver-xorg-video-i128 (1:1.3.0-1) unstable; urgency=low
[ Brice Goglin ]
commit 4be161bca1ae9fca29e882c5909405781b565cb1
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Thu Sep 4 19:51:58 2008 +0200
Bump to 1.3.1
diff --git a/configure.ac b/configure.ac
index 350130b..6002fc5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-i128],
- 1.3.0,
+ 1.3.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-i128)
commit ab11b4bd9e76abdbfca5d7e5c9e9d0a7f52a4a34
Author: Adam Jackson <[EMAIL PROTECTED]>
Date: Fri Aug 15 15:30:19 2008 -0400
Don't store pScrn->monitor->DDC manually, let xf86SetDDCproperties do it.
diff --git a/src/i128_driver.c b/src/i128_driver.c
index 9895900..72a69e7 100644
--- a/src/i128_driver.c
+++ b/src/i128_driver.c
@@ -898,7 +898,6 @@ I128PreInit(ScrnInfoPtr pScrn, int flags)
/* Read and print the Monitor DDC info */
mon = I128getDDC(pScrn);
- pScrn->monitor->DDC = mon;
/* see if we can find a flatpanel */
if (!pI128->FlatPanel && mon) {
commit 86e7669f5d912824e341ea487a6257ec5433eb90
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Thu Jul 17 15:44:45 2008 +0200
xsfbs.mk: make 'log' a separate target
'prepare' runs genscripts, and we don't want that in unpatch,
so create stampdir/log in a separate target, and make unpatch
depend on that instead of prepare.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 984e81c..f0f8953 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -110,10 +110,15 @@ $(STAMP_DIR)/stampdir:
.PHONY: prepare
stampdir_targets+=prepare
prepare: $(STAMP_DIR)/prepare
-$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir $(STAMP_DIR)/genscripts
- mkdir -p $(STAMP_DIR)/log
+$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts
>$@
+.PHONY: log
+stampdir_targets+=log
+log: $(STAMP_DIR)/log
+$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir
+ mkdir -p $(STAMP_DIR)/log
+
# Apply all patches to the upstream source.
.PHONY: patch
stampdir_targets+=patch
@@ -140,7 +145,7 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
# Revert all patches to the upstream source.
.PHONY: unpatch
-unpatch: $(STAMP_DIR)/prepare
+unpatch: $(STAMP_DIR)/log
rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \
if $(QUILT) applied >/dev/null 2>/dev/null; then \
commit 50619e730fcaf422ffa4451468520526b2a830b8
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Wed Jul 16 18:42:14 2008 +0200
xsfbs.mk: update the list of releases, and drop some unused code
we haven't had a separate source tree since modularization.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 2350f80..984e81c 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -44,9 +44,9 @@ NO_EPOCH_VER:=$(shell echo $(UPSTREAM_VERSION) | sed
's/^.://')
BUILDER:=$(shell echo $${DEBEMAIL:-$${EMAIL:-$$(echo [EMAIL PROTECTED](cat
/etc/mailname 2>/dev/null))}})
# Find out if this is an official build; an official build has nothing but
-# digits, dots, and/or the strings "woody" or "sarge" in the Debian part of the
+# digits, dots, and/or the codename of a release in the Debian part of the
# version number. Anything else indicates an unofficial build.
-OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr "$$(echo
$${VERSION\#\#*-} | sed 's/\(woody\|sarge\)//g')" : ".*[^0-9.].*" >/dev/null
2>&1; then echo yes; fi)
+OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr "$$(echo
$${VERSION\#\#*-} | sed 's/\(woody\|sarge\|etch\|lenny\)//g')" : ".*[^0-9.].*"
>/dev/null 2>&1; then echo yes; fi)
# Set up parameters for the Debian build environment.
@@ -69,16 +69,6 @@ endif
# $(STAMP_DIR) houses stamp files for complex targets.
STAMP_DIR:=stampdir
-# $(SOURCE_DIR) houses one or more source trees.
-SOURCE_DIR:=build-tree
-
-# $(SOURCE_TREE) is the location of the source tree to be compiled. If there
-# is more than one, others are found using this name plus a suffix to indicate
-# the purpose of the additional tree (e.g., $(SOURCE_TREE)-custom). The
-# "setup" target is responsible for creating such trees.
-#SOURCE_TREE:=$(SOURCE_DIR)/xc
-#FIXME We need to define this in our debian/rules file
-
# $(DEBTREEDIR) is where all install rules are told (via $(DESTDIR)) to place
# their files.
DEBTREEDIR:=$(CURDIR)/debian/tmp
commit 6c29758eb1a2798f6b77516b7a75dc399769d217
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Wed Jul 16 18:22:01 2008 +0200
xsfbs.mk: more parallel make fixing
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index fa2431e..2350f80 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -119,8 +119,8 @@ $(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)/prepare: $(STAMP_DIR)/stampdir
+prepare: $(STAMP_DIR)/prepare
+$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir $(STAMP_DIR)/genscripts
mkdir -p $(STAMP_DIR)/log
>$@
commit 78b3958b14a5298165d8500d711342be1b7b6463
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Wed Jul 16 18:22:01 2008 +0200
xsfbs.mk: fix the prepare target for parallel make
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index b871b3b..fa2431e 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -119,11 +119,9 @@ $(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)/log
+prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare
$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir
- if [ ! -e $(STAMP_DIR)/log ]; then \
- mkdir $(STAMP_DIR)/log; \
- fi; \
+ mkdir -p $(STAMP_DIR)/log
>$@
# Apply all patches to the upstream source.
commit b12b228d4fb268a303ecd1bd36390e8fff5b6918
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Thu Jun 5 21:39:04 2008 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 78d034e..a7e7f18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-i128 (1:1.3.0-1) UNRELEASED; urgency=low
+xserver-xorg-video-i128 (1:1.3.0-1) unstable; urgency=low
[ Brice Goglin ]
* Add upstream URL to debian/copyright.
@@ -16,7 +16,7 @@ xserver-xorg-video-i128 (1:1.3.0-1) UNRELEASED; urgency=low
dpkg-shlibdeps to shut up about symbols it can't find. Build-depend on
dpkg-dev >= 1.14.17.
- -- Brice Goglin <[EMAIL PROTECTED]> Sat, 15 Sep 2007 01:54:02 +0200
+ -- Julien Cristau <[EMAIL PROTECTED]> Thu, 05 Jun 2008 21:38:16 +0200
xserver-xorg-video-i128 (1:1.2.1-4) unstable; urgency=low
commit 0b191499b3cfa364782e0cda993cef7f4cb4cb59
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Thu Jun 5 21:37:36 2008 +0200
Run dpkg-shlibdeps with --warnings=6.
Drivers reference symbols from /usr/bin/Xorg and other modules,
and that's not a bug, so we want dpkg-shlibdeps to shut up about
symbols it can't find. Build-depend on dpkg-dev >= 1.14.17.
diff --git a/debian/changelog b/debian/changelog
index b618291..78d034e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,10 @@ xserver-xorg-video-i128 (1:1.3.0-1) UNRELEASED; urgency=low
* Bump Standards-Version to 3.7.3.
* Add myself to Uploaders.
* Bump debhelper compat level to 5.
+ * Run dpkg-shlibdeps with --warnings=6. Drivers reference symbols from
+ /usr/bin/Xorg and other modules, and that's not a bug, so we want
+ dpkg-shlibdeps to shut up about symbols it can't find. Build-depend on
+ dpkg-dev >= 1.14.17.
-- Brice Goglin <[EMAIL PROTECTED]> Sat, 15 Sep 2007 01:54:02 +0200
diff --git a/debian/control b/debian/control
index 3f14ddb..a5321aa 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: David Nusinow <[EMAIL PROTECTED]>, Julien Cristau <[EMAIL
PROTECTED]>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, xserver-xorg-dev (>=
2:1.4), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev,
x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev
+Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, xserver-xorg-dev (>=
2:1.4), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev,
x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev, dpkg-dev (>=
1.14.17)
Standards-Version: 3.7.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-i128
Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-i128.git
diff --git a/debian/rules b/debian/rules
index 6a7cd3b..fd60b37 100755
--- a/debian/rules
+++ b/debian/rules
@@ -78,7 +78,7 @@ binary-arch: build install serverabi
dh_compress
dh_fixperms
dh_installdeb
- dh_shlibdeps
+ dh_shlibdeps -- --warnings=6
dh_gencontrol
dh_md5sums
dh_builddeb
commit c1650917a42f9566150831d42fef37ba48b4f758
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Thu Jun 5 21:29:41 2008 +0200
Bump debhelper compat level to 5.
diff --git a/debian/changelog b/debian/changelog
index 76d5ca2..b618291 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ xserver-xorg-video-i128 (1:1.3.0-1) UNRELEASED; urgency=low
* Drop the XS- prefix from Vcs-* control fields.
* Bump Standards-Version to 3.7.3.
* Add myself to Uploaders.
+ * Bump debhelper compat level to 5.
-- Brice Goglin <[EMAIL PROTECTED]> Sat, 15 Sep 2007 01:54:02 +0200
diff --git a/debian/compat b/debian/compat
index b8626c4..7ed6ff8 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+5
diff --git a/debian/control b/debian/control
index 1af90af..3f14ddb 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: David Nusinow <[EMAIL PROTECTED]>, Julien Cristau <[EMAIL
PROTECTED]>
-Build-Depends: debhelper (>= 4.0.0), pkg-config, quilt, xserver-xorg-dev (>=
2:1.4), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev,
x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev
+Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, xserver-xorg-dev (>=
2:1.4), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev,
x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev
Standards-Version: 3.7.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-i128
Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-i128.git
commit b5e0637e3455c3194c59e376f44eb15ad8ea9b2c
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Thu Jun 5 21:29:05 2008 +0200
Add myself to Uploaders.
diff --git a/debian/changelog b/debian/changelog
index e64dd31..76d5ca2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ xserver-xorg-video-i128 (1:1.3.0-1) UNRELEASED; urgency=low
* Remove Branden from Uploaders with his permission.
* Drop the XS- prefix from Vcs-* control fields.
* Bump Standards-Version to 3.7.3.
+ * Add myself to Uploaders.
-- Brice Goglin <[EMAIL PROTECTED]> Sat, 15 Sep 2007 01:54:02 +0200
diff --git a/debian/control b/debian/control
index 93bde37..1af90af 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-video-i128
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <[EMAIL PROTECTED]>
+Uploaders: David Nusinow <[EMAIL PROTECTED]>, Julien Cristau <[EMAIL
PROTECTED]>
Build-Depends: debhelper (>= 4.0.0), pkg-config, quilt, xserver-xorg-dev (>=
2:1.4), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev,
x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev
Standards-Version: 3.7.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-i128
commit 027f6e153765a2adcf42a567dcbd6433fdeb388a
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Thu Jun 5 21:28:28 2008 +0200
Revert to building against xserver 1.4
diff --git a/debian/changelog b/debian/changelog
index 4e83289..e64dd31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,6 @@ xserver-xorg-video-i128 (1:1.3.0-1) UNRELEASED; urgency=low
* New upstream release.
* Refresh 01_gen_pci_ids.diff.
* Remove Branden from Uploaders with his permission.
- * Build against xserver 1.5 rc1.
* Drop the XS- prefix from Vcs-* control fields.
* Bump Standards-Version to 3.7.3.
diff --git a/debian/control b/debian/control
index a4d0d83..93bde37 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: David Nusinow <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0.0), pkg-config, quilt, xserver-xorg-dev (>=
2:1.4.99.901), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev,
x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev, libpciaccess-dev
+Build-Depends: debhelper (>= 4.0.0), pkg-config, quilt, xserver-xorg-dev (>=
2:1.4), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev,
x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev
Standards-Version: 3.7.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-i128
Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-i128.git
commit 4c2fb5aa80a15b5a9a9b51b03c7dc30496a22561
Author: Brice Goglin <[EMAIL PROTECTED]>
Date: Sat May 31 13:23:24 2008 +0200
Update xsfbs/quilt patching rules to be compatible with the
"3.0 (quilt)" source package.
Thanks to Raphael Hertzog.
See http://lists.debian.org/debian-x/2008/05/msg01250.html for details.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index c11923f..b871b3b 100755
--- 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.
@@ -162,10 +152,10 @@ $(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) 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."; \
@@ -192,7 +182,7 @@ cleanscripts:
.PHONY: xsfclean
xsfclean: cleanscripts unpatch
dh_testdir
- rm -rf .pc patches
+ rm -rf .pc
rm -rf $(STAMP_DIR) $(SOURCE_DIR)
rm -rf imports
dh_clean debian/shlibs.local \
commit dcf4204d5328834172df80951a18de014b0f74ef
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Fri May 30 12:26:18 2008 +0200
xsfbs.sh: use 'local' now that policy allows it
Policy 3.7.3 allows /bin/sh scripts to use 'local'.
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 0c7607a..72efa95 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -238,19 +238,19 @@ analyze_path () {
# analyze_path /usr/X11R6/bin -> ls -dl /usr /usr/X11R6 /usr/X11R6/bin
# Thanks to Randolph Chung for this clever hack.
- #local f g
+ local f g
while [ -n "$1" ]; do
reject_whitespace "$1"
- _g=
+ g=
message "Analyzing $1:"
- for _f in $(echo "$1" | tr / \ ); do
- if [ -e /$_g$_f ]; then
- ls -dl /$_g$_f /$_g$_f.dpkg-* 2> /dev/null || true
- _g=$_g$_f/
+ for f in $(echo "$1" | tr / \ ); do
+ if [ -e /$g$f ]; then
+ ls -dl /$g$f /$g$f.dpkg-* 2> /dev/null || true
+ g=$g$f/
else
- message "/$_g$_f: nonexistent; directory contents of /$_g:"
- ls -l /$_g
+ message "/$g$f: nonexistent; directory contents of /$g:"
+ ls -l /$g
break
fi
done
@@ -259,27 +259,27 @@ analyze_path () {
}
find_culprits () {
- #local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package
\
- # msg
+ 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 \
+ 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
+ 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")
+ package=${p##*/} # strip off the directories
+ bad_packages=$(printf "%s\n%s" "$bad_packages" "$package")
done
- _msg=$(cat <<EOF
+ 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:
@@ -291,17 +291,17 @@ 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"
+ 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."
+ message "cannot search; no matches for $dpkg_info_dir/*.list."
fi
else
- message "cannot search; $_dpkg_info_dir does not exist."
+ message "cannot search; $dpkg_info_dir does not exist."
fi
}
@@ -323,7 +323,7 @@ check_symlink () {
#
# Primarily used by check_symlinks_and_warn() and check_symlinks_and_bomb().
- #local symlink
+ local symlink
# validate arguments
if [ $# -ne 1 ]; then
@@ -332,9 +332,9 @@ check_symlink () {
exit $SHELL_LIB_USAGE_ERROR
fi
- _symlink="$1"
+ symlink="$1"
- if [ "$(maplink "$_symlink")" = "$(readlink "$_symlink")" ]; then
+ if [ "$(maplink "$symlink")" = "$(readlink "$symlink")" ]; then
return 0
else
return 1
@@ -349,7 +349,7 @@ check_symlinks_and_warn () {
# Call this function from a preinst script in the event $1 is "upgrade" or
# "install".
- #local errmsg symlink
+ local errmsg symlink
# validate arguments
if [ $# -lt 1 ]; then
@@ -359,25 +359,25 @@ check_symlinks_and_warn () {
fi
while [ -n "$1" ]; do
- _symlink="$1"
- if [ -L "$_symlink" ]; then
- if ! check_symlink "$_symlink"; then
- observe "$_symlink symbolic link points to wrong location" \
- "$(readlink "$_symlink"); removing"
- rm "$_symlink"
+ symlink="$1"
+ if [ -L "$symlink" ]; then
+ if ! check_symlink "$symlink"; then
+ observe "$symlink symbolic link points to wrong location" \
+ "$(readlink "$symlink"); removing"
+ rm "$symlink"
fi
- elif [ -e "$_symlink" ]; then
- _errmsg="$_symlink exists and is not a symbolic link; this package
cannot"
- _errmsg="$_errmsg be installed until this"
- if [ -f "$_symlink" ]; then
- _errmsg="$_errmsg file"
- elif [ -d "$_symlink" ]; then
- _errmsg="$_errmsg directory"
+ elif [ -e "$symlink" ]; then
+ errmsg="$symlink exists and is not a symbolic link; this package cannot"
+ errmsg="$errmsg be installed until this"
+ if [ -f "$symlink" ]; then
+ errmsg="$errmsg file"
+ elif [ -d "$symlink" ]; then
+ errmsg="$errmsg directory"
else
- _errmsg="$_errmsg thing"
+ errmsg="$errmsg thing"
fi
- _errmsg="$_errmsg is removed"
- die "$_errmsg"
+ errmsg="$errmsg is removed"
+ die "$errmsg"
fi
shift
done
@@ -390,7 +390,7 @@ check_symlinks_and_bomb () {
#
# Call this function from a postinst script.
- #local problem symlink
+ local problem symlink
# validate arguments
if [ $# -lt 1 ]; then
@@ -400,24 +400,24 @@ check_symlinks_and_bomb () {
fi
while [ -n "$1" ]; do
- _problem=
- _symlink="$1"
- if [ -L "$_symlink" ]; then
- if ! check_symlink "$_symlink"; then
- _problem=yes
- warn "$_symlink symbolic link points to wrong location" \
- "$(readlink "$_symlink")"
+ problem=
+ symlink="$1"
+ if [ -L "$symlink" ]; then
+ if ! check_symlink "$symlink"; then
+ problem=yes
+ warn "$symlink symbolic link points to wrong location" \
+ "$(readlink "$symlink")"
fi
- elif [ -e "$_symlink" ]; then
- _problem=yes
- warn "$_symlink is not a symbolic link"
+ elif [ -e "$symlink" ]; then
+ problem=yes
+ warn "$symlink is not a symbolic link"
else
- _problem=yes
- warn "$_symlink symbolic link does not exist"
+ problem=yes
+ warn "$symlink symbolic link does not exist"
fi
- if [ -n "$_problem" ]; then
- analyze_path "$_symlink" "$(readlink "$_symlink")"
- find_culprits "$_symlink"
+ if [ -n "$problem" ]; then
+ analyze_path "$symlink" "$(readlink "$symlink")"
+ find_culprits "$symlink"
die "bad symbolic links on system"
fi
shift
@@ -427,9 +427,9 @@ check_symlinks_and_bomb () {
font_update () {
# run $UPDATECMDS in $FONTDIRS
- #local dir cmd shortcmd x_font_dir_prefix
+ local dir cmd shortcmd x_font_dir_prefix
- _x_font_dir_prefix="/usr/share/fonts/X11"
+ x_font_dir_prefix="/usr/share/fonts/X11"
if [ -z "$UPDATECMDS" ]; then
usage_error "font_update() called but \$UPDATECMDS not set"
@@ -441,32 +441,32 @@ font_update () {
reject_unlikely_path_chars "$UPDATECMDS"
reject_unlikely_path_chars "$FONTDIRS"
- for _dir in $FONTDIRS; do
- if [ -d "$_x_font_dir_prefix/$_dir" ]; then
- for _cmd in $UPDATECMDS; do
- if which "$_cmd" > /dev/null 2>&1; then
- _shortcmd=${_cmd##*/}
- observe "running $_shortcmd in $_dir font directory"
- _cmd_opts=
- if [ "$_shortcmd" = "update-fonts-alias" ]; then
- _cmd_opts=--x11r7-layout
+ for dir in $FONTDIRS; do
+ if [ -d "$x_font_dir_prefix/$dir" ]; then
+ for cmd in $UPDATECMDS; do
+ if which "$cmd" > /dev/null 2>&1; then
+ shortcmd=${cmd##*/}
+ observe "running $shortcmd in $dir font directory"
+ cmd_opts=
+ if [ "$shortcmd" = "update-fonts-alias" ]; then
+ cmd_opts=--x11r7-layout
fi
- if [ "$_shortcmd" = "update-fonts-dir" ]; then
- _cmd_opts=--x11r7-layout
+ if [ "$shortcmd" = "update-fonts-dir" ]; then
+ cmd_opts=--x11r7-layout
fi
- if [ "$_shortcmd" = "update-fonts-scale" ]; then
- _cmd_opts=--x11r7-layout
+ if [ "$shortcmd" = "update-fonts-scale" ]; then
+ cmd_opts=--x11r7-layout
fi
- $_cmd $_cmd_opts $_dir || warn "$_cmd $_cmd_opts $_dir" \
+ $cmd $cmd_opts $dir || warn "$cmd $cmd_opts $dir" \
"failed; font directory data may not" \
"be up to date"
else
- warn "$_cmd not found; not updating corresponding $_dir font" \
+ warn "$cmd not found; not updating corresponding $dir font" \
"directory data"
fi
done
else
- warn "$_dir is not a directory; not updating font directory data"
+ warn "$dir is not a directory; not updating font directory data"
fi
done
}
@@ -485,7 +485,7 @@ remove_conffile_prepare () {
# version (or installed over a version removed-but-not-purged) prior to the
# one in which the conffile was obsoleted.
- #local conffile current_checksum
+ local conffile current_checksum
# validate arguments
if [ $# -lt 2 ]; then
@@ -494,19 +494,19 @@ remove_conffile_prepare () {
exit $SHELL_LIB_USAGE_ERROR
fi
- _conffile="$1"
+ conffile="$1"
shift
- # does the _conffile even exist?
- if [ -e "$_conffile" ]; then
+ # does the conffile even exist?
+ if [ -e "$conffile" ]; then
# calculate its checksum
- _current_checksum=$(md5sum < "$_conffile" | sed 's/[[:space:]].*//')
+ current_checksum=$(md5sum < "$conffile" | sed 's/[[:space:]].*//')
# compare it to each supplied checksum
while [ -n "$1" ]; do
- if [ "$_current_checksum" = "$1" ]; then
+ if [ "$current_checksum" = "$1" ]; then
# we found a match; move the confffile and stop looking
- observe "preparing obsolete conffile $_conffile for removal"
- mv "$_conffile" "$_conffile.$THIS_PACKAGE-tmp"
+ observe "preparing obsolete conffile $conffile for removal"
+ mv "$conffile" "$conffile.$THIS_PACKAGE-tmp"
break
fi
shift
@@ -553,7 +553,7 @@ remove_conffile_commit () {
# Call this function from a postinst script after having used
# remove_conffile_prepare() in the preinst.
- #local conffile
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
