xserver-xorg-video-apm: Changes to 'debian-experimental'
.cvsignore | 19 --
.gitignore | 20 ++
ChangeLog | 372 ++++++++++++++++++++++++++++++++++++++++++++------
debian/changelog | 36 ++++
debian/control | 13 +
debian/copyright | 3
debian/rules | 2
debian/xsfbs/xsfbs.mk | 36 ++--
debian/xsfbs/xsfbs.sh | 7
man/apm.man | 6
src/apm_cursor.c | 1
11 files changed, 422 insertions(+), 93 deletions(-)
New commits:
commit d260e60a3544045e784899787dc5184b274613b1
Author: Brice Goglin <bgoglin@debian.org>
Date: Thu Sep 13 08:36:06 2007 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index e2d142a..de1262b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xserver-xorg-video-apm (1:1.1.1-8) UNRELEASED; urgency=low
+xserver-xorg-video-apm (1:1.1.1-8) experimental; urgency=low
* Build against xserver 1.4.
* Add upstream URL to debian/copyright.
* Add myself to uploaders, and remove Branden with his permission.
- -- Brice Goglin <bgoglin@debian.org> Thu, 13 Sep 2007 08:34:59 +0200
+ -- Brice Goglin <bgoglin@debian.org> Thu, 13 Sep 2007 08:35:51 +0200
xserver-xorg-video-apm (1:1.1.1-7) unstable; urgency=low
commit 473e272044bc524d25797bad81b987dc19194a3e
Author: Brice Goglin <bgoglin@debian.org>
Date: Thu Sep 13 08:35:47 2007 +0200
Build against xserver 1.4 and fix various minor things
diff --git a/debian/changelog b/debian/changelog
index e694f63..e2d142a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-apm (1:1.1.1-8) UNRELEASED; urgency=low
+
+ * Build against xserver 1.4.
+ * Add upstream URL to debian/copyright.
+ * Add myself to uploaders, and remove Branden with his permission.
+
+ -- Brice Goglin <bgoglin@debian.org> Thu, 13 Sep 2007 08:34:59 +0200
+
xserver-xorg-video-apm (1:1.1.1-7) unstable; urgency=low
[ Timo Aaltonen ]
diff --git a/debian/control b/debian/control
index 43eab21..81f1a2a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: xserver-xorg-video-apm
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>
-Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.2.99.902), x11proto-xext-dev, x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev
+Uploaders: David Nusinow <dnusinow@debian.org>, Brice Goglin <bgoglin@debian.org>
+Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.4), x11proto-xext-dev, x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev
Standards-Version: 3.7.2
XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-apm
XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-apm.git
diff --git a/debian/copyright b/debian/copyright
index c513618..f6efdaf 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,3 +1,6 @@
+This package was downloaded from
+http://xorg.freedesktop.org/releases/individual/driver/
+
Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
commit 575efb7249d7cf194f07e45db17e601d9c259231
Author: Brice Goglin <bgoglin@debian.org>
Date: Wed Aug 29 09:36:00 2007 +0200
Do not call laptop-detect, let the only user call it directly
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 52473ca..a90ff7d 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -59,13 +59,6 @@ fi
ARCHITECTURE="$(dpkg --print-installation-architecture)"
-LAPTOP=""
-if [ -n "$(which laptop-detect)" ]; then
- if laptop-detect >/dev/null; then
- LAPTOP=true
- fi
-fi
-
if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then
RECONFIGURE="true"
else
commit 12a633f722a2ff9677728d1e2ae56767f804232a
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Thu Jul 12 16:06:22 2007 +0200
Fix "display the output of quilt push/pop".
Fix commit 16d97b30b91da02d5a3edc2b895cbd4a1995f62d to check the
return value of quilt, not the one of tee.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 5f13302..bfca7bb 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -147,9 +147,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; \
@@ -164,9 +166,11 @@ unpatch:
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) 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; \
commit e29b56820909668b062fdba72458ee9483a4ae44
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Mon Jul 9 21:50:47 2007 +0200
Minor fixes in the patching system.
* Fix debian/rules to not be confused by ~/.quiltrc or QUILT_PATCHES (as in #369920).
* Display which patches are applied and removed instead of just the first one (for #428090).
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 2930c1e..5f13302 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -21,6 +21,11 @@
# 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/
+
# Set up parameters for the upstream build environment.
# Determine (source) package name from Debian changelog.
@@ -140,9 +145,9 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
echo "Couldn't find quilt. Please install it or add it to the build-depends for this package."; \
exit 1; \
fi; \
- if quilt next >/dev/null 2>&1; then \
+ 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 2>&1 | tee $(STAMP_DIR)/log/patch; then \
echo "successful."; \
else \
echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \
@@ -159,7 +164,7 @@ unpatch:
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) pop -a -v 2>&1 | tee $(STAMP_DIR)/log/unpatch; then \
echo "successful."; \
else \
echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \
@@ -295,17 +300,17 @@ patch-audit: prepare unpatch
@echo -n "Auditing patches..."; \
>$(STAMP_DIR)/log/patch; \
FUZZY=; \
- while [ -n "$$(quilt next)" ]; do \
- RESULT=$$(quilt push -v | tee -a $(STAMP_DIR)/log/patch | grep ^Hunk | sed 's/^Hunk.*\(succeeded\|FAILED\).*/\1/');\
+ while [ -n "$$($(QUILT) next)" ]; do \
+ RESULT=$$($(QUILT) push -v | tee -a $(STAMP_DIR)/log/patch | grep ^Hunk | sed 's/^Hunk.*\(succeeded\|FAILED\).*/\1/');\
case "$$RESULT" in \
succeeded) \
- echo "fuzzy patch: $$(quilt top)" \
- | tee -a $(STAMP_DIR)/log/$$(quilt top); \
+ echo "fuzzy patch: $$($(QUILT) top)" \
+ | tee -a $(STAMP_DIR)/log/$$($(QUILT) top); \
FUZZY=yes; \
;; \
FAILED) \
- echo "broken patch: $$(quilt next)" \
- | tee -a $(STAMP_DIR)/log/$$(quilt next); \
+ echo "broken patch: $$($(QUILT) next)" \
+ | tee -a $(STAMP_DIR)/log/$$($(QUILT) next); \
exit 1; \
;; \
esac; \
commit 16d97b30b91da02d5a3edc2b895cbd4a1995f62d
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Mon Jul 9 19:06:05 2007 +0200
Fix displaying of patches applied by quilt.
As requested in bug #428090, we silence the output of quilt next
and display the output of quilt push/pop.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 63dde45..2930c1e 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -140,9 +140,9 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
echo "Couldn't find quilt. Please install it or add it to the build-depends for this package."; \
exit 1; \
fi; \
- if quilt next; then \
+ if quilt next >/dev/null 2>&1; then \
echo -n "Applying patches..."; \
- if quilt push -a -v >$(STAMP_DIR)/log/patch 2>&1; then \
+ if quilt push -a -v 2>&1 | tee $(STAMP_DIR)/log/patch; then \
echo "successful."; \
else \
echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \
@@ -159,7 +159,7 @@ unpatch:
rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \
if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \
- if quilt pop -a -v >$(STAMP_DIR)/log/unpatch 2>&1; then \
+ if quilt pop -a -v 2>&1 | tee $(STAMP_DIR)/log/unpatch; then \
echo "successful."; \
else \
echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \
commit 2c84aeb3192f4875c9d6056b22cc048c7ae1c41d
Author: Julien Cristau <jcristau@debian.org>
Date: Wed May 2 14:08:11 2007 +0200
Prepare changelog for upload.
diff --git a/debian/changelog b/debian/changelog
index db42e41..e694f63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-apm (1:1.1.1-7) UNRELEASED; urgency=low
+xserver-xorg-video-apm (1:1.1.1-7) unstable; urgency=low
[ Timo Aaltonen ]
* Replaces/Conflicts: xserver-xorg-driver-apm.
@@ -8,7 +8,7 @@ xserver-xorg-video-apm (1:1.1.1-7) UNRELEASED; urgency=low
* Bump Build-Depends: xserver-xorg-dev to >= 2:1.2.99.902
(needed to let xsfbs get access to serverminver).
- -- Brice Goglin <Brice.Goglin@ens-lyon.org> Sat, 28 Apr 2007 01:24:40 +0200
+ -- Julien Cristau <jcristau@debian.org> Wed, 02 May 2007 14:08:01 +0200
xserver-xorg-video-apm (1:1.1.1-6) unstable; urgency=low
commit d2dee8ac4c1aced8ff080428afa6d1509cd08ae6
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Sat Apr 28 01:26:43 2007 +0200
Update upstream changelog
diff --git a/ChangeLog b/ChangeLog
index 482b388..f654ad1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,67 +1,353 @@
-2006-04-07 Adam Jackson <ajax@freedesktop.org>
+commit 5c471bae5933a3e915d8aba2dbf7c4f68c3086b7
+Author: Adam Jackson <ajax@benzedrine.nwnk.net>
+Date: Thu Mar 1 17:46:28 2007 -0500
- * configure.ac:
- * src/apm_driver.c:
- Bump to 1.1.1 for Xv changes.
+ Remove useless mfb.h include.
-2006-04-07 Aaron Plattner <aplattner@nvidia.com>
+commit 3419d02714e4d10fa267b427af012de81c447a23
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Mar 1 10:40:39 2007 -0800
- * src/apm_video.c: (ReputImage), (PutImage):
- Add a DrawablePtr argument to the XV functions to pave the way for
- redirected video.
+ renamed: .cvsignore -> .gitignore
-2006-04-06 Adam Jackson <ajax@freedesktop.org>
+commit a56ca8d06b4286d8c4e4188e6056eff00a2209f5
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Mar 1 10:40:15 2007 -0800
- * configure.ac:
- * src/apm.h:
- * src/apm_dga.c:
- * src/apm_driver.c:
- Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
+ Replace references to XFree86/XF86Config in man page
- * src/apm_driver.c:
- Fix a missed VERSION -> APM_VERSION.
+commit 03e919c17ff7981bc2d8d03eaf0955adbb03a7b0
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+Date: Thu Dec 14 14:41:11 2006 -0500
-2005-12-26 Adam Jackson <ajax@freedesktop.org>
+ Naming change: Security*Access -> Dix*Access
- * src/apm_driver.c:
- Bug #5356: Don't redefine VERSION. (Tilman Sauerbeck)
+commit 392b8d45b08b9e87facb7f23cb2226fcd5062425
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Sat Apr 8 01:14:51 2006 +0000
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Bump to 1.1.1 for Xv changes.
- * configure.ac:
- Update package version for X11R7 release.
+commit 8f9172e2814b98b58fcc2e57cde720e10477b9c1
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date: Fri Apr 7 23:04:59 2006 +0000
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Add a DrawablePtr argument to the XV functions to pave the way for
+ redirected video.
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+commit 8541e7775e75cd6ce0fb69ddb8922b6032489441
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Fri Apr 7 18:55:04 2006 +0000
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Fix a missed VERSION -> APM_VERSION.
- * man/Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+commit cdfc8e010e230763250eb8b57d0106d20cf40080
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Fri Apr 7 18:34:37 2006 +0000
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+commit bf98a33803e6c74f6b0015add1271e7f843e5ac6
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Dec 26 18:18:04 2005 +0000
-2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Bug #5356: Don't redefine VERSION. (Tilman Sauerbeck)
- * configure.ac:
- Remove extraneous AC_MSG_RESULT.
+commit 25ac65dfd98ff8dcb948b07d8ca4e8124e40bf60
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Dec 21 02:29:59 2005 +0000
-2005-11-29 Adam Jackson <ajax@freedesktop.org>
+ Update package version for X11R7 release.
- * configure.ac:
- Only build dlloader modules by default.
+commit a4e41512842d5a91fa80e7ae5f071a156a538d9e
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Dec 19 16:25:52 2005 +0000
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Stub COPYING files
- * configure.ac:
- Update package version number for X11R7 RC2 release.
+commit 8f2f41847a4cfdca3ab3c166941780c9b83a3db0
+Author: Kevin E Martin <kem@kem.org>
+Date: Thu Dec 15 00:24:16 2005 +0000
-2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Update package version number for final X11R7 release candidate.
- * configure.ac:
- Update pkgcheck dependencies to work with separate build roots.
+commit 16ca24864892502829c37118d81c3bf9d7564069
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Dec 6 22:48:33 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit cab75d09cb977e9b946f1067c9e98e206c0e7d23
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Dec 3 05:49:32 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit d05d3cafeafbdb667706290b0a7bbc9eb4a38a8e
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Dec 2 02:16:07 2005 +0000
+
+ Remove extraneous AC_MSG_RESULT.
+
+commit 4775074a27eae9c379c0e26b226811f0f1fdb1e0
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Tue Nov 29 23:29:57 2005 +0000
+
+ Only build dlloader modules by default.
+
+commit ce3092b8cdff25d771765fd64d391b56017b5735
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Nov 28 22:04:08 2005 +0000
+
+ Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
+ update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
+
+commit c63cfdbe97d19ea664f23dda7fe07627325649ae
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Mon Nov 21 10:49:09 2005 +0000
+
+ Add .cvsignores for drivers.
+
+commit 459f7490f879ee4e7232e4653ce3f4cd03d04eb2
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Nov 9 21:15:14 2005 +0000
+
+ Update package version number for X11R7 RC2 release.
+
+commit 88d85d65fa2aeef87a03019dbe87bf4ff7b0c3ed
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Nov 1 15:08:52 2005 +0000
+
+ Update pkgcheck depedencies to work with separate build roots.
+
+commit 49db1e530eb8df10b2ac64b3cc9f7d368d09dc04
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Oct 19 02:48:02 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit e0feaa362f56ac5f82baaee90d0a5886e1e8efa9
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Oct 19 02:46:56 2005 +0000
+
+ lib/Xcomposite/Xcomposite.h
+ lib/Xft/Imakefile
+ lib/Xft/Xft.h Update library version numbers to match updated package
+ versions.
+ Update driver version numbers for RC1.
+
+commit 4660df3bf81e1da5beb3a32da7941ad880f1626c
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Tue Oct 18 00:01:52 2005 +0000
+
+ Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro
+ substitutions to work better with BSD make
+
+commit 1613d814b235f849fb2ddc8655a25f02bbc3dda0
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Oct 17 22:57:32 2005 +0000
+
+ More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead
+ of indirectly
+
+commit a7990a8eb38e547ef6f277b6f8a55fd653649424
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Oct 17 00:09:01 2005 +0000
+
+ Use sed & cpp to substitute variables in driver man pages
+
+commit 3134bbad0f248868ba3cfeae8b5afe3c295d7aa2
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Tue Oct 4 20:01:03 2005 +0000
+
+ Check in generated README files
+
+commit 7b90aace06d6e4abaf81073f49604f5068a60ee8
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Mon Oct 3 21:22:06 2005 +0000
+
+ - For all drivers that have a <driver>.sgml file, add code in their build
+ system to build the README file at make dist time
+ - in util/macros/xorg-macros.m4, add a new XORG_CHECK_LINUXDOC macro that
+ will check if the required tools and files exist, and if so set a
+ conditional.
+ - util/modular/symlink.sh
+ - Link all the <driver>.sgml to xf86-video-<driver>/README.sgml
+ - Add all the README.<driver> to the list of excluded files
+ - xc/programs/Xserver/hw/xfree86/doc/sgml/SiS.sgml: Various changes to make
+ it spew less warnings when the text file is built.
+
+commit 6b16d0c1fc57da0f3319791e9b928d0f3fb673d1
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Tue Sep 27 20:53:19 2005 +0000
+
+ Update build system for apm, chips, cirrus, glint, i740, mga, neomagic,
+ newport to accomodate various new documentation and utility files.
+
+commit 1f46a5a39c128aa885b462af178370f43d7ad56e
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Sun Aug 21 17:10:05 2005 +0000
+
+ Make building of Rush optional, bump to 1.0.1.
+
+commit 9c77cb886ab91770f0788caadead23f0a1f5e851
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Thu Aug 18 09:03:45 2005 +0000
+
+ Update autogen.sh to one that does objdir != srcdir.
+
+commit 44aca00a9e046b4fb7fa4eb4f00e76ad8b9a2b9a
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Wed Aug 10 14:07:24 2005 +0000
+
+ Don\'t lose existing CFLAGS in all the input drivers and some of the video
+ drivers
+
+commit 59a6546a4fd64bceed54f94ee2aea2c2981de775
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Jul 29 21:22:42 2005 +0000
+
+ Various changes preparing packages for RC0:
+ - Verify and update package version numbers as needed
+ - Implement versioning scheme
+ - Change bug address to point to bugzilla bug entry form
+ - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+ reenable it)
+ - Fix makedepend to use pkgconfig and pass distcheck
+ - Update build script to build macros first
+ - Update modular Xorg version
+
+commit 180b7881a91ebce19e26d192fd287d5477003d11
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Wed Jul 13 22:00:46 2005 +0000
+
+ Engang til for prins Knud
+
+commit c76f0d6449b380ba5d2a042c8541a522f014cc8c
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Wed Jul 13 18:07:44 2005 +0000
+
+ Add accidentally left out PKG_CHECK_MODULES
+
+commit f46d068d8f05dae035c1e4c9da1eb32d72538cc0
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Wed Jul 13 17:33:47 2005 +0000
+
+ Build system for apm video driver
+
+commit 5141e20bdd1281d340136f86969f75aa6f8afb9c
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Jul 11 02:29:44 2005 +0000
+
+ Prep for modular builds by adding guarded #include "config.h" everywhere.
+
+commit 75d8d467221fa68e1fde58b7f9456f6a6dc84d68
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Sun Jul 3 08:53:43 2005 +0000
+
+ Change <X11/misc.h> and <X11/os.h> to "misc.h" and "os.h".
+
+commit 3a78bd6437927963d996866b6ad627e02337f6dd
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Fri Jul 1 22:43:11 2005 +0000
+
+ Change all misc.h and os.h references to <X11/foo.h>.
+
+commit 3c5799ac5f6f685dec989b15ac65e02b12a00288
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Sat Jun 25 21:16:52 2005 +0000
+
+ Bug #3626: _X_EXPORT tags for video and input drivers.
+
+commit bdbc205e36dbceb1c9c21e20dd9d2e4bf828989e
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Wed Apr 20 12:25:22 2005 +0000
+
+ Fix includes right throughout the Xserver tree:
+ change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h;
+ change "foo.h", "extensions/foo.h" and "X11/foo.h" to
+ <X11/extensions/foo.h> for extension headers, e.g. Xv.h;
+ change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files.
+
+commit 40912339a041c7193f1134befc94d62c5c3bd75b
+Author: Markus Kuhn <Markus.Kuhn@cl.cam.ac.uk>
+Date: Sat Dec 4 00:42:59 2004 +0000
+
+ Encoding of numerous files changed to UTF-8
+
+commit 3032cb6cda0e6527cf40fba692e2e5782858445a
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Tue Aug 3 02:44:20 2004 +0000
+
+ Bug #962: Remove LoaderSymbol calls introduced by the dlloader work so
+ DoLoadableServer NO builds work again.
+
+commit 8b0f17920a54bdf3d54c0d07b4293d617d2ff964
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Fri Jul 30 20:30:51 2004 +0000
+
+ Bug #400 (partial): Driver fixes for the dlloader. When using dlloader, all
+ framebuffer formats except cfb and the overlay modes should work, and
+ r128 and radeon need to be loaded from the ati driver (both issues to
+ be fixed soon). Tested on i740, s3virge, mach64, tdfx, vesa, and vga
+ drivers. elfloader users shouldn't be affected.
+
+commit 5f64cbc462a1a841bebe1fa5bae57560a8def42f
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Wed Jun 16 09:22:41 2004 +0000
+
+ DRI XFree86-4_3_99_12-merge import
+
+commit 6003db3c2a88658f9254f1c346ad1960250b30b2
+Author: Egbert Eich <eich@suse.de>
+Date: Fri Apr 23 19:25:03 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 07687be411485ed9af8a296a3956ca7c283a4e0f
+Author: Egbert Eich <eich@suse.de>
+Date: Sun Mar 14 08:33:16 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 978cfe424df18a4571ec59cc4b8ffef6438a1bd7
+Author: Egbert Eich <eich@suse.de>
+Date: Wed Mar 3 12:12:15 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 8972243cd2834a918149f0d7a1c5d5b06765f98e
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 13:35:46 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit f4c9cb03041b727c3223f751c88d86c29c3f114d
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 09:23:14 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit bd1b28d04cdc01e0f08f9b67f515beea3f8c4fd1
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Tue Nov 25 19:28:34 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit 7b32f79c87e4acaf95017c9ff075285f3e332704
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:55 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 696e90e916d6f0db4057826115d74c5d968eb5e7
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:55 2003 +0000
+
+ Initial revision
+
+commit 4a50a1da2ff5601a5721d1a06a23c7f75db958c4
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 15:54:49 2003 +0000
+
+ R6.6 is the Xorg base-line
commit cbe0e3c24b4d532340ebda1636989d2e6ef148c9
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Sat Apr 28 01:24:55 2007 +0200
Miscellaneous fixed in debian/control and debian/rules.
* Install the upstream changelog.
* Bump Build-Depends: xserver-xorg-dev to >= 2:1.2.99.902
(needed to let xsfbs get access to serverminver).
diff --git a/debian/changelog b/debian/changelog
index 1dae1fd..db42e41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
xserver-xorg-video-apm (1:1.1.1-7) UNRELEASED; urgency=low
+ [ Timo Aaltonen ]
* Replaces/Conflicts: xserver-xorg-driver-apm.
- -- Timo Aaltonen <tjaalton@cc.hut.fi> Tue, 24 Apr 2007 12:46:13 +0300
+ [ Brice Goglin ]
+ * Install the upstream changelog.
+ * Bump Build-Depends: xserver-xorg-dev to >= 2:1.2.99.902
+ (needed to let xsfbs get access to serverminver).
+
+ -- Brice Goglin <Brice.Goglin@ens-lyon.org> Sat, 28 Apr 2007 01:24:40 +0200
xserver-xorg-video-apm (1:1.1.1-6) unstable; urgency=low
diff --git a/debian/control b/debian/control
index ffc3ba3..43eab21 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 <dnusinow@debian.org>, Branden Robinson <branden@debian.org>
-Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.2.0), x11proto-xext-dev, x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev
+Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.2.99.902), x11proto-xext-dev, x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev
Standards-Version: 3.7.2
XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-apm
XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-apm.git
diff --git a/debian/rules b/debian/rules
index dae2ba5..f886e8f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -71,7 +71,7 @@ binary-arch: build install serverabi
dh_testroot
dh_installdocs
- dh_installchangelogs
+ dh_installchangelogs ChangeLog
dh_install --sourcedir=debian/tmp --list-missing --exclude=apm_drv.la --exclude=usr/share/man/man4
dh_installman
dh_link
commit 75fd7a13949466d5434a6fe12c91ca4c1273b65e
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date: Tue Apr 24 12:49:59 2007 +0300
Replaces/Conflicts: xserver-xorg-driver-apm.
diff --git a/debian/changelog b/debian/changelog
index 94a1e17..1dae1fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-apm (1:1.1.1-7) UNRELEASED; urgency=low
+
+ * Replaces/Conflicts: xserver-xorg-driver-apm.
+
+ -- Timo Aaltonen <tjaalton@cc.hut.fi> Tue, 24 Apr 2007 12:46:13 +0300
+
xserver-xorg-video-apm (1:1.1.1-6) unstable; urgency=low
[ Julien Cristau ]
diff --git a/debian/control b/debian/control
index 224a1a7..ffc3ba3 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,8 @@ Package: xserver-xorg-video-apm
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
Provides: ${xviddriver:Provides}
-Replaces: xserver-xorg (<< 6.8.2-35)
+Replaces: xserver-xorg (<< 6.8.2-35), xserver-xorg-driver-apm
+Conflicts: xserver-xorg-driver-apm
Description: X.Org X server -- APM display driver
This package provides the driver for the Alliance Pro Motion family
of video cards; specifically, the 6420, 6422, AT24, AT25, and AT3D
commit 456970b34fa3fa41b06809157a20274f981ae72e
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Tue Apr 24 01:13:06 2007 +0200
Add a link to www.X.org and a reference to the xf86-video-apm module in the long description.
diff --git a/debian/changelog b/debian/changelog
index feebfa6..94a1e17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
xserver-xorg-video-apm (1:1.1.1-6) unstable; urgency=low
+ [ Julien Cristau ]
* Add XS-Vcs-*.
* Remove Fabio from Uploaders with his permission.
* Drop obsolete CVS information from the description.
@@ -7,7 +8,11 @@ xserver-xorg-video-apm (1:1.1.1-6) unstable; urgency=low
5c471bae5933a3e915d8aba2dbf7c4f68c3086b7).
* Upload to unstable.
- -- Julien Cristau <jcristau@debian.org> Mon, 23 Apr 2007 05:45:11 +0200
+ [ Brice Goglin ]
+ * Add a link to www.X.org and a reference to the xf86-video-apm
+ module in the long description.
+
+ -- Brice Goglin <Brice.Goglin@ens-lyon.org> Tue, 24 Apr 2007 01:12:23 +0200
xserver-xorg-video-apm (1:1.1.1-5) experimental; urgency=low
diff --git a/debian/control b/debian/control
index d25cf58..224a1a7 100644
--- a/debian/control
+++ b/debian/control
@@ -19,5 +19,8 @@ Description: X.Org X server -- APM display driver
cards.
.
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-apm driver module.
commit 78f882a1fe83c160b66bc7ba4a1cba23e76f5c0e
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Apr 23 05:46:54 2007 +0200
Mention merge with upstream master in changelog.
diff --git a/debian/changelog b/debian/changelog
index eb1c430..feebfa6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,9 +3,11 @@ xserver-xorg-video-apm (1:1.1.1-6) unstable; urgency=low
* Add XS-Vcs-*.
* Remove Fabio from Uploaders with his permission.
* Drop obsolete CVS information from the description.
+ * Pull some more changesets from upstream git (up to
+ 5c471bae5933a3e915d8aba2dbf7c4f68c3086b7).
* Upload to unstable.
- -- Julien Cristau <jcristau@debian.org> Mon, 23 Apr 2007 05:33:25 +0200
+ -- Julien Cristau <jcristau@debian.org> Mon, 23 Apr 2007 05:45:11 +0200
xserver-xorg-video-apm (1:1.1.1-5) experimental; urgency=low
commit 0ebb5e5c3f9bd150dd0ca5eb47c669229b1a11a9
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Apr 23 05:33:43 2007 +0200
Prepare changelog for upload.
diff --git a/debian/changelog b/debian/changelog
index 04e440f..eb1c430 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
-xserver-xorg-video-apm (1:1.1.1-6) UNRELEASED; urgency=low
+xserver-xorg-video-apm (1:1.1.1-6) unstable; urgency=low
* Add XS-Vcs-*.
* Remove Fabio from Uploaders with his permission.
* Drop obsolete CVS information from the description.
+ * Upload to unstable.
- -- Julien Cristau <jcristau@debian.org> Mon, 23 Apr 2007 05:16:12 +0200
+ -- Julien Cristau <jcristau@debian.org> Mon, 23 Apr 2007 05:33:25 +0200
xserver-xorg-video-apm (1:1.1.1-5) experimental; urgency=low
commit 7f43f24909c9d1c133c094fd123e5757853b8a6b
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Apr 23 05:31:58 2007 +0200
Various debian/control cleanups.
* Add XS-Vcs-*.
* Remove Fabio from Uploaders with his permission.
* Drop obsolete CVS information from the description.
diff --git a/debian/changelog b/debian/changelog
index b50502d..04e440f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-apm (1:1.1.1-6) UNRELEASED; urgency=low
+
+ * Add XS-Vcs-*.
+ * Remove Fabio from Uploaders with his permission.
+ * Drop obsolete CVS information from the description.
+
+ -- Julien Cristau <jcristau@debian.org> Mon, 23 Apr 2007 05:16:12 +0200
+
xserver-xorg-video-apm (1:1.1.1-5) experimental; urgency=low
* Pull minor updates from upstream
diff --git a/debian/control b/debian/control
index 0d1b069..d25cf58 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,11 @@ Source: xserver-xorg-video-apm
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Fabio M. Di Nitto <fabbione@fabbione.net>
+Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>
Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.2.0), x11proto-xext-dev, x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev
Standards-Version: 3.7.2
+XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-apm
+XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-apm.git
Package: xserver-xorg-video-apm
Architecture: any
@@ -19,6 +21,3 @@ Description: X.Org X server -- APM display driver
More information about X.Org can be found at:
<URL:http://xorg.freedesktop.org>
<URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
- .
- This module can be found as the module 'driver/xf86-video-apm' at
- :pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg
commit 271778bd6338575afa3e4ae7f614f38cdff8e2fb
Author: Branden Robinson <branden@sisyphus.(none)>
Date: Thu Apr 12 23:18:32 2007 -0400
Test for existence of debian/patches directory before creating a symlink to it.
This prevents packages that apply no patches from ending up with a broken
symlink in them.
Remove SVN keyword.
Update copyright notice.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index d88c6db..63dde45 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -1,11 +1,10 @@
#!/usr/bin/make -f
-# $Id$
-# Debian rules file for xorg-x11 source package
+# Debian X Strike Force Build System (XSFBS): Make portion
# Copyright 1996 Stephen Early
# Copyright 1997 Mark Eichin
-# Copyright 1998-2005 Branden Robinson
+# Copyright 1998-2005, 2007 Branden Robinson
# Copyright 2005 David Nusinow
#
# Licensed under the GNU General Public License, version 2. See the file
@@ -127,7 +126,7 @@ $(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir
if [ ! -e $(STAMP_DIR)/log ]; then \
mkdir $(STAMP_DIR)/log; \
fi; \
- if [ ! -e patches ]; then \
+ if [ -e debian/patches ] && [ ! -e patches ]; then \
ln -s debian/patches patches; \
fi; \
>$@
commit 72811b4cede7275a35d36b44bcb5f431a8aa0133
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Mar 2 20:28:15 2007 +0100
Fix copy/paste typo in the input driver provides.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 0343aec..d88c6db 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -359,7 +359,7 @@ 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-video-$(INPUTABI)
+INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI)
ifeq ($(PACKAGE),)
PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
endif
commit 5c471bae5933a3e915d8aba2dbf7c4f68c3086b7
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Mar 1 17:46:28 2007 -0500
Remove useless mfb.h include.
diff --git a/src/apm_cursor.c b/src/apm_cursor.c
index ea21ac2..14dbc62 100644
--- a/src/apm_cursor.c
+++ b/src/apm_cursor.c
@@ -13,7 +13,6 @@
Reply to: