Bug#557762: xserver-xorg-core: high CPU usage when playing music with Amarok

2009-11-24 Thread Marcus Better 
Package: xserver-xorg-core
Version: 2:1.6.5-1
Severity: normal

When I play MP3 music with Amarok, the X.org CPU usage jumps up to
over 70%. As soon as I stop or pause Amarok, it goes back to the
normal level (under 10%).

Not sure if any of these could be related:
  https://bugs.launchpad.net/ubuntu/+source/alsa-lib/+bug/273645
  https://bugs.kde.org/show_bug.cgi?id=180335

I have KDE4 4:4.3.2-1, phonon 4:4.6.0~rc1-1, phonon-backend-xine
4:4.3.1-5, libxine1 1.1.16.3-2, libasound2 1.0.21a-1, amarok 2.2.1-2.

Here is an oprofile output (from opcontrol --separate=lib
--no-vmlinux --image=/usr/bin/Xorg):

CPU: Core 2, speed 800 MHz (estimated)
Counted CPU_CLK_UNHALTED events (Clock cycles when not halted) with a unit mask 
of 0x00 (Unhalted core cycles) count 10
samples  %image name   app name symbol name
159013   84.7455  Xorg Xorg GetXIDRange
8315  4.4315  i965_dri.so  Xorg 
/usr/lib/dri/i965_dri.so
3947  2.1035  libc-2.10.1.so (deleted) Xorg 
/lib/libc-2.10.1.so (deleted)
2090  1.1139  libdrm_intel.so.1.0.0Xorg 
/usr/lib/libdrm_intel.so.1.0.0
1732  0.9231  libpthread-2.10.1.so (deleted) Xorg 
/lib/libpthread-2.10.1.so (deleted)
1128  0.6012  libglx.soXorg 
__glXGetProtocolSizeData
1035  0.5516  libglx.soXorg 
__glXGetProtocolDecodeFunction
527   0.2809  libpixman-1.so.0.16.2Xorg 
/usr/lib/libpixman-1.so.0.16.2
480   0.2558  Xorg Xorg 
dixLookupResourceByClass
476   0.2537  Xorg Xorg 
dixLookupPrivate
446   0.2377  Xorg Xorg Hash
404   0.2153  Xorg Xorg 
ProcTranslateCoords
403   0.2148  Xorg Xorg 
dixLookupResourceByType
350   0.1865  Xorg Xorg 
ReadRequestFromClient
264   0.1407  libglx.soXorg 
__glXDisp_Render
230   0.1226  Xorg Xorg Dispatch
179   0.0954  Xorg Xorg 
WaitForSomething
164   0.0874  Xorg Xorg DevHasCursor
157   0.0837  Xorg Xorg FreeResource
145   0.0773  Xorg Xorg XaceHook
143   0.0762  Xorg Xorg 
WriteToClient
143   0.0762  libdri2.so   Xorg 
allocate_or_reuse_buffer
140   0.0746  Xorg Xorg 
damageRegionAppend
138   0.0735  Xorg Xorg 
CallCallbacks
131   0.0698  intel_drv.so Xorg 
i830_uxa_solid
126   0.0672  Xorg Xorg FlushClient
124   0.0661  libdri2.so   Xorg 
do_get_buffers
120   0.0640  intel_drv.so Xorg 
i830_uxa_prepare_solid
117   0.0624  librt-2.10.1.so (deleted) Xorg 
/lib/librt-2.10.1.so (deleted)
102   0.0544  Xorg Xorg 
FlushAllOutput
(...truncated the rest...)
 

-- Package-specific info: /var/lib/x11/X.roster does not exist.

/var/lib/x11/X.md5sum does not exist.

X server symlink status:
lrwxrwxrwx 1 root root 13 Apr 28  2008 /etc/X11/X -> /usr/bin/Xorg
-rwxr-xr-x 1 root root 1868064 Oct 13 11:43 /usr/bin/Xorg

/var/lib/x11/xorg.conf.roster does not exist.

VGA-compatible devices on PCI bus:
00:02.0 VGA compatible controller: Intel Corporation Mobile GM965/GL960 
Integrated Graphics Controller (rev 0c)

/var/lib/x11/xorg.conf.md5sum does not exist.

Xorg X server configuration file status:
-rw-r--r-- 1 root root 1822 Jun  4 11:12 /etc/X11/xorg.conf

Contents of /etc/X11/xorg.conf:
# xorg.conf (xorg X Window System server configuration file)
#
# This file was generated by dexconf, the Debian X Configuration tool, using
# values from the debconf database.
#
# Edit this file with caution, and see the xorg.conf manual page.
# (Type "man xorg.conf" at the shell prompt.)
#
# This file is automatically updated on xserver-xorg package upgrades *only*
# if it has not been modified since the last upgrade of the xserver-xorg
# package.
#
# If you have edited this file but would like it to be automatically updated
# again, run the following command:
#   sudo dpkg-reconfigure -phigh xserver-xorg

Section "ServerFlags"
Option "DontZap" "off"
EndSection

Section "Extensions"
Option "Composite" "enable"
EndSection

Section "Device"
Identifier  "Configured Video Device

libxt: Changes to 'debian-unstable'

2009-11-24 Thread Timo Aaltonen 
 debian/xsfbs/xsfbs.mk |   21 
 debian/xsfbs/xsfbs.sh |  233 --
 2 files changed, 3 insertions(+), 251 deletions(-)

New commits:
commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau 
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 
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 
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 5693792171d885769e58d053c08b11acd12a
Author: Julien Cristau 
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 
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 \"

libxtst: Changes to 'upstream-unstable'

2009-11-24 Thread Timo Aaltonen 
 .gitignore  |   11 ++
 Makefile.am |6 -
 README  |   24 +
 configure.ac|   17 +--
 include/X11/extensions/XTest.h  |  146 +++
 include/X11/extensions/record.h |  183 
 man/.gitignore  |7 -
 man/Makefile.am |   66 --
 man/XTest.xml   |   16 +--
 src/.gitignore  |6 -
 src/Makefile.am |   10 +-
 src/XRecord.c   |   81 +
 src/XTest.c |  109 ++-
 13 files changed, 489 insertions(+), 193 deletions(-)

New commits:
commit ddc11c4ef1bd0e6c970630dea74f54bb2b0ea893
Author: Peter Hutterer 
Date:   Mon Oct 5 11:38:38 2009 +1000

libXtst 1.1.0

Signed-off-by: Peter Hutterer 

diff --git a/configure.ac b/configure.ac
index 8b624d4..19d167c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.57])
 
-AC_INIT(libXtst, 1.0.99.2, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXtst)
+AC_INIT(libXtst, 1.1.0, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXtst)
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 

commit e3d74ecf1a3a7adfeafca8cd02c1da82e95d5eaf
Author: Peter Hutterer 
Date:   Mon Oct 5 11:40:53 2009 +1000

Require libXext 1.0.99.4

libXext 1.0.99.1 up to including 1.0.99.3 had the XTest.h header which is
now in this module.

Signed-off-by: Peter Hutterer 

diff --git a/configure.ac b/configure.ac
index aed19a0..8b624d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,7 +44,7 @@ AC_PATH_PROG([XMLTO], [xmlto])
 AM_CONDITIONAL([HAVE_XMLTO], [test "x$XMLTO" != "x"])
 
 # Check for dependencies
-PKG_CHECK_MODULES(XTST, x11 xext xi [recordproto >= 1.13.99.1] [xextproto >= 
7.0.99.3] inputproto)
+PKG_CHECK_MODULES(XTST, x11 [xext >= 1.0.99.4] xi [recordproto >= 1.13.99.1] 
[xextproto >= 7.0.99.3] inputproto)
 XTST_CFLAGS="$CWARNFLAGS $XTST_CFLAGS"
 AC_SUBST(XTST_CFLAGS)
 AC_SUBST(XTST_LIBS)

commit 7a9b269ed83c106265896373120603b9c06997f3
Author: Peter Hutterer 
Date:   Mon Oct 5 10:38:34 2009 +1000

Require macros 1.3 for XORG_DEFAULT_OPTIONS

Signed-off-by: Peter Hutterer 

diff --git a/configure.ac b/configure.ac
index b090f16..aed19a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,15 +27,15 @@ AC_INIT(libXtst, 1.0.99.2, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=x
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 
-# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or 
later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.2)
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or 
later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
 AM_CONFIG_HEADER(config.h)
 
 # Check for progs
 AC_PROG_CC
 AC_PROG_LIBTOOL
-XORG_CWARNFLAGS
+XORG_DEFAULT_OPTIONS
 
 # Check for xmlto for man page conversion 
 # (only needed by people building tarballs)
@@ -54,10 +54,6 @@ XORG_WITH_LINT
 XORG_LINT_LIBRARY([Xtst])
 LINT_FLAGS="${LINT_FLAGS} ${XTST_CFLAGS}"
 
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
-
 AC_OUTPUT([Makefile
   man/Makefile
   src/Makefile

commit 9f727168f561c76c5ae6c3115282ac803172e9f8
Author: Peter Hutterer 
Date:   Tue Aug 25 14:09:47 2009 +1000

Version bump: 1.0.99.2

Signed-off-by: Peter Hutterer 

diff --git a/configure.ac b/configure.ac
index 2287275..b090f16 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.57])
 
-AC_INIT(libXtst, 1.0.99.1, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXtst)
+AC_INIT(libXtst, 1.0.99.2, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXtst)
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 

commit 527759ae93ceaafca670995ab97545112f89bfbc
Author: Peter Hutterer 
Date:   Tue Aug 18 11:12:37 2009 +1000

Include recordproto.h instead of recordstr.h

diff --git a/src/XRecord.c b/src/XRecord.c
index fe733ff..a0f7c52 100644
--- a/src/XRecord.c
+++ b/src/XRecord.c
@@ -59,7 +59,7 @@ from The Open Group.
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 
 static XExtensionInfo _xrecord_info_data;

commit 849fa907e129575831fbd3fa69249ff843413fd5
Author: Peter Hutterer 
Date:   Fri Aug 14 14:15:48 2009 +1000

Move record headers to here.

Signed-off-by: Peter Hutterer 

diff --git a/configure.ac b/configure.ac
index f37b120..2287275 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,7 +44,7 @@ AC_PATH_PROG([XMLTO], [xmlto])
 AM_CONDITIONAL([HAVE_XMLTO], [test "x$XMLTO" != "x"])
 
 # Check for dependencies
-PKG_CH

libxtst: Changes to 'debian-unstable'

2009-11-24 Thread Timo Aaltonen 
 .gitignore  |   11 
 ChangeLog   |  405 
 INSTALL |  234 
 Makefile.am |6 
 Makefile.in |  716 -
 README  |   24 
 aclocal.m4  | 8126 ---
 config.guess| 1516 --
 config.h.in |   64 
 config.sub  | 1626 ---
 configure   |21373 
 configure.ac|   17 
 debian/changelog|   32 
 debian/control  |   31 
 debian/libxtst-dev.install  |1 
 debian/rules|   21 
 debian/xsfbs/xsfbs.mk   |   21 
 debian/xsfbs/xsfbs.sh   |  233 
 depcomp |  584 -
 include/X11/extensions/XTest.h  |  146 
 include/X11/extensions/record.h |  183 
 install-sh  |  507 
 ltmain.sh   | 6938 
 man/.gitignore  |7 
 man/Makefile.am |   66 
 man/Makefile.in |  451 
 man/XTest.xml   |   16 
 missing |  367 
 mkinstalldirs   |  161 
 src/.gitignore  |6 
 src/Makefile.am |   10 
 src/Makefile.in |  497 
 src/XRecord.c   |   81 
 src/XTest.c |  109 
 34 files changed, 967 insertions(+), 43619 deletions(-)

New commits:
commit a89f1a90d1a8f86da80cafd289884869e35f660b
Author: Timo Aaltonen 
Date:   Tue Nov 24 11:49:34 2009 +0200

Bump the build-dep on libxext-dev (>= 1:1.0.99.4).

diff --git a/debian/changelog b/debian/changelog
index 18130c4..9b742b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libxtst (2:1.1.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Bump the build-dep on xutils-dev (>= 1:7.5~1).
+  * Bump the build-dep on libxext-dev (>= 1:1.0.99.4).
 
  -- Timo Aaltonen   Tue, 24 Nov 2009 11:42:26 +0200
 
diff --git a/debian/control b/debian/control
index 619578a..be61b15 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow , Andres Salomon 
= 5.0.0),
  libx11-dev (>= 2:0.99.3),
- libxext-dev (>= 1:0.99.2),
+ libxext-dev (>= 1:1.0.99.4),
  libxi-dev,
  x11proto-record-dev (>= 1.13.99.1),
  x11proto-xext-dev (>= 7.0.99.3),

commit 4f88900566f58a0e9d279140679de27356a677a2
Author: Timo Aaltonen 
Date:   Tue Nov 24 11:47:41 2009 +0200

Bump the build-dep on xutils-dev (>= 1:7.5~1).

diff --git a/debian/changelog b/debian/changelog
index 8879870..18130c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libxtst (2:1.1.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Bump the build-dep on xutils-dev (>= 1:7.5~1).
 
  -- Timo Aaltonen   Tue, 24 Nov 2009 11:42:26 +0200
 
diff --git a/debian/control b/debian/control
index 9d61b2e..619578a 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
  xmlto,
  automake,
  libtool,
- xutils-dev,
+ xutils-dev (>= 1:7.5~1),
  quilt
 Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxtst

commit 3ef62391e0aa4a40a6053e6aef678ed37646e2fa
Author: Timo Aaltonen 
Date:   Tue Nov 24 11:46:56 2009 +0200

Update the changelogs.

diff --git a/ChangeLog b/ChangeLog
index 759170f..3778c3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+commit ddc11c4ef1bd0e6c970630dea74f54bb2b0ea893
+Author: Peter Hutterer 
+Date:   Mon Oct 5 11:38:38 2009 +1000
+
+libXtst 1.1.0
+
+Signed-off-by: Peter Hutterer 
+
+commit e3d74ecf1a3a7adfeafca8cd02c1da82e95d5eaf
+Author: Peter Hutterer 
+Date:   Mon Oct 5 11:40:53 2009 +1000
+
+Require libXext 1.0.99.4
+
+libXext 1.0.99.1 up to including 1.0.99.3 had the XTest.h header which is
+now in this module.
+
+Signed-off-by: Peter Hutterer 
+
+commit 7a9b269ed83c106265896373120603b9c06997f3
+Author: Peter Hutterer 
+Date:   Mon Oct 5 10:38:34 2009 +1000
+
+Require macros 1.3 for XORG_DEFAULT_OPTIONS
+
+Signed-off-by: Peter Hutterer 
+
 commit 9f727168f561c76c5ae6c3115282ac803172e9f8
 Author: Peter Hutterer 
 Date:   Tue Aug 25 14:09:47 2009 +1000
diff --git a/debian/changelog b/debian/changelog
index c29cb4f..8879870 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxtst (2:1.1.0-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Timo Aaltonen   Tue, 24 Nov 2009 11:42:26 +0200
+
 libxtst (2:1.0.99.2-2) experimental; urgency=low
 
   * Brown paper bag upload.

commit ddc11c4ef1bd0e6c970630dea74f54bb2b0ea893
Author: Peter Hutterer 
Date:   Mon Oct 5 11:38:38 2009 +1000

libXtst 1.1.0

Signed-off-by: Peter Hutterer 

diff --git a/configure.ac b/configure.ac
index 8b624d4..19d167c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ dnl Process this file with autoconf to create con

libxv: Changes to 'debian-unstable'

2009-11-24 Thread Timo Aaltonen 
 .gitignore |9 
 ChangeLog  |   70 
 Makefile.am|4 
 Makefile.in|  725 -
 README |   25 
 aclocal.m4 | 8207 -
 config.guess   | 1526 --
 config.h.in|   64 
 config.sub | 1658 --
 configure  |21808 -
 configure.ac   |   15 
 debian/changelog   |   11 
 debian/control |   11 
 debian/rules   |   17 
 depcomp|  589 
 include/.gitignore |2 
 include/Makefile.in|  503 
 include/X11/.gitignore |2 
 include/X11/Makefile.in|  503 
 include/X11/extensions/.gitignore  |2 
 include/X11/extensions/Makefile.in |  422 
 include/X11/extensions/Xvlib.h |5 
 install-sh |  519 
 ltmain.sh  | 6964 ---
 man/.gitignore |3 
 man/Makefile.am|   13 
 man/Makefile.in|  441 
 man/Xv.man |  125 
 man/XvCreateImage.man  |  103 
 man/XvFreeAdaptorInfo.man  |   32 
 man/XvFreeEncodingInfo.man |   31 
 man/XvGetPortAttribute.man |   92 
 man/XvGetStill.man |  105 
 man/XvGetVideo.man |  103 
 man/XvGrabPort.man |   47 
 man/XvListImageFormats.man |  107 
 man/XvPortNotify.man   |   22 
 man/XvPutImage.man |   77 
 man/XvPutStill.man |   72 
 man/XvPutVideo.man |   80 
 man/XvQueryAdaptors.man|   43 
 man/XvQueryBestSize.man|   43 
 man/XvQueryEncodings.man   |   52 
 man/XvQueryExtension.man   |   45 
 man/XvQueryPortAttributes.man  |   55 
 man/XvSelectPortNotify.man |   46 
 man/XvSelectVideoNotify.man|   37 
 man/XvSetPortAttribute.man |  102 
 man/XvShmCreateImage.man   |1 
 man/XvShmPutImage.man  |1 
 man/XvStopVideo.man|   45 
 man/XvUngrabPort.man   |   37 
 man/XvVideoNotify.man  |   32 
 man/xv-library-v2.2.txt|  300 
 missing|  367 
 mkinstalldirs  |  161 
 src/.gitignore |6 
 src/Makefile.am|7 
 src/Makefile.in|  525 
 59 files changed, 1471 insertions(+), 45548 deletions(-)

New commits:
commit b27728f969addc9d8367f03a3bfa1a86faad0f12
Author: Timo Aaltonen 
Date:   Tue Nov 24 11:57:48 2009 +0200

Parse space-separated DEB_BUILD_OPTIONS, and handle parallel=N.

diff --git a/debian/changelog b/debian/changelog
index 170cce2..52b9dc6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ libxv (2:1.0.5-1) UNRELEASED; urgency=low
   * New upstream release.
   * Run autoreconf on build. Add build-deps on automake, libtool and
 xutils-dev.
+  * Parse space-separated DEB_BUILD_OPTIONS, and handle parallel=N.
 
  -- Timo Aaltonen   Tue, 24 Nov 2009 11:51:46 +0200
 
diff --git a/debian/rules b/debian/rules
index 11da7ff..2c7b155 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,13 +13,14 @@ PACKAGE = libxv1
 include debian/xsfbs/xsfbs.mk
 
 CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
 else
CFLAGS += -O2
 endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-   INSTALL_PROGRAM += -s
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+   NUMJOBS = $(patsubst parallel=%,%,$(filter 
parallel=%,$(DEB_BUILD_OPTIONS)))
+   MAKEFLAGS += -j$(NUMJOBS)
 endif
 
 DEB_HOST_ARCH  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)

commit ee8c10371384f36eb91248033fea8ca1be476bd2
Author: Timo Aaltonen 
Date:   Tue Nov 24 11:56:46 2009 +0200

Run autoreconf on build. Add build-deps on automake, libtool and xutils-dev.

diff --git a/debian/changelog b/debian/changelog
index f3468ea..170cce2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ libxv (2:1.0.5-1) UNRELEASED; urgency=low
 
   [ Timo Aaltonen ]
   * New upstream release.
+  * Run autoreconf on build. Add build-deps on automake, libtool and
+xutils-dev.
 
  -- Timo Aaltonen   Tue, 24 Nov 2009 11:51:46 +0200
 
diff --git a/debian/control b/debian/control
index 68c2153..caf3677 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,16 @@ Priority: optional
 Maintainer: Debian X Strike Force 
 Uploaders: David Nusinow , Andres Salomon 
, Julien Cristau 
 Standards-Version: 3.8.2
-Build-Depends: debhelper (>= 5.0.0), libx11-dev (>= 1:0.99.2), libxext-dev (>= 
1:0.99.1), x11proto-video-dev, pkg-config, quil

libxv: Changes to 'upstream-unstable'

2009-11-24 Thread Timo Aaltonen 
 .gitignore|9 +
 Makefile.am   |4 
 README|   25 +++
 configure.ac  |   15 -
 include/.gitignore|2 
 include/X11/.gitignore|2 
 include/X11/extensions/.gitignore |2 
 include/X11/extensions/Xvlib.h|5 
 man/.gitignore|3 
 man/Makefile.am   |   13 +
 man/Xv.man|  125 +++
 man/XvCreateImage.man |  103 +
 man/XvFreeAdaptorInfo.man |   32 ++--
 man/XvFreeEncodingInfo.man|   31 ++-
 man/XvGetPortAttribute.man|   92 +--
 man/XvGetStill.man|  105 +++--
 man/XvGetVideo.man|  103 ++---
 man/XvGrabPort.man|   47 +++--
 man/XvListImageFormats.man|  107 +
 man/XvPortNotify.man  |   22 +-
 man/XvPutImage.man|   77 +
 man/XvPutStill.man|   72 +
 man/XvPutVideo.man|   80 +-
 man/XvQueryAdaptors.man   |   43 +++--
 man/XvQueryBestSize.man   |   43 ++---
 man/XvQueryEncodings.man  |   52 +++---
 man/XvQueryExtension.man  |   45 +++--
 man/XvQueryPortAttributes.man |   55 ++
 man/XvSelectPortNotify.man|   46 +++--
 man/XvSelectVideoNotify.man   |   37 ++--
 man/XvSetPortAttribute.man|  102 ++--
 man/XvShmCreateImage.man  |1 
 man/XvShmPutImage.man |1 
 man/XvStopVideo.man   |   45 +++--
 man/XvUngrabPort.man  |   37 ++--
 man/XvVideoNotify.man |   32 ++--
 man/xv-library-v2.2.txt   |  300 ++
 src/.gitignore|6 
 src/Makefile.am   |7 
 39 files changed, 1372 insertions(+), 556 deletions(-)

New commits:
commit 5be9a0099a83d1acf464640e930518a4c46c0920
Author: Alan Coopersmith 
Date:   Sat Oct 3 02:12:52 2009 -0700

libXv 1.0.5

Signed-off-by: Alan Coopersmith 

diff --git a/configure.ac b/configure.ac
index ffe318f..4b01aac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.57])
 
-AC_INIT(libXv, 1.0.4, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXv)
+AC_INIT(libXv, 1.0.5, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXv)
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 

commit 5aa62bb376608cd0350e46263dec74f861019431
Author: Alan Coopersmith 
Date:   Sat Oct 3 01:53:56 2009 -0700

Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS

Signed-off-by: Alan Coopersmith 

diff --git a/configure.ac b/configure.ac
index 084b3ce..ffe318f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,24 +29,21 @@ AM_MAINTAINER_MODE
 
 AM_CONFIG_HEADER(config.h)
 
-# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG, XORG_WITH_LINT
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or 
later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.2)
+# Require xorg-macros: XORG_DEFAULT_OPTIONS, XORG_WITH_LINT
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or 
later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
 
 # Check for progs
 AC_PROG_CC
 AC_PROG_LIBTOOL
-XORG_CWARNFLAGS
+XORG_DEFAULT_OPTIONS
 
 # Check for dependencies
 PKG_CHECK_MODULES(XV, x11 xext xextproto videoproto)
 AC_SUBST(XV_CFLAGS)
 AC_SUBST(XV_LIBS)
- 
+
 XORG_CHECK_MALLOC_ZERO
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
 
 dnl Allow checking code with lint, sparse, etc.
 XORG_WITH_LINT
diff --git a/man/Makefile.am b/man/Makefile.am
index 4a3e969..9100048 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -76,4 +76,4 @@ MAN_SUBSTS = \
 SUFFIXES = .$(LIB_MAN_SUFFIX) .man
 
 .man.$(LIB_MAN_SUFFIX):
-   sed $(MAN_SUBSTS) < $< > $@
+   $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@

commit 4d189188c913e6956344689802a582589db04abe
Author: Alan Coopersmith 
Date:   Sat Oct 3 01:31:44 2009 -0700

Convert documentation from xv-library-v2.2.txt into man pages

Signed-off-by: Alan Coopersmith 

diff --git a/man/Makefile.am b/man/Makefile.am
index 2651cce..4a3e969 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -28,29 +28,37 @@ libmandir = $(LIB_MAN_DIR)
 
 libman_PRE = \
  Xv.man \
+ XvCreateImage.man \
  XvFreeAdaptorInfo.man \
  XvFreeEncodingInfo.man \
  XvGetPortAttribute.man \
  XvGetStill.man \
  XvGetVideo.man \
  XvGrabPort.man \
+ XvListImageFormats.man \
  XvPortNotify.man \
+ XvPutImage.man \
  XvPutStill.man \
  XvPutVideo.man \
  XvQueryAdaptors.man \
  XvQueryBestSize.man \
  XvQueryEncodings.man \
  XvQueryExtension

libxvmc: Changes to 'debian-unstable'

2009-11-24 Thread Timo Aaltonen 
 .gitignore |8 
 ChangeLog  |   54 
 Makefile.am|7 
 Makefile.in|  698 -
 README |   24 
 XvMC_API.txt   | 1293 ++
 aclocal.m4 | 7884 -
 config.guess   | 1500 --
 config.h.in|   58 
 config.sub | 1608 --
 configure  |21069 -
 configure.ac   |   12 
 debian/changelog   |5 
 debian/control |   12 
 debian/rules   |   17 
 depcomp|  530 
 include/.gitignore |2 
 include/Makefile.in|  484 
 include/X11/.gitignore |2 
 include/X11/Makefile.in|  484 
 include/X11/extensions/.gitignore  |2 
 include/X11/extensions/Makefile.in |  406 
 install-sh |  323 
 ltmain.sh  | 6871 
 missing|  360 
 mkinstalldirs  |  158 
 src/.gitignore |7 
 src/Makefile.am|3 
 src/Makefile.in|  511 
 src/XvMCWrapper.c  |6 
 src/XvMClibint.h   |   42 
 31 files changed, 1461 insertions(+), 42979 deletions(-)

New commits:
commit b4dde18d55be64737db9976f2fbc55947d8df3db
Author: Timo Aaltonen 
Date:   Tue Nov 24 12:05:15 2009 +0200

Parse space-separated DEB_BUILD_OPTIONS, and handle parallel=N.

diff --git a/debian/changelog b/debian/changelog
index 2d4e13f..08fc4d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ libxvmc (2:1.0.5-1) UNRELEASED; urgency=low
   * Bump the epoch so that this can be synced to Ubuntu in the future.
   * New upstream release.
   * Run autoreconf on build. Add build-deps on automake and libtool.
+  * Parse space-separated DEB_BUILD_OPTIONS, and handle parallel=N.
 
   [ Brice Goglin ]
   * Bump Standards-Version to 3.7.3 (no changes).
diff --git a/debian/rules b/debian/rules
index 9d81efb..21078cd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,13 +13,14 @@ PACKAGE = libxvmc1
 include debian/xsfbs/xsfbs.mk
 
 CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
 else
CFLAGS += -O2
 endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-   INSTALL_PROGRAM += -s
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+   NUMJOBS = $(patsubst parallel=%,%,$(filter 
parallel=%,$(DEB_BUILD_OPTIONS)))
+   MAKEFLAGS += -j$(NUMJOBS)
 endif
 
 DEB_HOST_ARCH  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)

commit fd4c9756555db84bde3b0fe8e679f72564891449
Author: Timo Aaltonen 
Date:   Tue Nov 24 12:03:53 2009 +0200

Run autoreconf on build. Add build-deps on automake and libtool.

diff --git a/debian/changelog b/debian/changelog
index e9861a1..2d4e13f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libxvmc (2:1.0.5-1) UNRELEASED; urgency=low
   [ Timo Aaltonen ]
   * Bump the epoch so that this can be synced to Ubuntu in the future.
   * New upstream release.
+  * Run autoreconf on build. Add build-deps on automake and libtool.
 
   [ Brice Goglin ]
   * Bump Standards-Version to 3.7.3 (no changes).
diff --git a/debian/control b/debian/control
index 6894670..57d87f9 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,17 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force 
 Uploaders: David Nusinow , Andres Salomon 
, Drew Parsons 
-Build-Depends: debhelper (>= 5.0.0), libx11-dev (>= 1:0.99.2-1), libxext-dev 
(>= 1:0.99.1-1), x11proto-video-dev, libxv-dev (>= 1:0.99.1-1), xutils-dev (>= 
1:7.1.ds-6), pkg-config, quilt
+Build-Depends:
+ debhelper (>= 5.0.0),
+ libx11-dev (>= 1:0.99.2-1),
+ libxext-dev (>= 1:0.99.1-1),
+ x11proto-video-dev,
+ libxv-dev (>= 1:0.99.1-1),
+ xutils-dev (>= 1:7.5~1),
+ pkg-config,
+ quilt,
+ automake,
+ libtool
 Standards-Version: 3.8.2
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxvmc
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxvmc.git
diff --git a/debian/rules b/debian/rules
index 00a23f9..9d81efb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,16 +35,15 @@ endif
 build: patch build-stamp
 build-stamp:
dh_testdir
-
-   test -d obj-$(DEB_BUILD_GNU_TYPE) || mkdir obj-$(DEB_BUILD_GNU_TYPE)
+   autoreconf -vfi
+   mkdir -p obj-$(DEB_BUILD_GNU_TYPE)
cd obj-$(DEB_BUILD_GNU_TYPE) && \
../configure --prefix=/usr \
 --sysconfdir=/etc --mandir=\$${prefix}/share/man \
 --infodir=\$${prefix}/share/info $(confflags) \
 CFLAGS="$(CFLAGS)" 
cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
-
-   touch build-stamp
+

libxvmc: Changes to 'upstream-unstable'

2009-11-24 Thread Timo Aaltonen 
 .gitignore|8 
 Makefile.am   |7 
 README|   24 
 XvMC_API.txt  | 1293 ++
 configure.ac  |   12 
 include/.gitignore|2 
 include/X11/.gitignore|2 
 include/X11/extensions/.gitignore |2 
 src/.gitignore|7 
 src/Makefile.am   |3 
 src/XvMCWrapper.c |6 
 src/XvMClibint.h  |   42 +
 12 files changed, 1382 insertions(+), 26 deletions(-)

New commits:
commit 4c41a40c3e4344c67cda020fbc2eb479ba06fc9e
Author: Alan Coopersmith 
Date:   Tue Oct 6 13:20:36 2009 -0700

libXvMC 1.0.5

Signed-off-by: Alan Coopersmith 

diff --git a/configure.ac b/configure.ac
index dd2ac31..33c102a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.57])
 
-AC_INIT(libXvMC, 1.0.4, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXvMC)
+AC_INIT(libXvMC, 1.0.5, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXvMC)
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 

commit 459a6ac9876b86533b17c996200a8a492e32841c
Author: Alan Coopersmith 
Date:   Tue Oct 6 13:19:45 2009 -0700

Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS

Signed-off-by: Alan Coopersmith 

diff --git a/configure.ac b/configure.ac
index 27736f8..dd2ac31 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,27 +26,24 @@ AC_INIT(libXvMC, 1.0.4, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 
-# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG, XORG_WITH_LINT
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or 
later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.2)
+# Require xorg-macros: XORG_DEFAULT_OPTIONS, XORG_WITH_LINT
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or 
later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
 AM_CONFIG_HEADER(config.h)
 
 # Check for progs
 AC_PROG_CC
 AC_PROG_LIBTOOL
-XORG_CWARNFLAGS
+XORG_DEFAULT_OPTIONS
 
 # Check for dependencies
 PKG_CHECK_MODULES(XVMC, x11 xext xv xextproto videoproto)
-XVMC_CFLAGS="$CWARNFLAGS $XVMC_CFLAGS"
 AC_SUBST(XVMC_CFLAGS)
 AC_SUBST(XVMC_LIBS)
 
 AC_CHECK_FUNC([shmat], AC_DEFINE(HAS_SHM,1,[Has shm*() functions]))
  
 XORG_CHECK_MALLOC_ZERO
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
 
 dnl Allow checking code with lint, sparse, etc.
 XORG_WITH_LINT
diff --git a/src/Makefile.am b/src/Makefile.am
index 513c476..741e7c5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,7 +7,8 @@ libXvMC_la_SOURCES = \
 libXvMCW_la_SOURCES = \
XvMCWrapper.c
 
-AM_CFLAGS = @XVMC_CFLAGS@ -I$(top_srcdir)/include @MALLOC_ZERO_CFLAGS@
+AM_CFLAGS = $(CWARNFLAGS) @XVMC_CFLAGS@
+AM_CPPFLAGS = -I$(top_srcdir)/include @MALLOC_ZERO_CFLAGS@
 
 libXvMC_la_LIBADD = @XVMC_LIBS@
 libXvMC_la_CFLAGS = $(AM_CFLAGS)

commit 8a5876f71cbad2a02eb6c47772cf46c17bc1f451
Author: Alan Coopersmith 
Date:   Thu Oct 1 23:14:51 2009 -0700

Move XvMC_API.txt from xorg-docs

Signed-off-by: Alan Coopersmith 

diff --git a/Makefile.am b/Makefile.am
index bbca204..56dffbd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,6 +24,9 @@ SUBDIRS = src include
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xvmc.pc
 
+xvmcdocdir = $(datadir)/doc/$(PACKAGE)
+dist_xvmcdoc_DATA = XvMC_API.txt
+
 EXTRA_DIST = xvmc.pc.in ChangeLog
 
 .PHONY: ChangeLog
diff --git a/XvMC_API.txt b/XvMC_API.txt
new file mode 100644
index 000..9aded3a
--- /dev/null
+++ b/XvMC_API.txt
@@ -0,0 +1,1293 @@
+
+   X-Video Motion Compensation - API specification v. 1.0
+
+   Mark Vojkovich 
+
+
+/* history */
+
+   first draft (9/6/00)
+   second draft (10/31/00) - Changed to allow acceleration at both
+  the motion compensation and IDCT level.
+   third draft (1/21/01) - Some refinements and subpicture support.
+   fourth draft (5/2/01) - Dual Prime clarification, add
+  XvMCSetAttribute.
+   fifth draft (6/26/01) - Change definition of XvMCCompositeSubpicture
+  plus some clarifications and fixed typographical errors.
+   sixth draft (9/24/01) - Added XVMC_SECOND_FIELD and removed 
+  XVMC_PROGRESSIVE_FRAME and XVMC_TOP_FIELD_FIRST flags.
+   seventh draft (10/26/01) - Added XVMC_INTRA_UNSIGNED option.
+   eighth draft (11/13/02) - Removed IQ level acceleration and
+  changed some structures to remove unused fields.
+
+/* acknowledgements */
+
+   Thanks to Matthew J. Sottek from Intel for lots of input.
+
+//
+
+  OVERVIEW
+
+//
+
+ XvMC extends the X-Video extension (Xv) and makes use of the
+  familar concept of the XvPort.  Ports have attri

libxxf86dga: Changes to 'debian-unstable'

2009-11-24 Thread Timo Aaltonen 
 .gitignore|   12 ++
 ChangeLog |  107 +++
 Makefile.am   |   10 +-
 README|   25 +
 configure.ac  |   11 +-
 debian/changelog  |8 +
 debian/control|2 
 include/X11/extensions/Xxf86dga.h |  176 ++
 include/X11/extensions/xf86dga1.h |  115 
 man/.gitignore|3 
 man/Makefile.am   |1 
 src/.gitignore|9 -
 src/Makefile.am   |8 +
 src/XF86DGA.c |5 -
 src/XF86DGA2.c|5 -
 15 files changed, 469 insertions(+), 28 deletions(-)

New commits:
commit 3238d68a89883f768e1cd01223c02a639300915e
Author: Timo Aaltonen 
Date:   Tue Nov 24 12:12:47 2009 +0200

Bump the build-dep on xutils-dev (>= 1:7.5~1).

diff --git a/debian/changelog b/debian/changelog
index eca5d59..e13952b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ libxxf86dga (2:1.1.1-1) UNRELEASED; urgency=low
 
   [ Timo Aaltonen ]
   * New upstream release.
+  * Bump the build-dep on xutils-dev (>= 1:7.5~1).
 
  -- Timo Aaltonen   Tue, 24 Nov 2009 12:07:19 +0200
 
diff --git a/debian/control b/debian/control
index 934a69c..e9ee1b1 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends:
  quilt,
  automake,
  libtool,
- xutils-dev (>= 1:7.4+4)
+ xutils-dev (>= 1:7.5~1)
 Standards-Version: 3.8.2
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxxf86dga
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxxf86dga.git

commit 6789b9389df4ac6ed90a12394272aa2db0e531ad
Author: Timo Aaltonen 
Date:   Tue Nov 24 12:12:17 2009 +0200

Update the changelogs.

diff --git a/ChangeLog b/ChangeLog
index 1758c26..b2c9b03 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,110 @@
+commit 990b19154368d9a1733636367d6a99d863d558ee
+Author: Peter Hutterer 
+Date:   Tue Oct 6 16:14:45 2009 +1000
+
+libXxf86dga 1.1.1
+
+Signed-off-by: Peter Hutterer 
+
+commit 3cfcfc6246fb213bb0edf529b4f2b40907e5161c
+Author: Peter Hutterer 
+Date:   Tue Oct 6 15:38:27 2009 +1000
+
+Include Xxf86dga.h, not xf86dga.
+
+f78f3ed3571ab0bd75753a7ab388120a383d894a removed xf86dga.h and instead
+provided Xxf86dga.h. Let's use it!
+
+Also, remove two superfluous includes, including it once per file is 
enough.
+
+Signed-off-by: Peter Hutterer 
+
+commit 0bd51760a0d92181faedbd52e7d7249c8179f95d
+Author: Peter Hutterer 
+Date:   Tue Oct 6 15:34:22 2009 +1000
+
+Actually use XORG_DEFAULT_OPTIONS
+
+For some reason, this part didn't make it into
+8eab9123467b047f2b4ddec7df48a679c9254ca1.
+
+Signed-off-by: Peter Hutterer 
+
+commit 5bf5c3c78963cec3cd22e445c62cc7cfd2a37df2
+Author: Peter Hutterer 
+Date:   Thu Oct 1 22:34:39 2009 +1000
+
+libXxf86dga 1.1
+
+Signed-off-by: Peter Hutterer 
+
+commit 8eab9123467b047f2b4ddec7df48a679c9254ca1
+Author: Peter Hutterer 
+Date:   Thu Oct 1 22:33:10 2009 +1000
+
+Require macros 1.3 for XORG_DEFAULT_OPTIONS
+
+Signed-off-by: Peter Hutterer 
+
+commit 9be294d7455ce5799b09bc6bb06c18bea80287be
+Author: Peter Hutterer 
+Date:   Mon Sep 21 10:16:25 2009 +1000
+
+Bump to 1.0.99.2
+
+Signed-off-by: Peter Hutterer 
+
+commit f78f3ed3571ab0bd75753a7ab388120a383d894a
+Author: Carl Worth 
+Date:   Wed Sep 16 17:08:17 2009 -0700
+
+Rename xf86dga.h to Xxf86dga.h
+
+The xf86dgaproto package (as of 2.0.99.2) now provides an include file
+named xf86dga.h for compatibility. We now depend on that version.
+
+commit fd90936abab52caf163c83d114a22980adcc3ee0
+Author: Peter Hutterer 
+Date:   Thu Aug 27 10:56:55 2009 +1000
+
+Bump to 1.0.99.1
+
+Signed-off-by: Peter Hutterer 
+
+commit e28cffbe48279a622b19cab1c83ab0a97e60ccef
+Author: Peter Hutterer 
+Date:   Wed Aug 26 16:41:04 2009 +1000
+
+Move Xlib headers from xf86dgaproto to here.
+
+Signed-off-by: Peter Hutterer 
+
+commit 66abdd3e52ef3071c7d89313cc95935a4ee7ba52
+Author: Alan Coopersmith 
+Date:   Mon Feb 2 20:34:37 2009 -0800
+
+Add README with pointers to mailing list, bugzilla & git repos
+
+Signed-off-by: Alan Coopersmith 
+
+commit 11ff34f811737514ded5231b73407d63a1baf68d
+Author: Paulo Cesar Pereira de Andrade 
+Date:   Mon Feb 2 14:22:44 2009 -0200
+
+Janitor: make distcheck and .gitignore.
+
+commit d5bcd25affa9df2d937f57fac914de4b6f740ae6
+Author: Matthieu Herrb 
+Date:   Sun Mar 9 08:47:58 2008 +0100
+
+nuke RCS Ids
+
+commit 7acb8e34e19ca4ac3347cd42c31adf877397f23b
+Author: James Cloos 
+Date:   Thu Dec 6 16:38:43 2007 -0500
+
+Replace static ChangeLog with dist-hook to generate from git log
+
 commit 5968e0f1e992db63b003f2389657cd527a806efd
 Author: Eric Anholt 
 Date:   Wed Sep 5 10:17:57 2007 -0700
diff --git a/debian/changelog b/d

libxxf86dga: Changes to 'upstream-unstable'

2009-11-24 Thread Timo Aaltonen 
 .gitignore|   12 ++
 ChangeLog |   64 -
 Makefile.am   |   10 +-
 README|   25 +
 configure.ac  |   11 +-
 include/X11/extensions/Xxf86dga.h |  176 ++
 include/X11/extensions/xf86dga1.h |  115 
 man/.gitignore|3 
 man/Makefile.am   |1 
 src/.gitignore|9 -
 src/Makefile.am   |8 +
 src/XF86DGA.c |5 -
 src/XF86DGA2.c|5 -
 13 files changed, 355 insertions(+), 89 deletions(-)

New commits:
commit 990b19154368d9a1733636367d6a99d863d558ee
Author: Peter Hutterer 
Date:   Tue Oct 6 16:14:45 2009 +1000

libXxf86dga 1.1.1

Signed-off-by: Peter Hutterer 

diff --git a/configure.ac b/configure.ac
index f34bf25..0e1341e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.57])
 
-AC_INIT(libXxf86dga, 1.1, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86dga)
+AC_INIT(libXxf86dga, 1.1.1, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86dga)
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 

commit 3cfcfc6246fb213bb0edf529b4f2b40907e5161c
Author: Peter Hutterer 
Date:   Tue Oct 6 15:38:27 2009 +1000

Include Xxf86dga.h, not xf86dga.

f78f3ed3571ab0bd75753a7ab388120a383d894a removed xf86dga.h and instead
provided Xxf86dga.h. Let's use it!

Also, remove two superfluous includes, including it once per file is enough.

Signed-off-by: Peter Hutterer 

diff --git a/src/XF86DGA.c b/src/XF86DGA.c
index 4fedd12..a6e66a4 100644
--- a/src/XF86DGA.c
+++ b/src/XF86DGA.c
@@ -62,7 +62,7 @@ Copyright (c) 1995,1996  The XFree86 Project, Inc
 #define NEED_EVENTS
 #define NEED_REPLIES
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -342,7 +342,6 @@ Bool XF86DGAViewPortChanged(
 /* Helper functions */
 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/src/XF86DGA2.c b/src/XF86DGA2.c
index 5eb5aad..8425faa 100644
--- a/src/XF86DGA2.c
+++ b/src/XF86DGA2.c
@@ -18,7 +18,7 @@ Copyright (c) 1995,1996  The XFree86 Project, Inc
 #define NEED_EVENTS
 #define NEED_REPLIES
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -710,7 +710,6 @@ void XDGAKeyEventToXKeyEvent(
 }
 
 #include 
-#include 
 #include 
 #include 
 #include 

commit 0bd51760a0d92181faedbd52e7d7249c8179f95d
Author: Peter Hutterer 
Date:   Tue Oct 6 15:34:22 2009 +1000

Actually use XORG_DEFAULT_OPTIONS

For some reason, this part didn't make it into
8eab9123467b047f2b4ddec7df48a679c9254ca1.

Signed-off-by: Peter Hutterer 

diff --git a/configure.ac b/configure.ac
index 57821ef..f34bf25 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_INIT(libXxf86dga, 1.1, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xo
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 
-# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
 m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or 
later before running autoconf/autogen])])
 XORG_MACROS_VERSION(1.3)
 AM_CONFIG_HEADER(src/config.h)
@@ -12,16 +12,13 @@ AM_CONFIG_HEADER(src/config.h)
 # Check for progs
 AC_PROG_CC
 AC_PROG_LIBTOOL
-XORG_CWARNFLAGS
+XORG_DEFAULT_OPTIONS
 
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XXF86DGA, xproto x11 xextproto xext [xf86dgaproto >= 
2.0.99.2])
 XXF86DGA_CFLAGS="$CWARNFLAGS $XXF86DGA_CFLAGS"
 
 XORG_CHECK_MALLOC_ZERO
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
 
 AC_OUTPUT([Makefile
   src/Makefile

commit 5bf5c3c78963cec3cd22e445c62cc7cfd2a37df2
Author: Peter Hutterer 
Date:   Thu Oct 1 22:34:39 2009 +1000

libXxf86dga 1.1

Signed-off-by: Peter Hutterer 

diff --git a/configure.ac b/configure.ac
index fee26a2..57821ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.57])
 
-AC_INIT(libXxf86dga, 1.0.99.2, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86dga)
+AC_INIT(libXxf86dga, 1.1, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86dga)
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 

commit 8eab9123467b047f2b4ddec7df48a679c9254ca1
Author: Peter Hutterer 
Date:   Thu Oct 1 22:33:10 2009 +1000

Require macros 1.3 for XORG_DEFAULT_OPTIONS

Signed-off-by: Peter Hutterer 

diff --git a/configure.ac b/configure.ac
index a828c71..fee26a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,8 +5,8 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 
 # Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or 
later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.2)
+m4_ifndef([XORG_MACROS

x11proto-xext: Changes to 'debian-unstable'

2009-11-24 Thread Timo Aaltonen 
 .gitignore|3 
 COPYING   |   22 +
 ChangeLog |  461 +++
 EVI.h |   36 +
 EVIproto.h|   96 
 MITMisc.h |   66 ---
 Makefile.am   |   68 +--
 XEVI.h|   64 ---
 XEVIstr.h |   98 -
 XLbx.h|  155 ---
 XShm.h|  161 
 XTest.h   |  164 
 Xag.h |  114 -
 Xagstr.h  |  182 -
 Xcup.h|   69 ---
 Xcupstr.h |  109 -
 Xdbe.h|  136 --
 Xdbeproto.h   |  277 --
 Xext.h|   57 --
 Xge.h |   55 --
 ag.h  |   52 ++
 agproto.h |  178 +
 configure.ac  |6 
 cup.h |   38 +
 cupproto.h|  105 +
 dbe.h |   57 ++
 dbeproto.h|  224 +++
 debian/changelog  |   17 
 debian/compat |2 
 debian/control|   14 
 debian/xsfbs/xsfbs.mk |4 
 debian/xsfbs/xsfbs.sh |  229 ---
 dpms.h|   67 ---
 dpmsconst.h   |   43 ++
 dpmsproto.h   |  175 
 dpmsstr.h |  186 -
 extutil.h |  192 -
 lbx.h |   73 +++
 lbxbuf.h  |   51 --
 lbxbufstr.h   |   45 --
 lbxdeltastr.h |  105 -
 lbximage.h|  151 ---
 lbxopts.h |  133 --
 lbxproto.h|  975 ++
 lbxstr.h  |  935 ---
 lbxzlib.h |   64 ---
 mitmiscconst.h|   38 +
 mitmiscproto.h|   68 +++
 mitmiscstr.h  |   70 ---
 multibuf.h|  317 
 multibufconst.h   |   83 
 multibufproto.h   |  295 +++
 multibufst.h  |  609 ---
 secur.h   |   61 +++
 security.h|  111 -
 securproto.h  |  110 +
 securstr.h|  116 -
 shape.h   |  180 -
 shapeconst.h  |   55 ++
 shapeproto.h  |  237 
 shapestr.h|  234 
 shm.h |   44 ++
 shmproto.h|  187 +
 shmstr.h  |  217 ---
 sync.h|  469 
 syncconst.h   |  179 +
 syncproto.h   |  378 +++
 syncstr.h |  494 -
 xtestconst.h  |   41 ++
 xtestext1.h   |  326 
 xtestext1const.h  |  160 
 xtestext1proto.h  |  221 +++
 xtestproto.h  |  124 ++
 xteststr.h|  120 --
 74 files changed, 4879 insertions(+), 7179 deletions(-)

New commits:
commit 5ddbb05b074111cf9a4022ec4313240d0c4fe373
Author: Julien Cristau 
Date:   Sat Sep 12 10:39:31 2009 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 1c71e54..69e8e82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11proto-xext (7.1.1-1) UNRELEASED; urgency=low
+x11proto-xext (7.1.1-1) experimental; urgency=low
 
   [ Timo Aaltonen ]
   * Add README.source from xsfbs. Bump Standards-Version to 3.8.1.
@@ -15,7 +15,7 @@ x11proto-xext (7.1.1-1) UNRELEASED; urgency=low
 don't go missing.
   * Bump xutils-dev build-dep to 1:7.4+4.
 
- -- Timo Aaltonen   Fri, 31 Jul 2009 14:42:15 +0300
+ -- Julien Cristau   Sat, 12 Sep 2009 10:38:48 +0200
 
 x11proto-xext (7.0.4-2) unstable; urgency=low
 

commit dcf07a1bd027678f3f2df3ae5379cb079458e18c
Author: Julien Cristau 
Date:   Fri Sep 11 23:57:32 2009 +0200

Bump xutils-dev build-dep to 1:7.4+4.

diff --git a/debian/changelog b/debian/changelog
index 1ef9981..1c71e54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ x11proto-xext (7.1.1-1) UNRELEASED; urgency=low
   some others have been renamed
   * Break old versions of libxtst-dev and libxext-dev to make sure the headers
 don't go missing.
+  * Bump xutils-dev build-dep to 1:7.4+4.
 
  -- Timo Aaltonen   Fri, 31 Jul 2009 14:42:15 +0300
 
diff --git a/debian/control b/debian/control
index 29a29b5..ff8f7d1 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian X Strike Force 
 Uploaders: David Nusinow , Andres Salomon 
, Julien Cristau 
 Build-Depends:
  debhelper (>= 5.0.0),
- xutils-dev,
+ xutils-dev (>= 1:7.4+4),
  autoconf,
  automake
 Standards-Version: 3.8.3

commit 2ad11d479a552d0a9242955eb2b5ba42e764700e
Author: Julien Cristau 
Date:   Fri Sep 11 23:46:17 2009 +0200

Break old versions of libxtst-dev and libxext-dev

diff --git a/debian/changelog b/debian/changelog
index ebba845..1ef9981 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ x11proto-xext (7.1.1-1)

x11proto-xext: Changes to 'upstream-unstable'

2009-11-24 Thread Timo Aaltonen 
 .gitignore   |3 
 COPYING  |   22 +
 EVI.h|   36 ++
 EVIproto.h   |   96 +
 MITMisc.h|   66 ---
 Makefile.am  |   68 +--
 XEVI.h   |   64 ---
 XEVIstr.h|   98 -
 XLbx.h   |  155 
 XShm.h   |  161 -
 XTest.h  |  164 -
 Xag.h|  114 --
 Xagstr.h |  182 --
 Xcup.h   |   69 ---
 Xcupstr.h|  109 --
 Xdbe.h   |  136 ---
 Xdbeproto.h  |  277 ---
 Xext.h   |   57 ---
 Xge.h|   55 ---
 ag.h |   52 ++
 agproto.h|  178 ++
 configure.ac |6 
 cup.h|   38 ++
 cupproto.h   |  105 +
 dbe.h|   57 +++
 dbeproto.h   |  224 
 dpms.h   |   67 ---
 dpmsconst.h  |   43 ++
 dpmsproto.h  |  175 +
 dpmsstr.h|  186 --
 extutil.h|  192 --
 lbx.h|   73 
 lbxbuf.h |   51 --
 lbxbufstr.h  |   45 --
 lbxdeltastr.h|  105 -
 lbximage.h   |  151 
 lbxopts.h|  133 ---
 lbxproto.h   |  975 +++
 lbxstr.h |  935 
 lbxzlib.h|   64 ---
 mitmiscconst.h   |   38 ++
 mitmiscproto.h   |   68 +++
 mitmiscstr.h |   70 ---
 multibuf.h   |  317 -
 multibufconst.h  |   83 
 multibufproto.h  |  295 
 multibufst.h |  609 --
 secur.h  |   61 +++
 security.h   |  111 --
 securproto.h |  110 ++
 securstr.h   |  116 --
 shape.h  |  180 --
 shapeconst.h |   55 +++
 shapeproto.h |  237 +
 shapestr.h   |  234 -
 shm.h|   44 ++
 shmproto.h   |  187 ++
 shmstr.h |  217 
 sync.h   |  469 --
 syncconst.h  |  179 ++
 syncproto.h  |  378 +
 syncstr.h|  494 ---
 xtestconst.h |   41 ++
 xtestext1.h  |  326 --
 xtestext1const.h |  160 +
 xtestext1proto.h |  221 
 xtestproto.h |  124 ++
 xteststr.h   |  120 --
 68 files changed, 4393 insertions(+), 6938 deletions(-)

New commits:
commit 987aeb9bd1915a655f31e250ee9c02d04927b150
Author: Peter Hutterer 
Date:   Tue Aug 25 09:30:15 2009 +1000

xextproto 7.1.1

diff --git a/configure.ac b/configure.ac
index 598403e..4931d3b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.57])
-AC_INIT([XExtProto], [7.1.0], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([XExtProto], [7.1.1], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
 # Require xorg-macros: XORG_CHANGELOG

commit 55a0bbdde9b27b8dbc6e75d41c51af3f92dea6e3
Author: Eduard Bagrov 
Date:   Fri Aug 21 18:48:19 2009 +0200

Fix XSyncValueSubtract typo

X.Org bug#23438 

Signed-off-by: Julien Cristau 

diff --git a/syncconst.h b/syncconst.h
index 2ad5db7..926b60c 100644
--- a/syncconst.h
+++ b/syncconst.h
@@ -113,7 +113,7 @@ PERFORMANCE OF THIS SOFTWARE.
Bool signb = XSyncValueIsNegative(b);\
((presult)->lo = (a).lo - (b).lo);\
((presult)->hi = (a).hi - (b).hi);\
-   if (t>(presult)->lo) (presult)->hi--;\
+   if (t<(presult)->lo) (presult)->hi--;\
*poverflow = ((signa == signb) && !(signa == 
XSyncValueIsNegative(*presult)));\
  }
 #define _XSyncMaxValue(pv) ((pv)->hi = 0x7fff, (pv)->lo = 0x)

commit 23ac4d5235862d51f0cfb080ad2118a9fb181673
Author: Peter Hutterer 
Date:   Wed Aug 5 15:09:11 2009 +1000

xextproto 7.1.0

diff --git a/configure.ac b/configure.ac
index 62b8db8..598403e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.57])
-AC_INIT([XExtProto], [7.0.99.3], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([XExtProto], [7.1.0], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
 # Require xorg-macros: XORG_CHANGELOG

commit 5ffa318ddb35308e3a87122bfb3944e3201532ba
Author: Peter Hutterer 
Date:   Wed Aug 5 15:06:52 2009 +1000

lbxproto: remove debug macro and definition of lbxDebug.

This should not be in the protocol headers.

Signed-off-by: Peter Hutterer 

diff --git a/lbxproto.h b/lbxproto.h
index d613d42..a1ae62b 100644
--- a/lbxproto.h
+++ b/lbxproto.h
@@ -959,14 +959,7 @@ typedef struct _LbxFreeCellsEvent {
 #define DBG_BLOCK  0x0020
 #define DBG_CLIENT 0x0040
 #define DBG_DELTA  0x0080
-
-extern int lbxDebug;
-
-#define DBG(n,m)if (lbxDebug & (n)) { fprintf m; } else
-#else
-#define DBG(n,m)
 #endif
-

libxxf86dga: Changes to 'debian-unstable'

2009-11-24 Thread Timo Aaltonen 
 debian/changelog   |4 
 debian/control |   12 +---
 debian/libxxf86dga-dev.install |1 +
 3 files changed, 14 insertions(+), 3 deletions(-)

New commits:
commit 495ed4870f47fbe40a16046cbdd92d45010ab639
Author: Timo Aaltonen 
Date:   Tue Nov 24 12:25:38 2009 +0200

Drop pre-dependency on x11-common from libxxf86dga-dev. This was needed for 
upgrades from sarge.

diff --git a/debian/changelog b/debian/changelog
index 199f8ac..97c4177 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ libxxf86dga (2:1.1.1-1) UNRELEASED; urgency=low
   * Bump the build-dep on xutils-dev (>= 1:7.5~1).
   * Add includes in -dev, bump {Build-,}Depends, add Replaces on
 x11proto-xf86dga-dev.
+  * Drop pre-dependency on x11-common from libxxf86dga-dev. This was needed
+for upgrades from sarge.
 
  -- Timo Aaltonen   Tue, 24 Nov 2009 12:07:19 +0200
 
diff --git a/debian/control b/debian/control
index 5019b76..9f06f6a 100644
--- a/debian/control
+++ b/debian/control
@@ -68,7 +68,6 @@ Depends:
  x11proto-xf86dga-dev (>= 2.0.99.1)
 Replaces:
  x11proto-xf86dga-dev (<< 2.0.99.1)
-Pre-Depends: x11-common (>= 1:7.0.0)
 Description: X11 Direct Graphics Access extension library (development headers)
  libXxf86dga provides the XFree86-DGA extension, which allows direct
  graphics access to a framebuffer-like region, and also allows relative

commit 5af36c9322f7d61402f07752638992e0314ebc75
Author: Timo Aaltonen 
Date:   Tue Nov 24 12:24:27 2009 +0200

Add includes in -dev, bump {Build-,}Depends, add Replaces on 
x11proto-xf86dga-dev.

diff --git a/debian/changelog b/debian/changelog
index e13952b..199f8ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ libxxf86dga (2:1.1.1-1) UNRELEASED; urgency=low
   [ Timo Aaltonen ]
   * New upstream release.
   * Bump the build-dep on xutils-dev (>= 1:7.5~1).
+  * Add includes in -dev, bump {Build-,}Depends, add Replaces on
+x11proto-xf86dga-dev.
 
  -- Timo Aaltonen   Tue, 24 Nov 2009 12:07:19 +0200
 
diff --git a/debian/control b/debian/control
index e9ee1b1..5019b76 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow , Andres Salomon 
= 5.0.0),
  libx11-dev (>= 1:0.99.2-1),
- x11proto-xf86dga-dev (>= 2.0.3),
+ x11proto-xf86dga-dev (>= 2.0.99.1),
  libxext-dev (>= 1:0.99.1-1),
  pkg-config,
  quilt,
@@ -60,7 +60,14 @@ Description: X11 Direct Graphics Access extension library 
(debug package)
 Package: libxxf86dga-dev
 Architecture: any
 Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends}, libxxf86dga1 (= 
${binary:Version}), libx11-dev, x11proto-xf86dga-dev (>= 2.0.3)
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+ libxxf86dga1 (= ${binary:Version}),
+ libx11-dev,
+ x11proto-xf86dga-dev (>= 2.0.99.1)
+Replaces:
+ x11proto-xf86dga-dev (<< 2.0.99.1)
 Pre-Depends: x11-common (>= 1:7.0.0)
 Description: X11 Direct Graphics Access extension library (development headers)
  libXxf86dga provides the XFree86-DGA extension, which allows direct
diff --git a/debian/libxxf86dga-dev.install b/debian/libxxf86dga-dev.install
index fc0f567..3a634fe 100644
--- a/debian/libxxf86dga-dev.install
+++ b/debian/libxxf86dga-dev.install
@@ -2,3 +2,4 @@ usr/share/man/*
 usr/lib/libXxf86dga.a
 usr/lib/libXxf86dga.so
 usr/lib/pkgconfig/xxf86dga.pc
+usr/include/X11/extensions/


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

libxv: Changes to 'debian-unstable'

2009-11-24 Thread Timo Aaltonen 
 debian/changelog |2 ++
 debian/control   |1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 60037287893822cf9b861dd51a64813e17fd0cfa
Author: Timo Aaltonen 
Date:   Tue Nov 24 12:34:46 2009 +0200

Drop Pre-Depends on x11-common from libxv-dev. This was needed for upgrades 
from sarge.

diff --git a/debian/changelog b/debian/changelog
index 52b9dc6..7deb5a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ libxv (2:1.0.5-1) UNRELEASED; urgency=low
   * Run autoreconf on build. Add build-deps on automake, libtool and
 xutils-dev.
   * Parse space-separated DEB_BUILD_OPTIONS, and handle parallel=N.
+  * Drop Pre-Depends on x11-common from libxv-dev. This was needed for
+upgrades from sarge.
 
  -- Timo Aaltonen   Tue, 24 Nov 2009 11:51:46 +0200
 
diff --git a/debian/control b/debian/control
index caf3677..327d7ca 100644
--- a/debian/control
+++ b/debian/control
@@ -65,7 +65,6 @@ Package: libxv-dev
 Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libxv1 (= ${binary:Version}), 
libx11-dev, libxext-dev, x11proto-video-dev
-Pre-Depends: x11-common (>= 1:7.0.0)
 Conflicts: x11proto-video-dev (<< 2.2+cvs.20050712-1)
 Replaces: x11proto-video-dev (<< 2.2+cvs.20050712-1)
 Description: X11 Video extension library (development headers)


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

libxxf86misc: Changes to 'upstream-unstable'

2009-11-24 Thread Timo Aaltonen 
 .gitignore  |   13 
 ChangeLog   |   59 
 Makefile.am |   10 -
 README  |   25 +++
 configure.ac|   11 +++---
 man/.gitignore  |3 --
 man/Makefile.am |   16 +--
 src/.gitignore  |9 
 src/Makefile.am |2 -
 src/XF86Misc.c  |   42 ++-
 10 files changed, 73 insertions(+), 117 deletions(-)

New commits:
commit 74b475b59fd0da95f91e75d5f32276e87dda6f3f
Author: Alan Coopersmith 
Date:   Thu Oct 8 22:21:41 2009 -0700

libXxf86misc 1.0.2

Signed-off-by: Alan Coopersmith 

diff --git a/configure.ac b/configure.ac
index 82d4c0d..f9171be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.57])
 
-AC_INIT(libXxf86misc, 1.0.1, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86misc)
+AC_INIT(libXxf86misc, 1.0.2, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86misc)
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 

commit 6f5d7342b4192db164913106b5630ebb91d067ca
Author: Alan Coopersmith 
Date:   Thu Oct 8 22:21:03 2009 -0700

Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS

Signed-off-by: Alan Coopersmith 

diff --git a/configure.ac b/configure.ac
index 2ad247e..82d4c0d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,23 +4,23 @@ AC_INIT(libXxf86misc, 1.0.1, 
[https://bugs.freedesktop.org/enter_bug.cgi?product
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 
-# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or 
later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.2)
+# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.3 or later before running 
autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+
 AM_CONFIG_HEADER(src/config.h)
 
 # Check for progs
 AC_PROG_CC
 AC_PROG_LIBTOOL
-XORG_CWARNFLAGS
+
+XORG_DEFAULT_OPTIONS
 
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XXF86MISC, xproto x11 xextproto xext xf86miscproto)
 
 XORG_CHECK_MALLOC_ZERO
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
 
 AC_OUTPUT([Makefile
   src/Makefile
diff --git a/man/Makefile.am b/man/Makefile.am
index 4e1b1a4..40a9794 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -30,14 +30,12 @@ LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
 
 libman_PRE = XF86Misc.man
 
-BUILT_SOURCES = shadows.DONE
-
 EXTRA_DIST = $(libman_PRE)
 
 CLEANFILES = $(libman_DATA) $(BUILT_SOURCES)
 
 libman_DATA = $(libman_PRE:m...@lib_man_suffix@) \
- $(XF86Misc_shadows:=...@lib_man_suffix@)
+ $(XF86Misc_shadowmen)
 
 SED = sed
 
@@ -55,7 +53,7 @@ MAN_SUBSTS = \
 SUFFIXES = .$(LIB_MAN_SUFFIX) .man
 
 .man.$(LIB_MAN_SUFFIX):
-   sed $(MAN_SUBSTS) < $< > $@
+   $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
 
 # Generate man page shadow files (Replaces InstallManPageAliases from Imake)
 
@@ -69,8 +67,7 @@ XF86Misc_shadows =  \
 XF86MiscGetKbdSettings  \
 XF86MiscSetKbdSettings
 
-shadows.DONE:
-   -rm -f $(XF86Misc_shadows:=...@lib_man_suffix@)
-   (for i in $(XF86Misc_shadows:=...@lib_man_suffix@) ; do \
-echo .so man$(LIB_MAN_DIR_SUFFIX)/XF86Misc.$(LIB_MAN_SUFFIX) > $$i; \
-done)
+XF86Misc_shadowmen = $(XF86Misc_shadows:=...@lib_man_suffix@)
+
+$(XF86Misc_shadowmen):
+$(AM_V_GEN)echo .so 
man$(LIB_MAN_DIR_SUFFIX)/XF86Misc.$(LIB_MAN_SUFFIX) > $@
diff --git a/src/Makefile.am b/src/Makefile.am
index 715b82d..4f5b3f3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,6 +2,6 @@ lib_LTLIBRARIES = libXxf86misc.la
 
 libXxf86misc_la_SOURCES = XF86Misc.c
 
-AM_CFLAGS = $(XXF86MISC_CFLAGS) $(MALLOC_ZERO_CFLAGS)
+AM_CFLAGS = $(CWARNFLAGS) $(XXF86MISC_CFLAGS) $(MALLOC_ZERO_CFLAGS)
 libXxf86misc_la_LIBADD = $(XXF86MISC_LIBS)
 libXxf86misc_la_LDFLAGS = -version-number 1:1:0

commit 3337b434ffc664d02e763dfba7e56f5942ad9544
Author: Alan Coopersmith 
Date:   Mon Feb 2 20:34:37 2009 -0800

Add README with pointers to mailing list, bugzilla & git repos

Signed-off-by: Alan Coopersmith 

diff --git a/README b/README
new file mode 100644
index 000..e5a7b3d
--- /dev/null
+++ b/README
@@ -0,0 +1,25 @@
+libXxf86misc - Extension library for the XFree86-Misc X extension.
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+http://lists.freedesktop.org/mailman/listinfo/xorg
+
+Please submit bug reports to the Xorg bugzilla:
+
+https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+The master development code repository can be found at:
+
+git://anongit.freedesktop.org/git/xorg/lib/libXxf86misc
+
+http://cgit.freedesktop.org/xorg/lib/libXxf86misc
+
+For patch submission instructions, see:
+
+

libxxf86misc: Changes to 'debian-unstable'

2009-11-24 Thread Timo Aaltonen 
 .gitignore   |   13 ++
 ChangeLog|  259 ++-
 Makefile.am  |   10 +-
 README   |   25 +
 configure.ac |   11 +-
 debian/changelog |   11 +-
 debian/control   |3 
 man/.gitignore   |3 
 man/Makefile.am  |   16 +--
 src/.gitignore   |9 -
 src/Makefile.am  |2 
 src/XF86Misc.c   |   42 ++--
 12 files changed, 303 insertions(+), 101 deletions(-)

New commits:
commit 0bd666764ba0ab22a20ddd99aef0e2ded7ec7ecd
Author: Timo Aaltonen 
Date:   Tue Nov 24 12:39:13 2009 +0200

Drop pre-dependency on x11-common from libxxf86misc-dev. This was needed 
for upgrades from sarge.

diff --git a/debian/changelog b/debian/changelog
index c17013b..1ba9a37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ libxxf86misc (1:1.0.2-1) UNRELEASED; urgency=low
   [ Timo Aaltonen ]
   * New upstream release.
   * Bump the build-dep on xutils-dev (>= 1:7.5~1).
+  * Drop pre-dependency on x11-common from libxxf86misc-dev. This was
+needed for upgrades from sarge.
 
  -- Timo Aaltonen   Tue, 24 Nov 2009 12:36:08 +0200
 
diff --git a/debian/control b/debian/control
index 9357264..f6cf3b7 100644
--- a/debian/control
+++ b/debian/control
@@ -59,7 +59,6 @@ Package: libxxf86misc-dev
 Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libxxf86misc1 (= 
${binary:Version}), libx11-dev, x11proto-xf86misc-dev
-Pre-Depends: x11-common (>= 1:7.0.0)
 Description: X11 XFree86 miscellaneous extension library (development headers)
  libXxf86misc provides an interface to the XFree86-Misc extension, which
  allows client applications to query the current keyboard and mouse settings

commit b24f7f98f469beba825b8a618354d630baecef80
Author: Timo Aaltonen 
Date:   Tue Nov 24 12:37:35 2009 +0200

Bump the build-dep on xutils-dev (>= 1:7.5~1).

diff --git a/debian/changelog b/debian/changelog
index b7b86df..c17013b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ libxxf86misc (1:1.0.2-1) UNRELEASED; urgency=low
 
   [ Timo Aaltonen ]
   * New upstream release.
+  * Bump the build-dep on xutils-dev (>= 1:7.5~1).
 
  -- Timo Aaltonen   Tue, 24 Nov 2009 12:36:08 +0200
 
diff --git a/debian/control b/debian/control
index aa84dc7..9357264 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends:
  quilt,
  automake,
  libtool,
- xutils-dev (>= 1:7.4+4)
+ xutils-dev (>= 1:7.5~1)
 Standards-Version: 3.8.2
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxxf86misc
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxxf86misc.git

commit ea8130246bada6aa4d00b2d3fcd2a454a3267b1f
Author: Timo Aaltonen 
Date:   Tue Nov 24 12:36:56 2009 +0200

Update the changelogs.

diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 000..ffe1a83
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,240 @@
+commit 74b475b59fd0da95f91e75d5f32276e87dda6f3f
+Author: Alan Coopersmith 
+Date:   Thu Oct 8 22:21:41 2009 -0700
+
+libXxf86misc 1.0.2
+
+Signed-off-by: Alan Coopersmith 
+
+commit 6f5d7342b4192db164913106b5630ebb91d067ca
+Author: Alan Coopersmith 
+Date:   Thu Oct 8 22:21:03 2009 -0700
+
+Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
+
+Signed-off-by: Alan Coopersmith 
+
+commit 3337b434ffc664d02e763dfba7e56f5942ad9544
+Author: Alan Coopersmith 
+Date:   Mon Feb 2 20:34:37 2009 -0800
+
+Add README with pointers to mailing list, bugzilla & git repos
+
+Signed-off-by: Alan Coopersmith 
+
+commit 860ee8b84e4df995ba241d16d9adbf5b7c77e5ae
+Author: Paulo Cesar Pereira de Andrade 
+Date:   Mon Feb 2 14:30:51 2009 -0200
+
+Janitor: ansification, make distcheck, compiler warnings, .gitignore.
+
+commit 6bc07578f11eecb1c67a6dd28861a0cbc03621c6
+Author: Matthieu Herrb 
+Date:   Sun Mar 9 08:49:52 2008 +0100
+
+nuke RCS Ids
+
+commit b3b1c2f578fd68b3cea689876acf68807e2cb03a
+Author: James Cloos 
+Date:   Thu Dec 6 16:38:46 2007 -0500
+
+Replace static ChangeLog with dist-hook to generate from git log
+
+commit f4ed7977e3bd5a60df0d5df089a613462c04dc3f
+Author: James Cloos 
+Date:   Mon Sep 3 05:53:51 2007 -0400
+
+Add *~ to .gitignore to skip patch/emacs droppings
+
+commit 2b2dbf791127a2d8a949546a5e6f5de3d3650b82
+Author: Alan Coopersmith 
+Date:   Thu Jul 13 14:59:13 2006 -0700
+
+renamed: .cvsignore -> .gitignore
+
+commit a2ff41b5721803eda53ef54bc5c7e3593724be1e
+Author: Adam Jackson 
+Date:   Thu Apr 27 00:26:02 2006 +
+
+Bump to 1.0.1
+
+commit 22e48fc3d8e8487592f451ae1b7590f2c519a2e3
+Author: Alan Coopersmith 
+Date:   Sun Feb 12 18:19:23 2006 +
+
+Bug #5628  Shadow pages
+not created correctly when MANDIR & MANSUFFIX don't match.
+
+commit b679b8e1301f8667a326c03eb8c77ad5164f8c65
+Author: Kevin E Martin 
+Date:   Thu Dec 15 00:24:35 2005 +
+
+Update package version number for final X11R7 release candidate.
+
+commit db2fdde2e48e58bf

libxxf86vm: Changes to 'upstream-unstable'

2009-11-24 Thread Timo Aaltonen 
 .gitignore |   12 +
 Makefile.am|6 
 README |   25 +++
 configure.ac   |   10 -
 include/X11/extensions/xf86vmode.h |  298 +
 man/.gitignore |3 
 src/.gitignore |9 -
 src/Makefile.am|5 
 src/XF86VMode.c|   88 ++
 9 files changed, 372 insertions(+), 84 deletions(-)

New commits:
commit b4d998a026f03aa2fea74a909f3edea4e4aed5a1
Author: Peter Hutterer 
Date:   Fri Oct 2 09:43:30 2009 +1000

libXxf86vm 1.1.0

Signed-off-by: Peter Hutterer 

diff --git a/configure.ac b/configure.ac
index c8373af..738e03a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.57])
 
-AC_INIT(libXxf86vm, 1.0.99.1, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86vm)
+AC_INIT(libXxf86vm, 1.1.0, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86vm)
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 

commit 8f518e80716915cfb8234a18836ad95121a7d6db
Author: Peter Hutterer 
Date:   Fri Oct 2 08:58:19 2009 +1000

Require macros 1.3 for XORG_DEFAULT_OPTIONS

Signed-off-by: Peter Hutterer 

diff --git a/configure.ac b/configure.ac
index 002159b..c8373af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,23 +4,20 @@ AC_INIT(libXxf86vm, 1.0.99.1, 
[https://bugs.freedesktop.org/enter_bug.cgi?produc
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 
-# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or 
later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.2)
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or 
later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
 AM_CONFIG_HEADER(src/config.h)
 
 # Check for progs
 AC_PROG_CC
 AC_PROG_LIBTOOL
-XORG_CWARNFLAGS
+XORG_DEFAULT_OPTIONS
 
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XXF86VM, xproto x11 xextproto xext [xf86vidmodeproto >= 
2.2.99.1])
 
 XORG_CHECK_MALLOC_ZERO
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
 
 AC_OUTPUT([Makefile
   src/Makefile

commit 3951e96ddfefa5f3007895002528e713618a60ab
Author: Peter Hutterer 
Date:   Thu Aug 27 11:18:38 2009 +1000

libXxf86vm 1.0.99.1

Signed-off-by: Peter Hutterer 

diff --git a/configure.ac b/configure.ac
index cca1b09..002159b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.57])
 
-AC_INIT(libXxf86vm, 1.0.2, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86vm)
+AC_INIT(libXxf86vm, 1.0.99.1, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86vm)
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 

commit 7c7ab2076420a883e827509da0e8a0989a786000
Author: Peter Hutterer 
Date:   Thu Aug 27 11:17:45 2009 +1000

Include xf86vmproto instead of xf86vmstr.h

Signed-off-by: Peter Hutterer 

diff --git a/src/XF86VMode.c b/src/XF86VMode.c
index de6cb83..83512ca 100644
--- a/src/XF86VMode.c
+++ b/src/XF86VMode.c
@@ -33,7 +33,7 @@ from Kaleb S. KEITHLEY.
 #define NEED_EVENTS
 #define NEED_REPLIES
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 

commit b49fcb355eb1469352eb25ba3dbcf2863cfe5642
Author: Peter Hutterer 
Date:   Wed Aug 26 16:09:15 2009 +1000

Move the xf86vmode.h header from the proto package to here.

Signed-off-by: Peter Hutterer 

diff --git a/configure.ac b/configure.ac
index 2259530..cca1b09 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@ AC_PROG_LIBTOOL
 XORG_CWARNFLAGS
 
 # Checks for pkg-config packages
-PKG_CHECK_MODULES(XXF86VM, xproto x11 xextproto xext xf86vidmodeproto)
+PKG_CHECK_MODULES(XXF86VM, xproto x11 xextproto xext [xf86vidmodeproto >= 
2.2.99.1])
 
 XORG_CHECK_MALLOC_ZERO
 XORG_MANPAGE_SECTIONS
diff --git a/include/X11/extensions/xf86vmode.h 
b/include/X11/extensions/xf86vmode.h
new file mode 100644
index 000..136ce9c
--- /dev/null
+++ b/include/X11/extensions/xf86vmode.h
@@ -0,0 +1,298 @@
+/*
+
+Copyright 1995  Kaleb S. KEITHLEY
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FI

libxxf86vm: Changes to 'debian-unstable'

2009-11-24 Thread Timo Aaltonen 
 .gitignore |   12 
 ChangeLog  |   54 
 Makefile.am|6 
 Makefile.in|  681 -
 README |   25 
 aclocal.m4 | 8207 --
 config.guess   | 1526 --
 config.sub | 1658 --
 configure  |21673 -
 configure.ac   |   10 
 debian/README.source   |   73 
 debian/changelog   |   15 
 debian/control |   25 
 debian/libxxf86vm-dev.install  |1 
 debian/rules   |   17 
 debian/xsfbs/repack.sh |   32 
 debian/xsfbs/xsfbs.mk  |   50 
 debian/xsfbs/xsfbs.sh  |  311 
 depcomp|  589 -
 include/X11/extensions/xf86vmode.h |  298 
 install-sh |  519 
 ltmain.sh  | 6964 ---
 man/.gitignore |3 
 man/Makefile.in|  460 
 missing|  367 
 src/.gitignore |9 
 src/Makefile.am|5 
 src/Makefile.in|  507 
 src/XF86VMode.c|   88 
 29 files changed, 591 insertions(+), 43594 deletions(-)

New commits:
commit 2d646b49cf2e237e8ec7daa0fbc149adba20c886
Author: Timo Aaltonen 
Date:   Tue Nov 24 12:51:57 2009 +0200

Move -dbg package to section debug.

diff --git a/debian/changelog b/debian/changelog
index 11f2433..f2b0ca7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ libxxf86vm (1:1.1.0-1) UNRELEASED; urgency=low
 for upgrades from sarge.
   * Add includes in -dev, bump {Build-,}Depends, add Replaces on
 x11proto-xf86vidmode-dev.
+  * Move -dbg package to section debug.
 
  -- Timo Aaltonen   Tue, 24 Nov 2009 12:40:58 +0200
 
diff --git a/debian/control b/debian/control
index 36ea72c..8618daa 100644
--- a/debian/control
+++ b/debian/control
@@ -36,7 +36,7 @@ Description: X11 XFree86 video mode extension library
  git://anongit.freedesktop.org/git/xorg/lib/libXxf86vm
 
 Package: libxxf86vm1-dbg
-Section: libdevel
+Section: debug
 Architecture: any
 Priority: extra
 Depends: ${shlibs:Depends}, ${misc:Depends}, libxxf86vm1 (= ${binary:Version})

commit 2cfee2d116ba4862143266423e71f13c1b830bb4
Author: Timo Aaltonen 
Date:   Tue Nov 24 12:51:10 2009 +0200

Add includes in -dev, bump {Build-,}Depends, add Replaces on 
x11proto-xf86vidmode-dev.

diff --git a/debian/changelog b/debian/changelog
index 1b89bdf..11f2433 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ libxxf86vm (1:1.1.0-1) UNRELEASED; urgency=low
   * Bump Standards-Version to 3.8.3.
   * Drop pre-dependency on x11-common from libxx86vm-dev.  This was needed
 for upgrades from sarge.
+  * Add includes in -dev, bump {Build-,}Depends, add Replaces on
+x11proto-xf86vidmode-dev.
 
  -- Timo Aaltonen   Tue, 24 Nov 2009 12:40:58 +0200
 
diff --git a/debian/control b/debian/control
index 0934dfe..36ea72c 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow , Andres Salomon 
= 5.0.0),
  libx11-dev (>= 1:0.99.2),
- x11proto-xf86vidmode-dev,
+ x11proto-xf86vidmode-dev (>= 2.2.99.1),
  libxext-dev (>= 1:0.99.1),
  pkg-config,
  quilt,
@@ -60,7 +60,14 @@ Description: X11 XFree86 video mode extension library (debug 
package)
 Package: libxxf86vm-dev
 Section: libdevel
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libxxf86vm1 (= 
${binary:Version}), libx11-dev, x11proto-xf86vidmode-dev
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+ libxxf86vm1 (= ${binary:Version}),
+ libx11-dev,
+ x11proto-xf86vidmode-dev (>= 2.2.99.1)
+Replaces:
+  x11proto-xf86vidmode-dev (<< 2.2.99.1)
 Description: X11 XFree86 video mode extension library (development headers)
  libXxf86vm provides an interface to the XFree86-VidModeExtension
  extension, which allows client applications to get and set video mode
diff --git a/debian/libxxf86vm-dev.install b/debian/libxxf86vm-dev.install
index e2b4263..a748dca 100644
--- a/debian/libxxf86vm-dev.install
+++ b/debian/libxxf86vm-dev.install
@@ -2,3 +2,4 @@ usr/share/man/*
 usr/lib/libXxf86vm.a
 usr/lib/libXxf86vm.so
 usr/lib/pkgconfig/xxf86vm.pc
+usr/include/X11/extensions/

commit 170c19d3d574b5fc9d509c28684993ca7ec338e0
Author: Timo Aaltonen 
Date:   Tue Nov 24 12:46:34 2009 +0200

Drop pre-dependency on x11-common from libxx86vm-dev.  This was needed for 
upgrades from sarge.

diff --git a/debian/changelog b/debian/changelog
index cbff27b..1b89bdf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ libxxf86vm (1:1.1.0-1) UNRELEASED; urgency=low
 xutils-dev.
   * Parse space-separated DEB_BUILD_OPTIONS, and handle parallel=N.
   * Bump Standards-Version to 3.8.3.
+  * Drop pre-dependency on x11-common from li

libxvmc: Changes to 'debian-unstable'

2009-11-24 Thread Timo Aaltonen 
 debian/changelog |2 ++
 debian/control   |1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 193a47ffadc6b9bc4af4a723b93a0abb753ee677
Author: Timo Aaltonen 
Date:   Tue Nov 24 12:55:40 2009 +0200

Drop pre-dependency on x11-common from libxvmc-dev.  This was needed for 
upgrades from sarge.

diff --git a/debian/changelog b/debian/changelog
index 08fc4d9..70527d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ libxvmc (2:1.0.5-1) UNRELEASED; urgency=low
   * New upstream release.
   * Run autoreconf on build. Add build-deps on automake and libtool.
   * Parse space-separated DEB_BUILD_OPTIONS, and handle parallel=N.
+  * Drop pre-dependency on x11-common from libxvmc-dev.  This was needed
+for upgrades from sarge.
 
   [ Brice Goglin ]
   * Bump Standards-Version to 3.7.3 (no changes).
diff --git a/debian/control b/debian/control
index 57d87f9..eb2ddfc 100644
--- a/debian/control
+++ b/debian/control
@@ -68,7 +68,6 @@ Package: libxvmc-dev
 Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libxvmc1 (= ${binary:Version}), 
libx11-dev (>= 2:1.0.0-1), libxext-dev (>= 1:1.0.0-2), x11proto-video-dev, 
libxv-dev
-Pre-Depends: x11-common (>= 1:7.0.0)
 Conflicts: x11proto-video-dev (<< 2.2+cvs.20050712-1)
 Replaces: x11proto-video-dev (<< 2.2+cvs.20050712-1)
 Description: X11 Video extension library (development headers)


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

libxcomposite: Changes to 'debian-unstable'

2009-11-24 Thread Timo Aaltonen 
 debian/changelog |3 ++-
 debian/control   |1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit c98e949a3d7c1f049c82f027b3833bd211a62086
Author: Timo Aaltonen 
Date:   Tue Nov 24 12:59:46 2009 +0200

Add libtool to bdeps.

diff --git a/debian/changelog b/debian/changelog
index fa5d96f..1617fea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,8 @@ libxcomposite (1:0.4.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Bump Standards-Version to 3.8.3.
-  * Run autoreconf on build. Add build-deps on automake and xutils-dev.
+  * Run autoreconf on build. Add build-deps on automake, libtool and
+xutils-dev.
   * Parse space-separated DEB_BUILD_OPTIONS, and handle parallel=N.
 
  -- Timo Aaltonen   Mon, 23 Nov 2009 13:09:17 +0200
diff --git a/debian/control b/debian/control
index f0a380d..8c7462f 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,7 @@ Build-Depends:
  pkg-config,
  xmlto,
  automake,
+ libtool,
  xutils-dev (>= 1:7.5~1)
 Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxcomposite


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

libxdmcp: Changes to 'debian-unstable'

2009-11-24 Thread Timo Aaltonen 
 debian/changelog |6 +-
 debian/control   |4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit dc655b24a7393d3804ca6972dd076bbd8b718b5e
Author: Timo Aaltonen 
Date:   Tue Nov 24 13:02:10 2009 +0200

Drop pre-dependency on x11-common from libxdmcp-dev. This was needed for 
upgrades from sarge.

diff --git a/debian/changelog b/debian/changelog
index a6fd3f7..585b6de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ libxdmcp (1:1.0.3-1) UNRELEASED; urgency=low
   * Parse space-separated DEB_BUILD_OPTIONS, and handle parallel=N.
   * Bump Standards-Version to 3.8.3.
   * Move -dbg package to section debug.
+  * Drop pre-dependency on x11-common from libxdmcp-dev. This was needed
+for upgrades from sarge.
 
  -- Timo Aaltonen   Mon, 23 Nov 2009 14:10:15 +0200
 
diff --git a/debian/control b/debian/control
index 2ab30b3..048125b 100644
--- a/debian/control
+++ b/debian/control
@@ -54,7 +54,6 @@ Package: libxdmcp-dev
 Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, libxdmcp6 (= ${binary:Version}), 
x11proto-core-dev
-Pre-Depends: x11-common (>= 1:7.0.0)
 Description: X11 authorisation library (development headers)
  This package provides the main interface to the X11 display manager control
  protocol library, which allows for remote logins to display managers.

commit 516495de57eebc4ad2dd5011d2db5d40f8d6c2e0
Author: Timo Aaltonen 
Date:   Tue Nov 24 13:01:11 2009 +0200

Move -dbg package to section debug.

diff --git a/debian/changelog b/debian/changelog
index 3585120..a6fd3f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ libxdmcp (1:1.0.3-1) UNRELEASED; urgency=low
 and xutils-dev.
   * Parse space-separated DEB_BUILD_OPTIONS, and handle parallel=N.
   * Bump Standards-Version to 3.8.3.
+  * Move -dbg package to section debug.
 
  -- Timo Aaltonen   Mon, 23 Nov 2009 14:10:15 +0200
 
diff --git a/debian/control b/debian/control
index 7937d4a..2ab30b3 100644
--- a/debian/control
+++ b/debian/control
@@ -32,7 +32,7 @@ Description: X11 Display Manager Control Protocol library
 
 Package: libxdmcp6-dbg
 Architecture: any
-Section: libdevel
+Section: debug
 Priority: extra
 Depends: ${shlibs:Depends}, ${misc:Depends}, libxdmcp6 (= ${binary:Version})
 Description: X11 authorisation library (debug package)

commit c67ac8f591ed033084002cdb8e870186495da7b0
Author: Timo Aaltonen 
Date:   Tue Nov 24 13:00:28 2009 +0200

Add libtool to bdeps.

diff --git a/debian/changelog b/debian/changelog
index 523e21f..3585120 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,8 @@ libxdmcp (1:1.0.3-1) UNRELEASED; urgency=low
 
   [ Timo Aaltonen ]
   * New upstream release.
-  * Run autoreconf on build. Add build-deps on automake and xutils-dev.
+  * Run autoreconf on build. Add build-deps on automake, libtool
+and xutils-dev.
   * Parse space-separated DEB_BUILD_OPTIONS, and handle parallel=N.
   * Bump Standards-Version to 3.8.3.
 
diff --git a/debian/control b/debian/control
index d9a4c53..7937d4a 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ Build-Depends:
  pkg-config,
  x11proto-core-dev,
  automake,
+ libtool,
  xutils-dev (>= 1:7.5~1)
 Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxdmcp


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

libxfixes: Changes to 'debian-unstable'

2009-11-24 Thread Timo Aaltonen 
 debian/changelog |5 -
 debian/control   |2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit c8391ed38ce8858ce4adb8de953304d32a4d8a54
Author: Timo Aaltonen 
Date:   Tue Nov 24 13:04:15 2009 +0200

Drop pre-dependency on x11-common from libxtst-dev. This was needed for 
upgrades from sarge.

diff --git a/debian/changelog b/debian/changelog
index 1c1b50e..d135208 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,8 @@ libxfixes (1:4.0.4-1) UNRELEASED; urgency=low
   * Run autoreconf on build. Add build-deps on automake, libtool
 and xutils-dev.
   * Parse space-separated DEB_BUILD_OPTIONS, and handle parallel=N.
+  * Drop pre-dependency on x11-common from libxtst-dev. This was needed
+for upgrades from sarge.
 
  -- Timo Aaltonen   Mon, 23 Nov 2009 14:20:37 +0200
 
diff --git a/debian/control b/debian/control
index 2564b22..48bcad4 100644
--- a/debian/control
+++ b/debian/control
@@ -60,7 +60,6 @@ Package: libxfixes-dev
 Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libxfixes3 (= ${binary:Version}), 
libx11-dev, x11proto-fixes-dev (>= 4.0-1)
-Pre-Depends: x11-common (>= 1:7.0.0)
 Description: X11 miscellaneous 'fixes' extension library (development headers)
  libXfixes provides an X Window System client interface to the 'XFIXES'
  extension to the X protocol.

commit 25dbcad226267eb8f79a012ce45835354e2e171f
Author: Timo Aaltonen 
Date:   Tue Nov 24 13:03:33 2009 +0200

Add libtool to bdeps.

diff --git a/debian/changelog b/debian/changelog
index 4ac8f2a..1c1b50e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,7 +21,8 @@ libxfixes (1:4.0.4-1) UNRELEASED; urgency=low
 
   [ Timo Aaltonen ]
   * New upstream release.
-  * Run autoreconf on build. Add build-deps on automake and xutils-dev.
+  * Run autoreconf on build. Add build-deps on automake, libtool
+and xutils-dev.
   * Parse space-separated DEB_BUILD_OPTIONS, and handle parallel=N.
 
  -- Timo Aaltonen   Mon, 23 Nov 2009 14:20:37 +0200
diff --git a/debian/control b/debian/control
index 9fec1db..2564b22 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Build-Depends:
  pkg-config,
  quilt,
  automake,
+ libtool,
  xutils-dev (>= 1:7.5~1)
 Standards-Version: 3.8.2
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxfixes


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

libxinerama: Changes to 'debian-unstable'

2009-11-24 Thread Timo Aaltonen 
 debian/changelog |8 ++--
 debian/control   |   14 ++
 2 files changed, 16 insertions(+), 6 deletions(-)

New commits:
commit cd9973c9870f546ff528e6532218e0f7713dc551
Author: Timo Aaltonen 
Date:   Tue Nov 24 13:08:51 2009 +0200

Bump {Build-,}Depends, add Replaces on x11proto-xinerama-dev.

diff --git a/debian/changelog b/debian/changelog
index 4c46aa7..90ab1f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,7 +12,7 @@ libxinerama (2:1.1-1) UNRELEASED; urgency=low
   * Parse space-separated DEB_BUILD_OPTIONS, and handle parallel=N.
   * Bump Standards-Version to 3.8.3.
   * Add headers to libxinerama-dev, moved from x11proto-xinerama-dev.
-  * Add Replaces: x11proto-xinerama-dev (<< 1.2).
+  * Bump {Build-,}Depends, add Replaces on x11proto-xinerama-dev.
   * Move -dbg package to section debug.
   * Drop pre-dependency on x11-common from libxinerama-dev. This was needed
 for upgrades from sarge.
diff --git a/debian/control b/debian/control
index 79eebab..61e41a6 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
  debhelper (>= 5.0.0),
  libx11-dev (>= 1:0.99.2),
  libxext-dev (>= 1:0.99.1),
- x11proto-xinerama-dev,
+ x11proto-xinerama-dev (>= 1.2),
  pkg-config,
  automake,
  libtool,
@@ -63,7 +63,13 @@ Description: X11 Xinerama extension library (debug package)
 Package: libxinerama-dev
 Section: libdevel
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libxinerama1 (= 
${binary:Version}), libx11-dev, libxext-dev, x11proto-xinerama-dev
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+ libxinerama1 (= ${binary:Version}),
+ libx11-dev,
+ libxext-dev,
+ x11proto-xinerama-dev (>= 1.2)
 Replaces: x11proto-xinerama-dev (<< 1.2)
 Description: X11 Xinerama extension library (development headers)
  libXinerama provides an X Window System client interface to the XINERAMA

commit 8bdffe29fa8da248d27cfda1a5bd65a45e1f8b42
Author: Timo Aaltonen 
Date:   Tue Nov 24 13:06:52 2009 +0200

Drop pre-dependency on x11-common from libxinerama-dev. This was needed for 
upgrades from sarge.

diff --git a/debian/changelog b/debian/changelog
index 8550673..4c46aa7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ libxinerama (2:1.1-1) UNRELEASED; urgency=low
   * Add headers to libxinerama-dev, moved from x11proto-xinerama-dev.
   * Add Replaces: x11proto-xinerama-dev (<< 1.2).
   * Move -dbg package to section debug.
+  * Drop pre-dependency on x11-common from libxinerama-dev. This was needed
+for upgrades from sarge.
 
  -- Timo Aaltonen   Mon, 23 Nov 2009 14:38:59 +0200
 
diff --git a/debian/control b/debian/control
index 2de41a8..79eebab 100644
--- a/debian/control
+++ b/debian/control
@@ -64,7 +64,6 @@ Package: libxinerama-dev
 Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libxinerama1 (= 
${binary:Version}), libx11-dev, libxext-dev, x11proto-xinerama-dev
-Pre-Depends: x11-common (>= 1:7.0.0)
 Replaces: x11proto-xinerama-dev (<< 1.2)
 Description: X11 Xinerama extension library (development headers)
  libXinerama provides an X Window System client interface to the XINERAMA

commit d78986f008b86b4ca75a5012ba3c630e02c501d5
Author: Timo Aaltonen 
Date:   Tue Nov 24 13:05:33 2009 +0200

Move -dbg package to section debug.

diff --git a/debian/changelog b/debian/changelog
index c39ab51..8550673 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ libxinerama (2:1.1-1) UNRELEASED; urgency=low
   * Bump Standards-Version to 3.8.3.
   * Add headers to libxinerama-dev, moved from x11proto-xinerama-dev.
   * Add Replaces: x11proto-xinerama-dev (<< 1.2).
+  * Move -dbg package to section debug.
 
  -- Timo Aaltonen   Mon, 23 Nov 2009 14:38:59 +0200
 
diff --git a/debian/control b/debian/control
index 5ee446f..2de41a8 100644
--- a/debian/control
+++ b/debian/control
@@ -37,7 +37,7 @@ Description: X11 Xinerama extension library
  git://anongit.freedesktop.org/git/xorg/lib/libXinerama
 
 Package: libxinerama1-dbg
-Section: libdevel
+Section: debug
 Priority: extra
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libxinerama1 (= ${binary:Version})

commit fe966705e1de9875ec1d587afd0edc410b1d
Author: Timo Aaltonen 
Date:   Tue Nov 24 13:05:06 2009 +0200

Add libtool to bdeps.

diff --git a/debian/changelog b/debian/changelog
index 4dd02df..c39ab51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,8 @@ libxinerama (2:1.1-1) UNRELEASED; urgency=low
 
   [ Timo Aaltonen ]
   * New upstream release.
-  * Run autoreconf on build. Add build-deps on automake and xutils-dev.
+  * Run autoreconf on build. Add build-deps on automake, libtool
+and xutils-dev.
   * Parse space-separated DEB_BUILD_OPTIONS, and handle parallel=N.
   * Bump Standards-Version to 3.8.3.
   * Add headers to libxinerama-dev, moved from x11proto-xinerama-dev.
diff --git a/debian/control b/debian/control
index 8db2a2e..5ee446f 100644
--- a/debian/control
+++ b/deb

libxinerama: Changes to 'debian-unstable'

2009-11-24 Thread Timo Aaltonen 
 debian/README.source   |   73 +++
 debian/xsfbs/repack.sh |   32 +
 debian/xsfbs/xsfbs.mk  |   50 ++-
 debian/xsfbs/xsfbs.sh  |  311 -
 4 files changed, 119 insertions(+), 347 deletions(-)

New commits:
commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau 
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 
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 
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 5693792171d885769e58d053c08b11acd12a
Author: Julien Cristau 
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 
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

libxrender: Changes to 'debian-unstable'

2009-11-24 Thread Timo Aaltonen 
 debian/README.source   |   73 +++
 debian/changelog   |6 
 debian/control |4 
 debian/xsfbs/repack.sh |   32 +
 debian/xsfbs/xsfbs.mk  |   50 ++-
 debian/xsfbs/xsfbs.sh  |  311 -
 6 files changed, 126 insertions(+), 350 deletions(-)

New commits:
commit 83ed1e30d9007a4ce831c8fbb85635143ec62359
Author: Timo Aaltonen 
Date:   Tue Nov 24 13:11:41 2009 +0200

Drop pre-dependency on x11-common from libxrender-dev. This was needed for 
upgrades from sarge.

diff --git a/debian/changelog b/debian/changelog
index 7d5e387..42ab6a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ libxrender (1:0.9.5-1) UNRELEASED; urgency=low
   * Parse space-separated DEB_BUILD_OPTIONS, and handle parallel=N.
   * Bump Standards-Version to 3.8.3.
   * Move -dbg package to section debug.
+  * Drop pre-dependency on x11-common from libxrender-dev. This was needed
+for upgrades from sarge.
 
  -- Timo Aaltonen   Mon, 23 Nov 2009 15:09:49 +0200
 
diff --git a/debian/control b/debian/control
index cd17931..466afd4 100644
--- a/debian/control
+++ b/debian/control
@@ -69,7 +69,6 @@ Package: libxrender-dev
 Section: libdevel
 Architecture: any
 Depends: libxrender1 (= ${binary:Version}), libx11-dev (>= 2:1.0.0), 
x11proto-render-dev, x11proto-core-dev
-Pre-Depends: x11-common (>= 1:7.0.0)
 Description: X Rendering Extension client library (development files)
  The X Rendering Extension (Render) introduces digital image composition as
  the foundation of a new rendering model within the X Window System.

commit 79161effbe7b20bf21b31804a297b1ae100fe8ae
Author: Timo Aaltonen 
Date:   Tue Nov 24 13:11:04 2009 +0200

Move -dbg package to section debug.

diff --git a/debian/changelog b/debian/changelog
index 1914885..7d5e387 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libxrender (1:0.9.5-1) UNRELEASED; urgency=low
 and xutils-dev.
   * Parse space-separated DEB_BUILD_OPTIONS, and handle parallel=N.
   * Bump Standards-Version to 3.8.3.
+  * Move -dbg package to section debug.
 
  -- Timo Aaltonen   Mon, 23 Nov 2009 15:09:49 +0200
 
diff --git a/debian/control b/debian/control
index e8b5f68..cd17931 100644
--- a/debian/control
+++ b/debian/control
@@ -37,7 +37,7 @@ Description: X Rendering Extension client library
  git://anongit.freedesktop.org/git/xorg/lib/libXrender
 
 Package: libxrender1-dbg
-Section: libdevel
+Section: debug
 Priority: extra
 Architecture: any
 Depends: libxrender1 (= ${binary:Version}), ${shlibs:Depends}

commit a4cde6d2e8b6308a3b407eab8edb252d6fa10013
Author: Timo Aaltonen 
Date:   Tue Nov 24 13:10:34 2009 +0200

Add libtool to bdeps.

diff --git a/debian/changelog b/debian/changelog
index 8cd1665..1914885 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
 libxrender (1:0.9.5-1) UNRELEASED; urgency=low
 
   * New upstream release.
-  * Run autoreconf on build. Add build-deps on automake and xutils-dev.
+  * Run autoreconf on build. Add build-deps on automake, libtool
+and xutils-dev.
   * Parse space-separated DEB_BUILD_OPTIONS, and handle parallel=N.
   * Bump Standards-Version to 3.8.3.
 
diff --git a/debian/control b/debian/control
index 29b53d0..e8b5f68 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Build-Depends:
  x11proto-render-dev,
  x11proto-core-dev,
  automake,
+ libtool,
  xutils-dev (>= 1:7.5~1)
 Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxrender

commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau 
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 
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 100

libxdamage: Changes to 'debian-unstable'

2009-11-24 Thread Timo Aaltonen 
 debian/changelog  |5 -
 debian/control|2 
 debian/xsfbs/xsfbs.mk |   21 
 debian/xsfbs/xsfbs.sh |  233 --
 4 files changed, 8 insertions(+), 253 deletions(-)

New commits:
commit 6466d47b6c90804166dbe4320db9238665f46ab2
Author: Timo Aaltonen 
Date:   Tue Nov 24 13:13:48 2009 +0200

Drop pre-dependency on x11-common from libxdamage-dev. This was needed for 
upgrades from sarge.

diff --git a/debian/changelog b/debian/changelog
index 8f4eca6..c1c0a50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ libxdamage (1:1.1.2-1) UNRELEASED; urgency=low
   * Run autoreconf on build. Add build-deps on automake, libtool
 and xutils-dev.
   * Parse space-separated DEB_BUILD_OPTIONS, and handle parallel=N.
+  * Drop pre-dependency on x11-common from libxdamage-dev. This was needed
+for upgrades from sarge.
 
  -- Timo Aaltonen   Mon, 23 Nov 2009 13:59:55 +0200
 
diff --git a/debian/control b/debian/control
index 1505fba..1364c09 100644
--- a/debian/control
+++ b/debian/control
@@ -63,7 +63,6 @@ Package: libxdamage-dev
 Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libxdamage1 (= 
${binary:Version}), libx11-dev, libxfixes-dev, x11proto-damage-dev (>= 1.1)
-Pre-Depends: x11-common (>= 1:7.0.0)
 Description: X11 damaged region extension library (development headers)
  libXdamage provides an X Window System client interface to the DAMAGE
  extension to the X protocol.

commit 74adab86f72863bcea9ae3dbb81d28394e63aabb
Author: Timo Aaltonen 
Date:   Tue Nov 24 13:13:17 2009 +0200

Add libtool to bdeps.

diff --git a/debian/changelog b/debian/changelog
index 99de0bc..8f4eca6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,8 @@ libxdamage (1:1.1.2-1) UNRELEASED; urgency=low
 
   [ Timo Aaltonen ]
   * New upstream release.
-  * Run autoreconf on build. Add build-deps on automake and xutils-dev.
+  * Run autoreconf on build. Add build-deps on automake, libtool
+and xutils-dev.
   * Parse space-separated DEB_BUILD_OPTIONS, and handle parallel=N.
 
  -- Timo Aaltonen   Mon, 23 Nov 2009 13:59:55 +0200
diff --git a/debian/control b/debian/control
index 6b77686..1505fba 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Build-Depends:
  pkg-config,
  quilt,
  automake,
+ libtool,
  xutils-dev (>= 1:7.5~1)
 Standards-Version: 3.8.2
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxdamage

commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau 
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 
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 
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

libxcursor: Changes to 'debian-unstable'

2009-11-24 Thread Timo Aaltonen 
 debian/changelog  |5 -
 debian/control|2 
 debian/xsfbs/xsfbs.mk |   21 
 debian/xsfbs/xsfbs.sh |  233 --
 4 files changed, 8 insertions(+), 253 deletions(-)

New commits:
commit 52ad2a2a33ebd8e1c1cc812f300510e711f23f8f
Author: Timo Aaltonen 
Date:   Tue Nov 24 13:16:04 2009 +0200

Drop pre-dependency on x11-common from libxcursor-dev. This was needed for 
upgrades from sarge.

diff --git a/debian/changelog b/debian/changelog
index 085afac..81e90dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ libxcursor (1:1.1.10-1) UNRELEASED; urgency=low
 and xutils-dev.
   * Parse space-separated DEB_BUILD_OPTIONS, and handle parallel=N.
   * Bump Standards-Version to 3.8.3.
+  * Drop pre-dependency on x11-common from libxcursor-dev. This was needed
+for upgrades from sarge.
 
  -- Timo Aaltonen   Mon, 23 Nov 2009 13:51:43 +0200
 
diff --git a/debian/control b/debian/control
index 50f1157..67f20f7 100644
--- a/debian/control
+++ b/debian/control
@@ -52,7 +52,6 @@ Package: libxcursor-dev
 Section: libdevel
 Architecture: any
 Depends: libxcursor1 (= ${binary:Version}), x11proto-core-dev, libx11-dev, 
libxrender-dev, libxfixes-dev
-Pre-Depends: x11-common (>= 1:7.0.0)
 Description: X cursor management library (development files)
  Header files and a static version of the X cursor management library are
  provided by this package.

commit ac4c2d336562fe4a2d13c7eb71d08a192e1da87a
Author: Timo Aaltonen 
Date:   Tue Nov 24 13:14:51 2009 +0200

Add libtool to bdeps.

diff --git a/debian/changelog b/debian/changelog
index ba67f23..085afac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,7 +12,8 @@ libxcursor (1:1.1.10-1) UNRELEASED; urgency=low
 
   [ Timo Aaltonen ]
   * New upstream release.
-  * Run autoreconf on build. Add build-deps on automake and xutils-dev.
+  * Run autoreconf on build. Add build-deps on automake, libtool
+and xutils-dev.
   * Parse space-separated DEB_BUILD_OPTIONS, and handle parallel=N.
   * Bump Standards-Version to 3.8.3.
 
diff --git a/debian/control b/debian/control
index d6d65fa..50f1157 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@ Build-Depends:
  pkg-config,
  quilt,
  automake,
+ libtool,
  xutils-dev (>= 1:7.4+4)
 Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxcursor

commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau 
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 
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 
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 F

libxkbfile: Changes to 'debian-unstable'

2009-11-24 Thread Timo Aaltonen 
 debian/README.source   |   73 +++
 debian/changelog   |6 
 debian/control |4 
 debian/xsfbs/repack.sh |   32 +
 debian/xsfbs/xsfbs.mk  |   50 ++-
 debian/xsfbs/xsfbs.sh  |  311 -
 6 files changed, 126 insertions(+), 350 deletions(-)

New commits:
commit 2a52165db6ae0ff3f097d9c12524413bb290296c
Author: Timo Aaltonen 
Date:   Tue Nov 24 13:19:49 2009 +0200

Drop pre-dependency on x11-common from libxkbfile-dev. This was needed for 
upgrades from sarge.

diff --git a/debian/changelog b/debian/changelog
index e0e65cc..708fef6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ libxkbfile (1:1.0.6-1) UNRELEASED; urgency=low
   * Parse space-separated DEB_BUILD_OPTIONS, and handle parallel=N.
   * Bump Standards-Version to 3.8.3.
   * Move -dbg package to section debug.
+  * Drop pre-dependency on x11-common from libxkbfile-dev. This was needed
+for upgrades from sarge.
 
  -- Timo Aaltonen   Mon, 23 Nov 2009 14:52:02 +0200
 
diff --git a/debian/control b/debian/control
index dc1bbe1..3a8bce2 100644
--- a/debian/control
+++ b/debian/control
@@ -58,7 +58,6 @@ Package: libxkbfile-dev
 Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libxkbfile1 (= 
${binary:Version}), libx11-dev, x11proto-core-dev, x11proto-kb-dev
-Pre-Depends: x11-common (>= 1:7.0.0)
 Description: X11 keyboard file manipulation library (development headers)
  libxkbfile provides an interface to read and manipulate description files for
  XKB, the X11 keyboard configuration extension.

commit 5c79a696056e91cacdf4750b62dd8ce43a3626b8
Author: Timo Aaltonen 
Date:   Tue Nov 24 13:18:59 2009 +0200

Move -dbg package to section debug.

diff --git a/debian/changelog b/debian/changelog
index a943499..e0e65cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ libxkbfile (1:1.0.6-1) UNRELEASED; urgency=low
 and xutils-dev.
   * Parse space-separated DEB_BUILD_OPTIONS, and handle parallel=N.
   * Bump Standards-Version to 3.8.3.
+  * Move -dbg package to section debug.
 
  -- Timo Aaltonen   Mon, 23 Nov 2009 14:52:02 +0200
 
diff --git a/debian/control b/debian/control
index efd147b..dc1bbe1 100644
--- a/debian/control
+++ b/debian/control
@@ -32,7 +32,7 @@ Description: X11 keyboard file manipulation library
  git://anongit.freedesktop.org/git/xorg/lib/libxkbfile
 
 Package: libxkbfile1-dbg
-Section: libdevel
+Section: debug
 Architecture: any
 Priority: extra
 Depends: ${shlibs:Depends}, ${misc:Depends}, libxkbfile1 (= ${binary:Version})

commit 9542b978eeb5ece4d1be7d976fb926f13dcd8d57
Author: Timo Aaltonen 
Date:   Tue Nov 24 13:18:23 2009 +0200

Add libtool to bdeps.

diff --git a/debian/changelog b/debian/changelog
index f4cab46..a943499 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,8 @@ libxkbfile (1:1.0.6-1) UNRELEASED; urgency=low
 
   [ Timo Aaltonen ]
   * New upstream release.
-  * Run autoreconf on build. Add build-deps on automake and xutils-dev.
+  * Run autoreconf on build. Add build-deps on automake, libtool
+and xutils-dev.
   * Parse space-separated DEB_BUILD_OPTIONS, and handle parallel=N.
   * Bump Standards-Version to 3.8.3.
 
diff --git a/debian/control b/debian/control
index 4566229..efd147b 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Build-Depends:
  x11proto-kb-dev,
  pkg-config,
  automake,
+ libtool,
  xutils-dev (>= 1:7.5~1)
 Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxkbfile

commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau 
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 
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/

libfontenc: Changes to 'debian-unstable'

2009-11-24 Thread Timo Aaltonen 
 debian/changelog |7 +++
 debian/control   |1 -
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 750fd90201af1361dda74323632a4e81aa1de09e
Author: Timo Aaltonen 
Date:   Tue Nov 24 13:23:33 2009 +0200

Drop pre-dependency on x11-common from libfontenc-dev. This was needed for 
upgrades from sarge.

diff --git a/debian/changelog b/debian/changelog
index 241b6cf..03aa6b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libfontenc (1:1.0.5-2) UNRELEASED; urgency=low
+
+  * Drop pre-dependency on x11-common from libfontenc-dev. This was needed
+for upgrades from sarge.
+
+ -- Timo Aaltonen   Tue, 24 Nov 2009 13:22:53 +0200
+
 libfontenc (1:1.0.5-1) unstable; urgency=low
 
   [ Brice Goglin ]
diff --git a/debian/control b/debian/control
index f1c6812..957a289 100644
--- a/debian/control
+++ b/debian/control
@@ -55,7 +55,6 @@ Package: libfontenc-dev
 Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libfontenc1 (= 
${binary:Version}), zlib1g-dev
-Pre-Depends: x11-common (>= 1:7.0.0)
 Description: X11 font encoding library (development headers)
  libfontenc is a library which helps font libraries portably determine
  and deal with different encodings of fonts.


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

libxrandr: Changes to 'debian-unstable'

2009-11-24 Thread Timo Aaltonen 
 debian/README.source   |   73 +++
 debian/changelog   |9 +
 debian/control |5 
 debian/xsfbs/repack.sh |   32 +
 debian/xsfbs/xsfbs.mk  |   50 ++-
 debian/xsfbs/xsfbs.sh  |  311 -
 6 files changed, 130 insertions(+), 350 deletions(-)

New commits:
commit 09a999678504be72e50f8c686ca214834019fea8
Author: Timo Aaltonen 
Date:   Tue Nov 24 13:37:31 2009 +0200

Bump Standards-Version to 3.8.3.

diff --git a/debian/changelog b/debian/changelog
index 4720531..294a007 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libxrandr (2:1.3.0-3) UNRELEASED; urgency=low
   * Drop pre-dependency on x11-common from libxrandr-dev. This was needed
 for upgrades from sarge.
   * Move -dbg package to section debug.
+  * Bump Standards-Version to 3.8.3.
 
  -- Timo Aaltonen   Tue, 24 Nov 2009 13:34:24 +0200
 
diff --git a/debian/control b/debian/control
index 202b5be..9ce8de2 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
  automake,
  libtool,
  xutils-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxrandr
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxrandr.git
 

commit cafd6e8ce24918c5a1a7046000cdb6dc7c97c939
Author: Timo Aaltonen 
Date:   Tue Nov 24 13:36:32 2009 +0200

Fix the package name in the changelog entry.

diff --git a/debian/changelog b/debian/changelog
index 191a0fb..4720531 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 libxrandr (2:1.3.0-3) UNRELEASED; urgency=low
 
-  * Drop pre-dependency on x11-common from libxtst-dev. This was needed
+  * Drop pre-dependency on x11-common from libxrandr-dev. This was needed
 for upgrades from sarge.
   * Move -dbg package to section debug.
 

commit 31904d77f0d2e48207c28ca525074f8c91303f7e
Author: Timo Aaltonen 
Date:   Tue Nov 24 13:36:19 2009 +0200

Move -dbg package to section debug.

diff --git a/debian/changelog b/debian/changelog
index d9af76a..191a0fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libxrandr (2:1.3.0-3) UNRELEASED; urgency=low
 
   * Drop pre-dependency on x11-common from libxtst-dev. This was needed
 for upgrades from sarge.
+  * Move -dbg package to section debug.
 
  -- Timo Aaltonen   Tue, 24 Nov 2009 13:34:24 +0200
 
diff --git a/debian/control b/debian/control
index c5ceaa0..202b5be 100644
--- a/debian/control
+++ b/debian/control
@@ -39,7 +39,7 @@ Description: X11 RandR extension library
  git://anongit.freedesktop.org/git/xorg/lib/libXrandr
 
 Package: libxrandr2-dbg
-Section: libdevel
+Section: debug
 Priority: extra
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libxrandr2 (= ${binary:Version})

commit d58bb2f640d8b2a8faf1a420666cc3fe7da1a88a
Author: Timo Aaltonen 
Date:   Tue Nov 24 13:35:47 2009 +0200

Drop pre-dependency on x11-common from libxtst-dev. This was needed for 
upgrades from sarge.

diff --git a/debian/changelog b/debian/changelog
index 95d7cd3..d9af76a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libxrandr (2:1.3.0-3) UNRELEASED; urgency=low
+
+  * Drop pre-dependency on x11-common from libxtst-dev. This was needed
+for upgrades from sarge.
+
+ -- Timo Aaltonen   Tue, 24 Nov 2009 13:34:24 +0200
+
 libxrandr (2:1.3.0-2) unstable; urgency=low
 
   * libxrandr-dev depends on randrproto 1.3 (closes: #519981).  Thanks, Adrian
diff --git a/debian/control b/debian/control
index f75edb4..c5ceaa0 100644
--- a/debian/control
+++ b/debian/control
@@ -65,7 +65,6 @@ Package: libxrandr-dev
 Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libxrandr2 (= ${binary:Version}), 
libx11-dev, libxext-dev, x11proto-randr-dev (>= 1.3), libxrender-dev
-Pre-Depends: x11-common (>= 1:7.0.0)
 Description: X11 RandR extension library (development headers)
  libXrandr provides an X Window System client interface to the RandR
  extension to the X protocol.

commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau 
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=p

libdmx: Changes to 'debian-unstable'

2009-11-24 Thread Timo Aaltonen 
 debian/xsfbs/xsfbs.mk |   17 ++---
 debian/xsfbs/xsfbs.sh |4 +---
 2 files changed, 3 insertions(+), 18 deletions(-)

New commits:
commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau 
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 
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 
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".
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

libdrm: Changes to 'ubuntu'

2009-11-24 Thread Timo Aaltonen 
 debian/xsfbs/xsfbs.mk |   17 ++---
 debian/xsfbs/xsfbs.sh |4 +---
 2 files changed, 3 insertions(+), 18 deletions(-)

New commits:
commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau 
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 
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 
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".
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

libfs: Changes to 'debian-unstable'

2009-11-24 Thread Timo Aaltonen 
 debian/changelog  |7 +
 debian/control|1 
 debian/xsfbs/xsfbs.mk |   21 
 debian/xsfbs/xsfbs.sh |  233 --
 4 files changed, 10 insertions(+), 252 deletions(-)

New commits:
commit c436c5abeed42e3ad8835943acf9f779976498b3
Author: Timo Aaltonen 
Date:   Tue Nov 24 13:27:56 2009 +0200

Drop pre-dependency on x11-common from libfs-dev. This was needed for 
upgrades from sarge.

diff --git a/debian/changelog b/debian/changelog
index bd7b45c..26653b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libfs (2:1.0.2-2) UNRELEASED; urgency=low
+
+  * Drop pre-dependency on x11-common from libfs-dev. This was needed
+for upgrades from sarge.
+
+ -- Timo Aaltonen   Tue, 24 Nov 2009 13:27:15 +0200
+
 libfs (2:1.0.2-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index aca1dc3..aa3dc3d 100644
--- a/debian/control
+++ b/debian/control
@@ -50,7 +50,6 @@ Package: libfs-dev
 Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libfs6 (= ${binary:Version}), 
x11proto-core-dev, x11proto-fonts-dev
-Pre-Depends: x11-common (>= 1:7.0.0)
 Description: X11 Font Services library (development headers)
  libFS, the Font Services library, provides various functions useful to
  X11 font servers, and clients connecting to font servers.  It is not

commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau 
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 
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 
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 5693792171d885769e58d053c08b11acd12a
Author: Julien Cristau 
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
#deb

libxau: Changes to 'debian-experimental'

2009-11-24 Thread Timo Aaltonen 
 debian/README.source   |   73 +++
 debian/xsfbs/repack.sh |   32 +
 debian/xsfbs/xsfbs.mk  |   21 ---
 debian/xsfbs/xsfbs.sh  |  311 -
 4 files changed, 108 insertions(+), 329 deletions(-)

New commits:
commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau 
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 
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 
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 5693792171d885769e58d053c08b11acd12a
Author: Julien Cristau 
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 
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 err

libxext: Changes to 'debian-unstable'

2009-11-24 Thread Timo Aaltonen 
 debian/xsfbs/xsfbs.mk |   17 ++---
 debian/xsfbs/xsfbs.sh |4 +---
 2 files changed, 3 insertions(+), 18 deletions(-)

New commits:
commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau 
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 
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 
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".
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

libxdmcp: Changes to 'debian-unstable'

2009-11-24 Thread Timo Aaltonen 
 debian/README.source   |   73 +++
 debian/xsfbs/repack.sh |   32 +
 debian/xsfbs/xsfbs.mk  |   50 ++-
 debian/xsfbs/xsfbs.sh  |  311 -
 4 files changed, 119 insertions(+), 347 deletions(-)

New commits:
commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau 
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 
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 
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 5693792171d885769e58d053c08b11acd12a
Author: Julien Cristau 
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 
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

libxp: Changes to 'debian-unstable'

2009-11-24 Thread Timo Aaltonen 
 debian/README.source   |   73 +++
 debian/xsfbs/repack.sh |   32 +
 debian/xsfbs/xsfbs.mk  |   50 ++-
 debian/xsfbs/xsfbs.sh  |  311 -
 4 files changed, 119 insertions(+), 347 deletions(-)

New commits:
commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau 
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 
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 
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 5693792171d885769e58d053c08b11acd12a
Author: Julien Cristau 
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 
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

libxkbui: Changes to 'debian-unstable'

2009-11-24 Thread Timo Aaltonen 
 debian/README.source   |   73 +++
 debian/xsfbs/repack.sh |   32 +
 debian/xsfbs/xsfbs.mk  |   50 ++-
 debian/xsfbs/xsfbs.sh  |  311 -
 4 files changed, 119 insertions(+), 347 deletions(-)

New commits:
commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau 
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 
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 
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 5693792171d885769e58d053c08b11acd12a
Author: Julien Cristau 
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 
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

Bug#557795: compizconfig-python: uses pythonX.Y/site-packages for Python >= 2.6

2009-11-24 Thread Jakub Wilk 

Source: compizconfig-python
Version: 0.8.2-1
Severity: important
User: debian-pyt...@lists.debian.org
Usertags: python2.6 dist-packages

Hello,

When rebuilt against python-all{,-dev,-dbg} (and thus python2.6) from
Debian experimental, your binary packages contained these files:

[python-compizconfig_0.8.2-1_amd64.deb]
/usr/lib/python2.6/site-packages/compizconfig.so

This is an indication of a broken package: Python >= 2.6 does not
look for modules into /usr/lib/pythonX.Y/site-packages/ anymore, but
uses /usr/lib/pythonX.Y/dist-packages/ instead.

How to fix it?
==
* if your package is using python-central:
  - add "XB-Python-Version: ${python:Versions}" to all binary packages
that ship Python modules (.py files) or extensions (.so, including
_d.so) in debian/control, check if it's enough,
  - try to convert to python-support[1], check if it's enough,
* add --install-layout=deb to setup.py call and bump minimum required
  python{,-all,all-dev} build dependency to 2.5.4-1~, check if it's enough
* ask for help on #debian-python or debian-pyt...@lists.debian.org

[1] http://wiki.debian.org/DebianPython/central2support

--
Jakub Wilk



--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Processed (with 1 errors): (no subject)

2009-11-24 Thread Debian Bug Tracking System 
Processing commands for cont...@bugs.debian.org:

> forwarded 557644
Unknown command or malformed arguments to command.

> reassign 557644 xserver-xorg-core 2:1.6.5-1
Bug #557644 [gimp] gimp: Keyboard repeat interferes with space bar move
Bug reassigned from package 'gimp' to 'xserver-xorg-core'.
Bug No longer marked as found in versions gimp/2.6.7-1.
Bug #557644 [xserver-xorg-core] gimp: Keyboard repeat interferes with space bar 
move
Bug Marked as found in versions xorg-server/2:1.6.5-1.
> thanks
Stopping processing here.

Please contact me if you need assistance.

Debian bug tracking system administrator
(administrator, Debian Bugs database)


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Processed: (no subject)

2009-11-24 Thread Debian Bug Tracking System 
Processing commands for cont...@bugs.debian.org:

> notforwarded 557644
Bug #557644 [xserver-xorg-core] gimp: Keyboard repeat interferes with space bar 
move
Unset Bug forwarded-to-address
>
End of message, stopping processing here.

Please contact me if you need assistance.

Debian bug tracking system administrator
(administrator, Debian Bugs database)


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

xorg: Changes to 'ubuntu'

2009-11-24 Thread Bryce Harrington 
 debian/apport/source_xorg.py |5 +
 debian/changelog |4 ++--
 debian/x11-common.links  |4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 82bb4c47c583308b22f2de48fa3025049a9fb37d
Author: Bryce Harrington 
Date:   Tue Nov 24 11:44:48 2009 -0800

Add/update apport hooks for various packages.
Add vmware detection to apport hook

diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index 17893bd..2d372fb 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -51,6 +51,11 @@ def add_info(report):
 report['UnreportableReason'] = _('VirtualBox has installed a video 
driver which is incompatible with your version of X.org.')
 return
 
+product_name = report.get('dmi.product.name', '')
+if product_name.startswith('VMware '):
+report['UnreportableReason'] = _('VMware is installed.  If you 
upgraded recently be sure to upgrade vmware to a compatible version.')
+return
+
 attach_file(report, '/etc/X11/xorg.conf', 'XorgConf')
 attach_file(report, '/var/log/Xorg.0.log', 'XorgLog')
 attach_file(report, '/var/log/Xorg.0.log.old', 'XorgLogOld')
diff --git a/debian/changelog b/debian/changelog
index cc4b4d1..b058e45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.4+3ubuntu10) karmic; urgency=low
+xorg (1:7.4+3ubuntu10) karmic-proposed; urgency=low
 
   * local/Failsafe/failsafeXServer:  Since dexconf no longer produces
 an xorg.conf, it will neither generate a failsafe xorg.conf, so now
@@ -6,7 +6,7 @@ xorg (1:7.4+3ubuntu10) karmic; urgency=low
 session properly.
 (LP: #477149)
 
- -- Bryce Harrington   Sun, 08 Nov 2009 23:59:36 -0800
+ -- Bryce Harrington   Mon, 09 Nov 2009 15:39:57 -0800
 
 xorg (1:7.4+3ubuntu9) karmic-proposed; urgency=low
 
diff --git a/debian/x11-common.links b/debian/x11-common.links
index c75cec9..ec6d38a 100644
--- a/debian/x11-common.links
+++ b/debian/x11-common.links
@@ -8,8 +8,8 @@ usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/sou
 usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_nvidia-graphics-drivers-71.py
 usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_nvidia-graphics-drivers-96.py
 usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_nvidia-graphics-drivers-173.py
-usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_nvidia-graphics-drivers-177.py
 usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_nvidia-graphics-drivers-180.py
+usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_nvidia-graphics-drivers-common.py
 usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_fglrx-installer.py
 usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_wacom-tools.py
 usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_x11-xserver-utils.py
@@ -25,6 +25,7 @@ usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/sou
 usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_xserver-xorg-input-keyboard.py
 usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_xserver-xorg-input-mouse.py
 usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_xserver-xorg-input-synaptics.py
+usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_xserver-xorg-input-wacom.py
 usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_xserver-xorg-video-ati.py
 usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_xserver-xorg-video-fbdev.py
 usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_xserver-xorg-video-geode.py
@@ -34,7 +35,6 @@ usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/sou
 usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_xserver-xorg-video-nouveau.py
 usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_xserver-xorg-video-openchrome.py
 usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_xserver-xorg-video-psb.py
-usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_xserver-xorg-video-radeonhd.py
 usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_xserver-xorg-video-radeon.py
 usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_xserver-xorg-video-savage.py
 usr/share/apport/package-hooks/source_xorg.py 
usr/share/apport/package-hooks/source_xserver-xorg-video-sis.py


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debia

Bug#557881: xserver-xorg-input-synaptics: Please add sh4 into support architecture list

2009-11-24 Thread Nobuhiro Iwamatsu 
Package: xserver-xorg-input-synaptics
Version: 1.2.0-2
Severity: wishlist
User: debian-...@superh.org
Usertags: sh4
X-Debbugs-CC: debian-sup...@lists.debian.org

Hi,

I am now trying to run Debian on Renesas SH(sh4) CPU.
http://buildd.debian-ports.org/status/architecture.php?a=sh4

xserver-xorg-input-synaptics can build on sh4. I attached build log.

Could you add sh4 into support architecture list?

Best regards,
 Nobuhiro


xserver-xorg-input-synaptics_1.2.0-2_sh4.build
Description: Binary data

Bug#491061: mouse side buttons stopped working

2009-11-24 Thread Paul LeoNerd Evans 
Package: xserver-xorg-input-evdev
Version: 1:2.2.5-1
Severity: normal

Actually I've found even worse. My side buttons aren't reported as
buttons at all.

Strangely, something happens, just what it is that happens isn't a mouse
press event:

Normal mouse buttons do this in xev:

  ButtonPress event, serial 30, synthetic NO, window 0x321,
  root 0xdd, subw 0x0, time 2617592264, (110,89), root:(125,149),
  state 0x0, button 1, same_screen YES

  ButtonRelease event, serial 30, synthetic NO, window 0x321,
  root 0xdd, subw 0x0, time 2617592368, (110,89), root:(125,149),
  state 0x100, button 1, same_screen YES

  ButtonPress event, serial 30, synthetic NO, window 0x321,
  root 0xdd, subw 0x0, time 2617593897, (110,89), root:(125,149),
  state 0x0, button 2, same_screen YES

  ButtonRelease event, serial 30, synthetic NO, window 0x321,
  root 0xdd, subw 0x0, time 2617594084, (110,89), root:(125,149),
  state 0x200, button 2, same_screen YES

  ButtonPress event, serial 30, synthetic NO, window 0x321,
  root 0xdd, subw 0x0, time 2617594784, (110,89), root:(125,149),
  state 0x0, button 3, same_screen YES

  ButtonRelease event, serial 30, synthetic NO, window 0x321,
  root 0xdd, subw 0x0, time 2617594887, (110,89), root:(125,149),
  state 0x400, button 3, same_screen YES

The mouse wheel is reported as fake buttons 4/5:

  ButtonPress event, serial 30, synthetic NO, window 0x321,
  root 0xdd, subw 0x0, time 2617597121, (110,89), root:(125,149),
  state 0x0, button 4, same_screen YES

  ButtonRelease event, serial 30, synthetic NO, window 0x321,
  root 0xdd, subw 0x0, time 2617597121, (110,89), root:(125,149),
  state 0x800, button 4, same_screen YES

  ButtonPress event, serial 30, synthetic NO, window 0x321,
  root 0xdd, subw 0x0, time 2617597604, (110,89), root:(125,149),
  state 0x0, button 5, same_screen YES

  ButtonRelease event, serial 30, synthetic NO, window 0x321,
  root 0xdd, subw 0x0, time 2617597604, (110,89), root:(125,149),
  state 0x1000, button 5, same_screen YES

But pressing the thumb buttons yields only this:

  LeaveNotify event, serial 30, synthetic NO, window 0x321,
  root 0xdd, subw 0x0, time 2617599507, (110,89), root:(125,149),
  mode NotifyGrab, detail NotifyAncestor, same_screen YES,
  focus YES, state 0

  EnterNotify event, serial 30, synthetic NO, window 0x321,
  root 0xdd, subw 0x0, time 2617599514, (110,89), root:(125,149),
  mode NotifyUngrab, detail NotifyAncestor, same_screen YES,
  focus YES, state 0

  KeymapNotify event, serial 30, synthetic NO, window 0x0,
  keys:  4294967261 0   0   0   0   0   0   0   0   0   0   0   0   0   0   
0   
 0   0   0   0   0   0   0   0   0   0   0   0   0   0   0   0   

  LeaveNotify event, serial 30, synthetic NO, window 0x321,
  root 0xdd, subw 0x0, time 2617600275, (110,89), root:(125,149),
  mode NotifyGrab, detail NotifyAncestor, same_screen YES,
  focus YES, state 0

  EnterNotify event, serial 30, synthetic NO, window 0x321,
  root 0xdd, subw 0x0, time 2617600277, (110,89), root:(125,149),
  mode NotifyUngrab, detail NotifyAncestor, same_screen YES,
  focus YES, state 0

  KeymapNotify event, serial 30, synthetic NO, window 0x0,
  keys:  4294967261 0   0   0   0   0   0   0   0   0   0   0   0   0   0   
0   
 0   0   0   0   0   0   0   0   0   0   0   0   0   0   0   0   

-- Package-specific info:
/var/lib/x11/X.roster does not exist.

/var/lib/x11/X.md5sum does not exist.

X server symlink status:
lrwxrwxrwx 1 root root 13 Oct 25 17:44 /etc/X11/X -> /usr/bin/Xorg
-rwxr-xr-x 1 root root 1689944 Oct 13 12:31 /usr/bin/Xorg

/var/lib/x11/xorg.conf.roster does not exist.

VGA-compatible devices on PCI bus:
02:00.0 VGA compatible controller: Matrox Graphics, Inc. MGA G550 AGP (rev 01)

/var/lib/x11/xorg.conf.md5sum does not exist.

Xorg X server configuration file status:
-rw-r--r-- 1 root root 3227 Nov 14 18:05 /etc/X11/xorg.conf

Contents of /etc/X11/xorg.conf:
### BEGIN DEBCONF SECTION
# XF86Config-4 (XFree86 server configuration file) generated by dexconf, the
# Debian X Configuration tool, using values from the debconf database.
#
# Edit this file with caution, and see the XF86Config-4 manual page.
# (Type "man XF86Config-4" at the shell prompt.)
#
# If you want your changes to this file preserved by dexconf, only make changes
# before the "### BEGIN DEBCONF SECTION" line above, and/or after the
# "### END DEBCONF SECTION" line below.
#
# To change things within the debconf section, run the command:
#   dpkg-reconfigure xserver-xfree86
# as root.  Also see "How do I add custom sections to a dexconf-generated
# XF86Config or XF86Config-4 file?" in /usr/share/doc/xfree86-common/FAQ.gz.

Section "Files"
FontPath"/usr/share/fonts/truetype"

FontPath"/usr/share/fonts/X11/misc"