from:"David Nusinow"

libxau: Changes to 'debian-unstable'

2009-09-14 Thread David Nusinow

 debian/README.source   |   73 +++
 debian/changelog   |6 
 debian/xsfbs/repack.sh |   32 +
 debian/xsfbs/xsfbs.mk  |4 
 debian/xsfbs/xsfbs.sh  |  307 -
 5 files changed, 111 insertions(+), 311 deletions(-)

New commits:
commit 60f54733e8e9d826b9af6d5c104154679b8a076f
Author: David Nusinow dnusi...@debian.org
Date:   Wed Aug 26 23:33:22 2009 -0400

Update xsfbs to 5693792171d885769e58d053c08b11acd12a

diff --git a/debian/changelog b/debian/changelog
index f27ce6d..1c8527e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxau (1:1.0.4-3) UNRELEASED; urgency=low
+
+  * Update xsfbs to 5693792171d885769e58d053c08b11acd12a
+
+ -- David Nusinow dnusi...@debian.org  Wed, 26 Aug 2009 23:33:22 -0400
+
 libxau (1:1.0.4-2) unstable; urgency=low
 
   * Upload to unstable.

commit 5693792171d885769e58d053c08b11acd12a
Author: Julien Cristau jcris...@debian.org
Date:   Wed Aug 26 18:53:36 2009 +0200

xsfbs.mk: no need for shlibs.local

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index f0f8953..1f86848 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -265,10 +265,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
#debian/*.prerm
$@
 
-# Generate the shlibs.local file.
-debian/shlibs.local:
-   cat debian/*.shlibs $@
-
 SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2/dev/null)
 VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2/dev/null)
 INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2/dev/null)

commit 1f858adff1ce2687cf542dd9b69b81137412f8a4
Author: Julien Cristau jcris...@debian.org
Date:   Wed Aug 26 18:47:09 2009 +0200

xsfbs.sh: remove unused reject_whitespace function

diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index b3f4bbe..45acd59 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -93,22 +93,6 @@ reject_nondigits () {
   done
 }
 
-reject_whitespace () {
-  # syntax: reject_whitespace [ operand ]
-  #
-  # scan operand (typically a shell variable whose value cannot be trusted) for
-  # whitespace characters and barf if any are found
-  if [ -n $1 ]; then
-# does the operand contain any whitespace?
-if expr $1 : [[:space:]]  /dev/null 21; then
-  # can't use die(), because I want to avoid forward references
-  echo $THIS_PACKAGE $THIS_SCRIPT error: reject_whitespace() encountered 
\
-   possibly malicious garbage \$1\ 2
-  exit $SHELL_LIB_THROWN_ERROR
-fi
-  fi
-}
-
 reject_unlikely_path_chars () {
   # syntax: reject_unlikely_path_chars [ operand ... ]
   #

commit 0dd71e12416aa7dc60ed68af8127e04609b125f4
Author: Julien Cristau jcris...@debian.org
Date:   Wed Aug 26 18:23:53 2009 +0200

xsfbs.sh: remove unused find_culprits function

diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 7dbb196..b3f4bbe 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -199,53 +199,6 @@ usage_error () {
   exit $SHELL_LIB_USAGE_ERROR
 }
 
-find_culprits () {
-  local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \
-msg
-
-  reject_whitespace $1
-  message Searching for overlapping packages...
-  dpkg_info_dir=/var/lib/dpkg/info
-  if [ -d $dpkg_info_dir ]; then
-if [ $(echo $dpkg_info_dir/*.list) != $dpkg_info_dir/*.list ]; then
-  possible_culprits=$(ls -1 $dpkg_info_dir/*.list | egrep -v \
-(xbase-clients|x11-common|xfs|xlibs))
-  if [ -n $possible_culprits ]; then
-smoking_guns=$(grep -l $1 $possible_culprits || true)
-if [ -n $smoking_guns ]; then
-  bad_packages=$(printf \\n)
-  for f in $smoking_guns; do
-# too bad you can't nest parameter expansion voodoo
-p=${f%*.list}  # strip off the trailing .list
-package=${p##*/}   # strip off the directories
-bad_packages=$(printf %s\n%s $bad_packages $package)
-  done
-  msg=$(cat EOF
-The following packages appear to have file overlaps with the X.Org packages;
-these packages are either very old, or in violation of Debian Policy.  Try
-upgrading each of these packages to the latest available version if possible:
-for example, with the command apt-get install.  If no newer version of a
-package is available, you will have to remove it; for example, with the command
-apt-get remove.  If even the latest available version of the package has
-this file overlap, please file a bug against that package with the Debian Bug
-Tracking System.  You may want to refer the package maintainer to section 12.8
-of the Debian Policy manual.
-EOF
-)
-  message $msg
-  message The overlapping packages are: $bad_packages
-else
-  message no overlaps found.
-fi
-  fi
-else
-  message cannot search; no matches for $dpkg_info_dir/*.list.
-fi
-  else
-message

libxau: Changes to 'upstream-unstable'

2009-09-14 Thread David Nusinow

 .gitignore  |5 +
 AuLock.c|   30 ++--
 Makefile.am |6 -
 README  |4 -
 configure.ac|   21 +
 include/.gitignore  |1 
 include/X11/Xauth.h |   17 
 k5encode.c  |  186 
 8 files changed, 36 insertions(+), 234 deletions(-)

New commits:
commit 825435514bd91d0d903247c46249a87d6fe8ae09
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Fri Aug 28 14:34:32 2009 +1000

libXau 1.0.5

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net

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

commit fc54a4f03b926dfdb590b112c7128516ffc25539
Author: Jeremy Huddleston jer...@yuffie.local
Date:   Sun Feb 22 11:14:04 2009 -0800

Make file locking more robust for network shares like AFP

diff --git a/AuLock.c b/AuLock.c
index 0012356..69b1fd6 100644
--- a/AuLock.c
+++ b/AuLock.c
@@ -90,14 +90,28 @@ longdead)
(void) close (creat_fd);
}
if (creat_fd != -1) {
-   if (link (creat_name, link_name) != -1)
-   return LOCK_SUCCESS;
-   if (errno == ENOENT) {
-   creat_fd = -1;  /* force re-creat next time around */
-   continue;
-   }
-   if (errno != EEXIST)
-   return LOCK_ERROR;
+#ifndef X_NOT_POSIX
+   /* The file system may not support hard links, and pathconf should 
tell us that. */
+   if (1 == pathconf(creat_name, _PC_LINK_MAX)) {
+   if (-1 == rename(creat_name, link_name)) {
+   /* Is this good enough?  Perhaps we should retry.  TEST */
+   return LOCK_ERROR;
+   } else {
+   return LOCK_SUCCESS;
+   }
+   } else {
+#endif
+   if (link (creat_name, link_name) != -1)
+   return LOCK_SUCCESS;
+   if (errno == ENOENT) {
+   creat_fd = -1;  /* force re-creat next time around */
+   continue;
+   }
+   if (errno != EEXIST)
+   return LOCK_ERROR;
+#ifndef X_NOT_POSIX
+  }
+#endif
}
(void) sleep ((unsigned) timeout);
--retries;

commit 742ff03dcad4d16ca8901ed47be91b303523a385
Author: Alan Coopersmith alan.coopersm...@sun.com
Date:   Fri Feb 6 11:35:40 2009 -0800

Restore FamilyKrb5Principal definition

Even if Kerberos5 support is currently unimplemented in the X server 
libXau, the Family id for the X11 protocol is still defined and reserved
for Kerberos5, and should be recorded here for interoperability with
other implementations and to avoid reuse if someone adds a new
authentication family in the future.

Signed-off-by: Alan Coopersmith alan.coopersm...@sun.com

diff --git a/include/X11/Xauth.h b/include/X11/Xauth.h
index 741da24..ace975d 100644
--- a/include/X11/Xauth.h
+++ b/include/X11/Xauth.h
@@ -53,6 +53,7 @@ typedef struct xauth {
 # define FamilyLocal (256) /* not part of X standard (i.e. X.h) */
 # define FamilyWild  (65535)
 # define FamilyNetname(254)   /* not part of X standard */
+# define FamilyKrb5Principal (253) /* Kerberos 5 principal name */
 # define FamilyLocalHost (252) /* for local non-net authentication */
 
 

commit c147fb417582e7384b5464bb53cfd492f9d7c69d
Author: Paulo Cesar Pereira de Andrade p...@mandriva.com.br
Date:   Mon Feb 2 16:54:20 2009 -0200

Remove old api kerberos.

  LibXau uses a 1993 kerberos api, but the X Server side support has
been already removed for quite some time.
  This corrects bug report
https://bugs.freedesktop.org/show_bug.cgi?id=14684

diff --git a/Makefile.am b/Makefile.am
index f877dbc..01e2414 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,10 +18,6 @@ libXau_la_SOURCES = \
AuUnlock.c \
AuWrite.c
 
-if KERBEROS
-libXau_la_SOURCES +=k5encode.c
-endif KERBEROS
-
 xauincludedir=$(includedir)/X11
 
 xauinclude_HEADERS = include/X11/Xauth.h
diff --git a/README b/README
index 404eef0..9ee12e7 100644
--- a/README
+++ b/README
@@ -39,9 +39,7 @@ This scheme involves changes to the following parts of the 
sample release:
-  remove entries from user's auth file
 
 This mechanism assumes that the superuser and the transport layer between 
-the client and the server is secure.  Organizations that desire stricter
-security are encouraged to look at systems such as Kerberos (at Project
-Athena).
+the client and the server is secure.
 
 
 Description
diff --git a/configure.ac

libxau: Changes to 'debian-unstable'

2009-09-14 Thread David Nusinow

 .gitignore  |5 +
 AuLock.c|   30 ++--
 ChangeLog   |   45 
 Makefile.am |6 -
 README  |4 -
 autogen.sh  |   12 ---
 configure.ac|   21 +
 debian/changelog|7 +
 debian/control  |4 -
 include/.gitignore  |1 
 include/X11/Xauth.h |   17 
 k5encode.c  |  186 
 12 files changed, 88 insertions(+), 250 deletions(-)

New commits:
commit e2f6aa41a0033ea0ad5e33974121fc4c46cced38
Author: David Nusinow dnusi...@debian.org
Date:   Mon Sep 14 21:55:56 2009 -0400

Delete autogen.sh, which gets installed at build time

diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index 904cd67..000
--- a/autogen.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-
-srcdir=`dirname $0`
-test -z $srcdir  srcdir=.
-
-ORIGDIR=`pwd`
-cd $srcdir
-
-autoreconf -v --install || exit 1
-cd $ORIGDIR || exit $?
-
-$srcdir/configure --enable-maintainer-mode $@
diff --git a/debian/changelog b/debian/changelog
index 8e27f3e..21ec052 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libxau (1:1.0.5-1) unstable; urgency=low
   * Update xsfbs to 5693792171d885769e58d053c08b11acd12a
 + README.source lets us bump standards version to 3.8.3.0
   * Change -dbg package to debug section
+  * Delete autogen.sh, which gets installed at build time
 
  -- David Nusinow dnusi...@debian.org  Mon, 14 Sep 2009 21:37:57 -0400
 

commit 7bd83288bd40a3d8c91b5ef0cd85688b6f93619d
Author: David Nusinow dnusi...@debian.org
Date:   Mon Sep 14 21:38:12 2009 -0400

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 18deca1..8e27f3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libxau (1:1.0.5-1) UNRELEASED; urgency=low
+libxau (1:1.0.5-1) unstable; urgency=low
 
   * Update xsfbs to 5693792171d885769e58d053c08b11acd12a
 + README.source lets us bump standards version to 3.8.3.0
   * Change -dbg package to debug section
 
- -- David Nusinow dnusi...@debian.org  Wed, 26 Aug 2009 23:33:22 -0400
+ -- David Nusinow dnusi...@debian.org  Mon, 14 Sep 2009 21:37:57 -0400
 
 libxau (1:1.0.4-2) unstable; urgency=low
 

commit 9b84fcb189e042efbe1c8e529f5b79d5e75def99
Author: David Nusinow dnusi...@debian.org
Date:   Mon Sep 14 21:37:02 2009 -0400

Update changelog

diff --git a/ChangeLog b/ChangeLog
index c22272d..4be0c2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,48 @@
+commit 825435514bd91d0d903247c46249a87d6fe8ae09
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Fri Aug 28 14:34:32 2009 +1000
+
+libXau 1.0.5
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit fc54a4f03b926dfdb590b112c7128516ffc25539
+Author: Jeremy Huddleston jer...@yuffie.local
+Date:   Sun Feb 22 11:14:04 2009 -0800
+
+Make file locking more robust for network shares like AFP
+
+commit 742ff03dcad4d16ca8901ed47be91b303523a385
+Author: Alan Coopersmith alan.coopersm...@sun.com
+Date:   Fri Feb 6 11:35:40 2009 -0800
+
+Restore FamilyKrb5Principal definition
+
+Even if Kerberos5 support is currently unimplemented in the X server 
+libXau, the Family id for the X11 protocol is still defined and reserved
+for Kerberos5, and should be recorded here for interoperability with
+other implementations and to avoid reuse if someone adds a new
+authentication family in the future.
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@sun.com
+
+commit c147fb417582e7384b5464bb53cfd492f9d7c69d
+Author: Paulo Cesar Pereira de Andrade p...@mandriva.com.br
+Date:   Mon Feb 2 16:54:20 2009 -0200
+
+Remove old api kerberos.
+
+  LibXau uses a 1993 kerberos api, but the X Server side support has
+been already removed for quite some time.
+  This corrects bug report
+https://bugs.freedesktop.org/show_bug.cgi?id=14684
+
+commit 11fbe620625520668f5e88e4f5a8fe149a7cfa3f
+Author: Paulo Cesar Pereira de Andrade p...@mandriva.com.br
+Date:   Thu Jan 29 15:08:23 2009 -0200
+
+Janitor: Correct make distcheck and remove extra .gitignore file.
+
 commit 7f6275300243fd15ce974d1b5e478b47f7758485
 Author: Alan Coopersmith alan.coopersm...@sun.com
 Date:   Tue Aug 26 14:19:19 2008 -0700

commit 63b6c244adf5ffcb64cf5f1b4a5bf48b9d02bbba
Author: David Nusinow dnusi...@debian.org
Date:   Mon Sep 14 21:34:46 2009 -0400

Move -dbg package to debug section

Also update package version number

diff --git a/debian/changelog b/debian/changelog
index 410b32c..18deca1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
-libxau (1:1.0.4-3) UNRELEASED; urgency=low
+libxau (1:1.0.5-1) UNRELEASED; urgency=low
 
   * Update xsfbs to 5693792171d885769e58d053c08b11acd12a
 + README.source lets us bump standards version to 3.8.3.0
+  * Change -dbg package to debug section
 
  -- David Nusinow dnusi...@debian.org  Wed, 26 Aug 2009 23

libxau: Changes to 'refs/tags/libxau-1_1.0.5-1'

2009-09-14 Thread David Nusinow

Tag 'libxau-1_1.0.5-1' created by David Nusinow dnusi...@debian.org at 
2009-09-15 02:39 +

Tagging upload of libxau-1_1.0.5-1 to unstable.

Changes since libxau-1_1.0.4-2:
Alan Coopersmith (1):
  Restore FamilyKrb5Principal definition

David Nusinow (9):
  Add README.source
  Merge xsfbs in to debian-unstable
  Update xsfbs to 5693792171d885769e58d053c08b11acd12a
  Merge branch 'upstream-unstable' into debian-unstable
  README.source lets us bump standards version to 3.8.3.0
  Move -dbg package to debug section
  Update changelog
  Prepare changelog for upload
  Delete autogen.sh, which gets installed at build time

Jeremy Huddleston (1):
  Make file locking more robust for network shares like AFP

Julien Cristau (11):
  xsfbs: add a repack script for uscan
  xsfbs.sh: kill {,de}register_x_lib_dir_with_ld_so
  xsfbs: repack.sh needs to be executable
  xsfbs: don't run dpkg --print-installation-architecture
  Kill custom readlink function
  xsfbs.sh: remove unused check_symlinks_and_{bomb,warn}
  xsfbs.sh: remove unused analyze_path
  xsfbs.sh: remove unused maplink function
  xsfbs.sh: remove unused find_culprits function
  xsfbs.sh: remove unused reject_whitespace function
  xsfbs.mk: no need for shlibs.local

Paulo Cesar Pereira de Andrade (2):
  Janitor: Correct make distcheck and remove extra .gitignore file.
  Remove old api kerberos.

Peter Hutterer (1):
  libXau 1.0.5

---
 .gitignore |5 
 AuLock.c   |   30 +++-
 ChangeLog  |   45 +++
 Makefile.am|6 
 README |4 
 autogen.sh |   12 -
 configure.ac   |   21 +--
 debian/README.source   |   73 +++
 debian/changelog   |9 +
 debian/control |4 
 debian/xsfbs/repack.sh |   32 +
 debian/xsfbs/xsfbs.mk  |4 
 debian/xsfbs/xsfbs.sh  |  307 -
 include/.gitignore |1 
 include/X11/Xauth.h|   17 --
 k5encode.c |  186 -
 16 files changed, 197 insertions(+), 559 deletions(-)
---


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

libxau: Changes to 'debian-unstable'

2009-09-14 Thread David Nusinow

 debian/changelog |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 583bb98f9359d4bd2de2f24efae379ba67b2fae7
Author: David Nusinow dnusi...@debian.org
Date:   Mon Sep 14 22:39:31 2009 -0400

Document new upstream version in debian/changelog

I missed this in the uploaded version, so it's getting added in for future
posterity. Oops.

diff --git a/debian/changelog b/debian/changelog
index 21ec052..9648e07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 libxau (1:1.0.5-1) unstable; urgency=low
 
+  * New upstream release
   * Update xsfbs to 5693792171d885769e58d053c08b11acd12a
 + README.source lets us bump standards version to 3.8.3.0
   * Change -dbg package to debug section


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

doc-hackers: Changes to 'master'

2009-09-13 Thread David Nusinow

 mrconfig |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit bbfada0bbc799c80e6537941b75e659797898136
Author: David Nusinow dnusi...@debian.org
Date:   Sun Sep 13 19:27:15 2009 -0400

Fix checkout target for things not in the app subdir

diff --git a/mrconfig b/mrconfig
index f7c14bb..52144ab 100644
--- a/mrconfig
+++ b/mrconfig
@@ -2,7 +2,8 @@
 [DEFAULT]
 git_gc = git gc $@
 checkout = REPONAME=`basename $MR_REPO`;
-  git clone git+ssh://dnusi...@git.debian.org/git/pkg-xorg/app/$REPONAME 
+  REPOCATEGORY=`echo $MR_REPO | perl -na -F'/' -e 'print $F[-3]'`
+  git clone 
git+ssh://dnusi...@git.debian.org/git/pkg-xorg/$REPOCATEGORY/$REPONAME 
   cd $MR_REPO 
   git remote add xsfbs git+ssh://dnusi...@git.debian.org/git/pkg-xorg/xsfbs 
   git remote update xsfbs 


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

Re: xkb-data: Changes to 'debian-unstable'

2009-09-03 Thread David Nusinow


Julien Cristau wrote:

On Thu, Sep  3, 2009 at 01:50:05 +, David Nusinow wrote:

  

diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/rules b/debian/rules
index d237d45..7a61b23 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,7 @@ endif
 xkb_base := /usr/share/X11/xkb
 
 configure: $(STAMP_DIR)/patch

+   dh_prep
intltoolize -c -f
autoreconf -vfi
 


I don't think dh_prep belongs here.  AFAIK it belongs in the install
target.
  

Pasted from the dh_prep manpage:

DESCRIPTION
  dh_prep is a debhelper program that performs some file cleanups in
  preparation for building a package. (This is what dh_clean -k used to
  do.)  It removes the package build directories, debian/tmp, and some
  temp files that are generated during the build. Putting this at the
  start of the build process makes the build process idempotent.


So the documentation talks about it as being for cleanups prior to 
building the package. Is there a reason this should go in the install 
target? It's entirely possible that there's some interaction between the 
Makefile targets that I'm missing that makes it optimal to add to the 
install target as well.



Also, is there any particular reason for bumping the debhelper compat
level?  I've been holding off on moving to something  5 unless I was
using the new dh stuff, so far.
  


There's no major need, but I'd rather stay on top of it so we don't have 
to worry about updating it later when v5 becomes deprecated. Since no 
one seems to be particularly interested in backporting these X packages 
to the current stable it shouldn't cause any real problems. It's not a 
big deal though and if you'd rather stay at v5 and above (v4 is 
currently deprecated) I'm fine with that.


- David Nusinow


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

Re: xkb-data: Changes to 'debian-unstable'

2009-09-03 Thread David Nusinow

Julien Cristau wrote:

Hi David,

On Thu, Sep 3, 2009 at 07:50:03 -0400, David Nusinow wrote:

Pasted from the dh_prep manpage:

DESCRIPTION
dh_prep is a debhelper program that performs some file cleanups in
preparation for building a package. (This is what dh_clean -k used to
do.) It removes the package build directories, debian/tmp, and some
temp files that are generated during the build. Putting this at the
start of the build process makes the build process idempotent.

So the documentation talks about it as being for cleanups prior to
building the package. Is there a reason this should go in the
install target? It's entirely possible that there's some interaction
between the Makefile targets that I'm missing that makes it optimal
to add to the install target as well.

Building the package here means building the debs, aiui. dh_prep
removes the debian/tmp and debian/$package directories, which are
created by make install and dh_install, so you'd call it right before
make install to remove any files remaining in case of calling
'debian/rules binary' twice in a row, without 'debian/rules clean' in
between.

That's reasonable, but my worry with that is that you're deleting part
of the build tree mid-build, which I imagine could cause some issues in
theory. I'm fine with reverting the change and just replacing dh_clean
-k with dh_prep. I'll also file a bug against debhelper asking for
clarification and a better explanation in the docs. I won't be able to
do this until I get home after work this evening though.

Also, is there any particular reason for bumping the debhelper compat
level? I've been holding off on moving to something 5 unless I was
using the new dh stuff, so far.

There's no major need, but I'd rather stay on top of it so we don't
have to worry about updating it later when v5 becomes deprecated.
Since no one seems to be particularly interested in backporting
these X packages to the current stable it shouldn't cause any real
problems. It's not a big deal though and if you'd rather stay at v5
and above (v4 is currently deprecated) I'm fine with that.

Agreed that it's not a big deal, lenny has debhelper 7.0.15 anyway. I'm
actually interested in the new options in debhelper 7.3 which could make
our rules files way simpler. I've played with it a bit a while ago, see
http://git.debian.org/?p=users/jcristau/libx11.git;a=commitdiff;h=ca0bf64774deaa904570413062d8a4345f22ceda
for example (comments welcome, btw).

I've been putting off switching to dh because it's been a low priority,
and I worry about the cdbs-ness of the thing. It looks like dh does
create a logfile as it strings together the dh_* commands though, which
would hopefully make it less opaque. The shortened rules file is
appealing though, especially for some of the simpler packages like the
protocol headers. To give a full critique I'll have to spend some time
learning dh, which I'll do if this is something you want to push forward on.

- David Nusinow

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

Bug#544902: libdrm2 : /dev/dri not created

2009-09-03 Thread David Nusinow


reassign  544902 fglrx-driver
thanks

Matt Olson wrote:

Package:  libdrm2
Version  :  2.4.12-1

O.S.   : Debian Testing
Kernel : 2.6.30-1-amd64

After upgrading libdrm2 from version 2.3.1-2 to version 2.4.12-1, udev 
does not create /dev/dri.


I am using ATI's Catalyst 9.8 driver for linux AMD64  (which gets loaded).

(II) LoadModule: fglrx
(II) Loading /usr/lib/xorg/modules/drivers//fglrx_drv.so
(II) Module fglrx: vendor=FireGL - ATI Technologies Inc.
compiled for 7.1.0, module version = 8.64.3
Module class: X.Org Video Driver

The dri module also loads :

 Loading /usr/lib/xorg/modules/extensions//libdri.so
(II) Module dri: vendor=X.Org Foundation
compiled for 7.1.0, module version = 1.0.0
ABI class: X.Org Server Extension, version 0.3
(II) Loading extension XFree86-DRI

Reverting to libdrm2 2.3.1-2 fixes the problem.

Thank you,

  Matt Olson


We can't support closed-source drivers. Reassigning to the right package.

- David Nusinow




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

xkb-data: Changes to 'debian-unstable'

2009-09-03 Thread David Nusinow

 debian/changelog |2 +-
 debian/rules |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 918a5f48aa10c515f0f6cb4d798c9181025e53ad
Author: David Nusinow dnusi...@debian.org
Date:   Thu Sep 3 20:10:03 2009 -0400

Put dh_clean's back and replace dh_clean -k with dh_prep

diff --git a/debian/changelog b/debian/changelog
index 36c816c..87894ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,7 @@ xkeyboard-config (1.6-2) UNRELEASED; urgency=low
   * Add a note about re-enabling ctrl-alt-backspace killing to NEWS.Debian.
   * Update xsfbs to 5693792171d885769e58d053c08b11acd12a
   * Update to debhelper version 7
-+ Fix up dh_clean calls
++ Fix up dh_clean -k to use dh_prep instead
   * Update standards version to 3.8.3.0. No changes necessary.
 
   [ Julien Cristau ]
diff --git a/debian/rules b/debian/rules
index 7a61b23..ea198e9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,6 @@ endif
 xkb_base := /usr/share/X11/xkb
 
 configure: $(STAMP_DIR)/patch
-   dh_prep
intltoolize -c -f
autoreconf -vfi
 
@@ -50,10 +49,10 @@ clean: xsfclean
-rm -f intltool-extract intltool-merge intltool-update
-rm -f rules/base.xml
-rm -f po/.intltool-merge-cache config.status.lineno
+   dh_clean
rm -f compat/compat.dir geometry/geometry.dir keycodes/keycodes.dir
rm -f keymap/keymap.dir symbols/symbols.dir types/types.dir rules/base
rm -f rules/compat/base.l[2-4]*.part rules/compat/base.m*.part
-   dh_clean 
 
 deb:
dpkg-buildpackage -rfakeroot -i'/\.git|/\.svn'
@@ -71,6 +70,7 @@ dir:
 install: build
dh_testdir
dh_testroot
+   dh_prep
dh_installdirs
 
$(MAKE) install DESTDIR=$(CURDIR)/debian/xkb-data


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

xcursor-themes: Changes to 'debian-unstable'

2009-09-03 Thread David Nusinow

 debian/changelog |3 ++-
 debian/rules |2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit a556cc6392ae6dc9b82ce639429cc6ceae98d87d
Author: David Nusinow dnusi...@debian.org
Date:   Thu Sep 3 20:14:21 2009 -0400

Put dh_clean -k back where it belongs but use dh_prep instead

diff --git a/debian/changelog b/debian/changelog
index 9351af7..f3a74d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
 xcursor-themes (1.0.1-7) UNRELEASED; urgency=low
 
   * Update xsfbs to 5693792171d885769e58d053c08b11acd12a
-
+  * Put dh_clean -k back where it belongs but use dh_prep instead
+  
  -- David Nusinow dnusi...@debian.org  Wed, 26 Aug 2009 23:27:08 -0400
 
 xcursor-themes (1.0.1-6) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 63fc576..f839af2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,7 +34,6 @@ endif
 
 configure:
dh_testdir
-   dh_prep
autoreconf -vfi
 
 build: build-stamp
@@ -70,6 +69,7 @@ clean: xsfclean cleanscripts
 install: build
dh_testdir
dh_testroot
+   dh_prep
dh_installdirs
 
cd obj-$(DEB_BUILD_GNU_TYPE)  $(MAKE) DESTDIR=$(CURDIR)/debian/tmp 
install


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

xorg: Changes to 'debian-unstable'

2009-09-03 Thread David Nusinow

 debian/changelog |4 ++--
 debian/rules |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit f35f44fdf4e933f3078e09d4862155baa03dbe3e
Author: David Nusinow dnusi...@debian.org
Date:   Thu Sep 3 20:20:29 2009 -0400

Revert dh_clean change from last upload but use dh_prep instead

diff --git a/debian/changelog b/debian/changelog
index 77cbb7d..70b0be5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
 xorg (1:7.4+5) UNRELEASED; urgency=low
 
   * Update xsfbs to 5693792171d885769e58d053c08b11acd12a
-
+  * Revert dh_clean change from last upload but use dh_prep instead
+  
  -- David Nusinow dnusi...@debian.org  Wed, 26 Aug 2009 23:27:18 -0400
 
 xorg (1:7.4+4) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 0e86a55..e0902f4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -76,7 +76,7 @@ install-stamp: build-stamp
dh_testdir
dh_testroot
umask 022
-   dh_clean -k
+   dh_prep
chmod 755 debian/local/debian-setup-keyboard
touch $@
 

commit c782fddc35aa8632ea22260b70de05dad00b94ef
Author: David Nusinow dnusi...@debian.org
Date:   Thu Sep 3 20:19:21 2009 -0400

Revert Remove obsolete and misplaced -k flag on a dh_clean

This reverts commit 554513e48c54e0cd3a2d5dfcae8b770ccfe7b6bd.

diff --git a/debian/changelog b/debian/changelog
index 78978ac..77cbb7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,7 +27,6 @@ xorg (1:7.4+4) unstable; urgency=low
   * Bump debhelper compat to v7. No changes necessary.
   * Rename stamps to take advantage of dh_clean v7 handling them automatically
   * Bump standards version to 3.8.2. No changes necessary.
-  * Remove obsolete and misplaced -k flag on a dh_clean
   
  -- David Nusinow dnusi...@debian.org  Thu, 13 Aug 2009 21:19:12 -0400
 
diff --git a/debian/rules b/debian/rules
index 5c26be2..0e86a55 100755
--- a/debian/rules
+++ b/debian/rules
@@ -76,7 +76,7 @@ install-stamp: build-stamp
dh_testdir
dh_testroot
umask 022
-   dh_clean
+   dh_clean -k
chmod 755 debian/local/debian-setup-keyboard
touch $@
 


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

xkb-data: Changes to 'debian-unstable'

2009-09-02 Thread David Nusinow

 debian/NEWS  |2 +-
 debian/changelog |7 ---
 debian/compat|2 +-
 debian/control   |4 ++--
 debian/rules |4 ++--
 5 files changed, 10 insertions(+), 9 deletions(-)

New commits:
commit 9f64961ef09f3f6f576f08cc23158e11bdca47d1
Author: David Nusinow dnusi...@debian.org
Date:   Wed Sep 2 21:34:07 2009 -0400

Fix whitespace in NEWS entry

diff --git a/debian/NEWS b/debian/NEWS
index 77d7814..b14e13b 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -5,6 +5,6 @@ xkeyboard-config (1.6-2) unstable; urgency=low
 would like to re-enable this feature, you may do so in your
 desktop's Keyboard Preferences application. You may also enable it
 for the current session using the command 
-   setxkbmap -option terminate:ctrl_alt_bksp.
+setxkbmap -option terminate:ctrl_alt_bksp.
 
  -- David Nusinow dnusi...@debian.org  Tue, 25 Aug 2009 12:52:38 -0400

commit b727063edd684fbd2dd6146478e3defece169545
Author: David Nusinow dnusi...@debian.org
Date:   Wed Sep 2 21:26:46 2009 -0400

Bump debhelper build-dep to 7

diff --git a/debian/control b/debian/control
index 593cf02..b7fef9e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: extra
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: Mohammed Adnène Trojette adn+...@diwi.org, Julien Cristau 
jcris...@debian.org
-Build-Depends: debhelper (= 5.0.0), quilt
+Build-Depends: debhelper (= 7.0.0), quilt
 Build-Depends-Indep: libxml-parser-perl, x11-xkb-utils, automake, intltool, 
libglib2.0-dev
 Standards-Version: 3.8.3.0
 Vcs-Git: git://git.debian.org/git/pkg-xorg/data/xkb-data

commit d3b24dc3f3c2d59beffe65f8271902c0a99d9d77
Author: David Nusinow dnusi...@debian.org
Date:   Wed Sep 2 21:20:42 2009 -0400

Update standards version to 3.8.3.0. No changes necessary.

diff --git a/debian/changelog b/debian/changelog
index b234f75..36c816c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ xkeyboard-config (1.6-2) UNRELEASED; urgency=low
   * Update xsfbs to 5693792171d885769e58d053c08b11acd12a
   * Update to debhelper version 7
 + Fix up dh_clean calls
+  * Update standards version to 3.8.3.0. No changes necessary.
 
   [ Julien Cristau ]
   * Don't install base.xml in /etc/X11/xkb.  Modifying this creates more
diff --git a/debian/control b/debian/control
index 01df4b4..593cf02 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: Mohammed Adnène Trojette adn+...@diwi.org, Julien Cristau 
jcris...@debian.org
 Build-Depends: debhelper (= 5.0.0), quilt
 Build-Depends-Indep: libxml-parser-perl, x11-xkb-utils, automake, intltool, 
libglib2.0-dev
-Standards-Version: 3.8.1
+Standards-Version: 3.8.3.0
 Vcs-Git: git://git.debian.org/git/pkg-xorg/data/xkb-data
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/data/xkb-data.git
 Homepage: http://www.freedesktop.org/Software/XKeyboardConfig

commit 3c76eadca60c8c8a0380f3fe290db21e7fe615fe
Author: David Nusinow dnusi...@debian.org
Date:   Wed Sep 2 21:14:44 2009 -0400

Update to debhelper version 7

Fix up dh_clean calls

diff --git a/debian/changelog b/debian/changelog
index 7098317..b234f75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ xkeyboard-config (1.6-2) UNRELEASED; urgency=low
   [ David Nusinow ]
   * Add a note about re-enabling ctrl-alt-backspace killing to NEWS.Debian.
   * Update xsfbs to 5693792171d885769e58d053c08b11acd12a
+  * Update to debhelper version 7
++ Fix up dh_clean calls
 
   [ Julien Cristau ]
   * Don't install base.xml in /etc/X11/xkb.  Modifying this creates more
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/rules b/debian/rules
index d237d45..7a61b23 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,7 @@ endif
 xkb_base := /usr/share/X11/xkb
 
 configure: $(STAMP_DIR)/patch
+   dh_prep
intltoolize -c -f
autoreconf -vfi
 
@@ -49,10 +50,10 @@ clean: xsfclean
-rm -f intltool-extract intltool-merge intltool-update
-rm -f rules/base.xml
-rm -f po/.intltool-merge-cache config.status.lineno
-   dh_clean 
rm -f compat/compat.dir geometry/geometry.dir keycodes/keycodes.dir
rm -f keymap/keymap.dir symbols/symbols.dir types/types.dir rules/base
rm -f rules/compat/base.l[2-4]*.part rules/compat/base.m*.part
+   dh_clean 
 
 deb:
dpkg-buildpackage -rfakeroot -i'/\.git|/\.svn'
@@ -70,7 +71,6 @@ dir:
 install: build
dh_testdir
dh_testroot
-   dh_clean -k 
dh_installdirs
 
$(MAKE) install DESTDIR=$(CURDIR)/debian/xkb-data

commit 7040420121b63ddcd9661c814d2f63e8bb72b55b
Author: David Nusinow dnusi...@debian.org
Date:   Wed Sep 2 21:05:38 2009 -0400

Fix up changelog a bit

diff --git a/debian/changelog b/debian/changelog
index

xfonts-base: Changes to 'debian-unstable'

2009-09-02 Thread David Nusinow

 debian/README.source  |   73 +++
 debian/changelog  |8 +
 debian/control|4 
 debian/xsfbs/xsfbs.mk |4 
 debian/xsfbs/xsfbs.sh |  241 --
 5 files changed, 81 insertions(+), 249 deletions(-)

New commits:
commit b68834a71e5e73865dbb51885884793348a3ad0f
Author: David Nusinow dnusi...@debian.org
Date:   Wed Sep 2 21:57:53 2009 -0400

Remove note about requiring this package for the X server to work.

Thanks Piotr Engelking. Closes: #534499

diff --git a/debian/changelog b/debian/changelog
index fcc60ef..385fa78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 xfonts-base (1:1.0.0-7) UNRELEASED; urgency=low
 
   * Update xsfbs to 5693792171d885769e58d053c08b11acd12a
+  * Remove note about requiring this package for the X server to work.
+Thanks Piotr Engelking. Closes: #534499
 
  -- David Nusinow dnusi...@debian.org  Wed, 26 Aug 2009 23:32:33 -0400
 
diff --git a/debian/control b/debian/control
index 493cd65..6f70858 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,3 @@ Description: standard fonts for X
  xfonts-base provides a standard set of low-resolution bitmapped fonts.  In
  most cases it is desirable to have the X font server (xfs) and/or an X server
  installed to make the fonts available to X clients.
- .
- If you are not using a remote font server, you must install this package
- if you are installing an X server.  It contains fonts, including the
- 'fixed' font, without which X servers will not work.

commit 3d0890a5191f07e64a504c2773fbc84211985ee7
Author: David Nusinow dnusi...@debian.org
Date:   Wed Aug 26 23:32:33 2009 -0400

Update xsfbs to 5693792171d885769e58d053c08b11acd12a

diff --git a/debian/changelog b/debian/changelog
index d10f012..fcc60ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xfonts-base (1:1.0.0-7) UNRELEASED; urgency=low
+
+  * Update xsfbs to 5693792171d885769e58d053c08b11acd12a
+
+ -- David Nusinow dnusi...@debian.org  Wed, 26 Aug 2009 23:32:33 -0400
+
 xfonts-base (1:1.0.0-6) unstable; urgency=low
 
   * Drop paragraph about xfonts-base-transcoded from the description. That

commit 5693792171d885769e58d053c08b11acd12a
Author: Julien Cristau jcris...@debian.org
Date:   Wed Aug 26 18:53:36 2009 +0200

xsfbs.mk: no need for shlibs.local

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index f0f8953..1f86848 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -265,10 +265,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
#debian/*.prerm
$@
 
-# Generate the shlibs.local file.
-debian/shlibs.local:
-   cat debian/*.shlibs $@
-
 SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2/dev/null)
 VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2/dev/null)
 INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2/dev/null)

commit 1f858adff1ce2687cf542dd9b69b81137412f8a4
Author: Julien Cristau jcris...@debian.org
Date:   Wed Aug 26 18:47:09 2009 +0200

xsfbs.sh: remove unused reject_whitespace function

diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index b3f4bbe..45acd59 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -93,22 +93,6 @@ reject_nondigits () {
   done
 }
 
-reject_whitespace () {
-  # syntax: reject_whitespace [ operand ]
-  #
-  # scan operand (typically a shell variable whose value cannot be trusted) for
-  # whitespace characters and barf if any are found
-  if [ -n $1 ]; then
-# does the operand contain any whitespace?
-if expr $1 : [[:space:]]  /dev/null 21; then
-  # can't use die(), because I want to avoid forward references
-  echo $THIS_PACKAGE $THIS_SCRIPT error: reject_whitespace() encountered 
\
-   possibly malicious garbage \$1\ 2
-  exit $SHELL_LIB_THROWN_ERROR
-fi
-  fi
-}
-
 reject_unlikely_path_chars () {
   # syntax: reject_unlikely_path_chars [ operand ... ]
   #

commit 0dd71e12416aa7dc60ed68af8127e04609b125f4
Author: Julien Cristau jcris...@debian.org
Date:   Wed Aug 26 18:23:53 2009 +0200

xsfbs.sh: remove unused find_culprits function

diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 7dbb196..b3f4bbe 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -199,53 +199,6 @@ usage_error () {
   exit $SHELL_LIB_USAGE_ERROR
 }
 
-find_culprits () {
-  local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \
-msg
-
-  reject_whitespace $1
-  message Searching for overlapping packages...
-  dpkg_info_dir=/var/lib/dpkg/info
-  if [ -d $dpkg_info_dir ]; then
-if [ $(echo $dpkg_info_dir/*.list) != $dpkg_info_dir/*.list ]; then
-  possible_culprits=$(ls -1 $dpkg_info_dir/*.list | egrep -v \
-(xbase-clients|x11-common|xfs|xlibs))
-  if [ -n $possible_culprits ]; then
-smoking_guns=$(grep -l $1 $possible_culprits || true

doc-hackers: Changes to 'master'

2009-09-01 Thread David Nusinow

 mrconfig |   18 ++
 1 file changed, 18 insertions(+)

New commits:
commit dbc56e92c054d8127a51e022802addc423a2c83a
Author: David Nusinow dnusi...@debian.org
Date:   Tue Sep 1 19:16:04 2009 -0400

Add debhelper function

This will help determine which packages need debhelper updates

diff --git a/mrconfig b/mrconfig
index 9dd8958..b339df6 100644
--- a/mrconfig
+++ b/mrconfig
@@ -42,6 +42,24 @@ git_xsfbs = if [ $@ ]; then
 fi  # Do we have debian/xsfbs and we're not xsfbs itself?
   fi# Do we have the merge branch (debian-unstable by default)?
 
+git_debhelper = if [ $@ ]; then
+VERSION=shift $@
+  else
+VERSION=`apt-cache policy debhelper | awk '/Installed:/ { print $2 }' | 
sed 's/\..*//'`
+  fi
+  if [ $@ ]; then
+BRANCH=shift $@
+  else
+BRANCH=debian-unstable
+  fi
+  git checkout -q $BRANCH
+  if [ -f debian/compat ]; then
+CURVERSION=`cat debian/compat`
+if [ $VERSION -gt $CURVERSION ]; then
+ echo `basename $MR_REPO` is at Debhelper Version $CURVERSION  
$HOME/mr_debhelper.log
+fi
+  fi
+
 [debian/xorg/app/compiz]
 dummy = true
 [debian/xorg/app/grandr]


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

doc-hackers: Changes to 'master'

2009-09-01 Thread David Nusinow

 mrconfig |   12 
 1 file changed, 12 insertions(+)

New commits:
commit 2e2d2738b1c7f1212ba4dd9fc865d01acc3cdd40
Author: David Nusinow dnusi...@debian.org
Date:   Tue Sep 1 19:34:37 2009 -0400

Add a needsupload command to mrconfig

This will let us know if we have a bunch of commits in a package since its
last upload

diff --git a/mrconfig b/mrconfig
index b339df6..810b4e1 100644
--- a/mrconfig
+++ b/mrconfig
@@ -60,6 +60,18 @@ git_debhelper = if [ $@ ]; then
 fi
   fi
 
+git_needsupload = if [ $@ ]; then
+BRANCH=$@
+  else
+BRANCH=debian-unstable
+  fi
+  TAGNAME=`git describe --abbrev=0 $BRANCH`
+  DESCRIPTION=`git describe $BRANCH`
+  COMMITDIFF=`echo $DESCRIPTION | sed -e s/$TAGNAME// -e 's/^-//' | sed -e 
's/-.*//'`
+  if [ $COMMITDIFF  0 ]; then
+echo `basename $MR_REPO` has $COMMITDIFF commits since the last upload 
 $HOME/mr_needsupload.log
+  fi
+
 [debian/xorg/app/compiz]
 dummy = true
 [debian/xorg/app/grandr]


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

doc-hackers: Changes to 'master'

2009-09-01 Thread David Nusinow

 mrconfig |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b71ebb73faeca2d36efa381ecda12a97df68646a
Author: David Nusinow dnusi...@debian.org
Date:   Tue Sep 1 19:44:11 2009 -0400

Fix thinko with greater than redirection. Yay shell.

diff --git a/mrconfig b/mrconfig
index 810b4e1..bea5dad 100644
--- a/mrconfig
+++ b/mrconfig
@@ -68,7 +68,7 @@ git_needsupload = if [ $@ ]; then
   TAGNAME=`git describe --abbrev=0 $BRANCH`
   DESCRIPTION=`git describe $BRANCH`
   COMMITDIFF=`echo $DESCRIPTION | sed -e s/$TAGNAME// -e 's/^-//' | sed -e 
's/-.*//'`
-  if [ $COMMITDIFF  0 ]; then
+  if [[ $COMMITDIFF  '0' ]]; then
 echo `basename $MR_REPO` has $COMMITDIFF commits since the last upload 
 $HOME/mr_needsupload.log
   fi
 


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

xorg: Changes to 'debian-unstable'

2009-09-01 Thread David Nusinow

 debian/changelog  |6 +
 debian/xsfbs/xsfbs.mk |4 
 debian/xsfbs/xsfbs.sh |  229 --
 3 files changed, 6 insertions(+), 233 deletions(-)

New commits:
commit 5b5f4fb8982ee7bb7719caaccb08b26c39f7c236
Author: David Nusinow dnusi...@debian.org
Date:   Wed Aug 26 23:27:18 2009 -0400

Update xsfbs to 5693792171d885769e58d053c08b11acd12a

diff --git a/debian/changelog b/debian/changelog
index 5ebc662..78978ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg (1:7.4+5) UNRELEASED; urgency=low
+
+  * Update xsfbs to 5693792171d885769e58d053c08b11acd12a
+
+ -- David Nusinow dnusi...@debian.org  Wed, 26 Aug 2009 23:27:18 -0400
+
 xorg (1:7.4+4) unstable; urgency=low
 
   [ Timo Aaltonen ]

commit 5693792171d885769e58d053c08b11acd12a
Author: Julien Cristau jcris...@debian.org
Date:   Wed Aug 26 18:53:36 2009 +0200

xsfbs.mk: no need for shlibs.local

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index f0f8953..1f86848 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -265,10 +265,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
#debian/*.prerm
$@
 
-# Generate the shlibs.local file.
-debian/shlibs.local:
-   cat debian/*.shlibs $@
-
 SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2/dev/null)
 VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2/dev/null)
 INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2/dev/null)

commit 1f858adff1ce2687cf542dd9b69b81137412f8a4
Author: Julien Cristau jcris...@debian.org
Date:   Wed Aug 26 18:47:09 2009 +0200

xsfbs.sh: remove unused reject_whitespace function

diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index b3f4bbe..45acd59 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -93,22 +93,6 @@ reject_nondigits () {
   done
 }
 
-reject_whitespace () {
-  # syntax: reject_whitespace [ operand ]
-  #
-  # scan operand (typically a shell variable whose value cannot be trusted) for
-  # whitespace characters and barf if any are found
-  if [ -n $1 ]; then
-# does the operand contain any whitespace?
-if expr $1 : [[:space:]]  /dev/null 21; then
-  # can't use die(), because I want to avoid forward references
-  echo $THIS_PACKAGE $THIS_SCRIPT error: reject_whitespace() encountered 
\
-   possibly malicious garbage \$1\ 2
-  exit $SHELL_LIB_THROWN_ERROR
-fi
-  fi
-}
-
 reject_unlikely_path_chars () {
   # syntax: reject_unlikely_path_chars [ operand ... ]
   #

commit 0dd71e12416aa7dc60ed68af8127e04609b125f4
Author: Julien Cristau jcris...@debian.org
Date:   Wed Aug 26 18:23:53 2009 +0200

xsfbs.sh: remove unused find_culprits function

diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 7dbb196..b3f4bbe 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -199,53 +199,6 @@ usage_error () {
   exit $SHELL_LIB_USAGE_ERROR
 }
 
-find_culprits () {
-  local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \
-msg
-
-  reject_whitespace $1
-  message Searching for overlapping packages...
-  dpkg_info_dir=/var/lib/dpkg/info
-  if [ -d $dpkg_info_dir ]; then
-if [ $(echo $dpkg_info_dir/*.list) != $dpkg_info_dir/*.list ]; then
-  possible_culprits=$(ls -1 $dpkg_info_dir/*.list | egrep -v \
-(xbase-clients|x11-common|xfs|xlibs))
-  if [ -n $possible_culprits ]; then
-smoking_guns=$(grep -l $1 $possible_culprits || true)
-if [ -n $smoking_guns ]; then
-  bad_packages=$(printf \\n)
-  for f in $smoking_guns; do
-# too bad you can't nest parameter expansion voodoo
-p=${f%*.list}  # strip off the trailing .list
-package=${p##*/}   # strip off the directories
-bad_packages=$(printf %s\n%s $bad_packages $package)
-  done
-  msg=$(cat EOF
-The following packages appear to have file overlaps with the X.Org packages;
-these packages are either very old, or in violation of Debian Policy.  Try
-upgrading each of these packages to the latest available version if possible:
-for example, with the command apt-get install.  If no newer version of a
-package is available, you will have to remove it; for example, with the command
-apt-get remove.  If even the latest available version of the package has
-this file overlap, please file a bug against that package with the Debian Bug
-Tracking System.  You may want to refer the package maintainer to section 12.8
-of the Debian Policy manual.
-EOF
-)
-  message $msg
-  message The overlapping packages are: $bad_packages
-else
-  message no overlaps found.
-fi
-  fi
-else
-  message cannot search; no matches for $dpkg_info_dir/*.list.
-fi
-  else
-message cannot search; $dpkg_info_dir does not exist.
-  fi
-}
-
 font_update () {
   # run $UPDATECMDS

xcursor-themes: Changes to 'debian-unstable'

2009-09-01 Thread David Nusinow

 debian/changelog  |6 +
 debian/xsfbs/xsfbs.mk |4 
 debian/xsfbs/xsfbs.sh |  229 --
 3 files changed, 6 insertions(+), 233 deletions(-)

New commits:
commit 57a6ba607341cc9c205b18dab259967f00518c6f
Author: David Nusinow dnusi...@debian.org
Date:   Wed Aug 26 23:27:09 2009 -0400

Update xsfbs to 5693792171d885769e58d053c08b11acd12a

diff --git a/debian/changelog b/debian/changelog
index 5234f4b..9351af7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xcursor-themes (1.0.1-7) UNRELEASED; urgency=low
+
+  * Update xsfbs to 5693792171d885769e58d053c08b11acd12a
+
+ -- David Nusinow dnusi...@debian.org  Wed, 26 Aug 2009 23:27:08 -0400
+
 xcursor-themes (1.0.1-6) unstable; urgency=low
 
   [ Brice Goglin ]

commit 5693792171d885769e58d053c08b11acd12a
Author: Julien Cristau jcris...@debian.org
Date:   Wed Aug 26 18:53:36 2009 +0200

xsfbs.mk: no need for shlibs.local

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index f0f8953..1f86848 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -265,10 +265,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
#debian/*.prerm
$@
 
-# Generate the shlibs.local file.
-debian/shlibs.local:
-   cat debian/*.shlibs $@
-
 SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2/dev/null)
 VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2/dev/null)
 INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2/dev/null)

commit 1f858adff1ce2687cf542dd9b69b81137412f8a4
Author: Julien Cristau jcris...@debian.org
Date:   Wed Aug 26 18:47:09 2009 +0200

xsfbs.sh: remove unused reject_whitespace function

diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index b3f4bbe..45acd59 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -93,22 +93,6 @@ reject_nondigits () {
   done
 }
 
-reject_whitespace () {
-  # syntax: reject_whitespace [ operand ]
-  #
-  # scan operand (typically a shell variable whose value cannot be trusted) for
-  # whitespace characters and barf if any are found
-  if [ -n $1 ]; then
-# does the operand contain any whitespace?
-if expr $1 : [[:space:]]  /dev/null 21; then
-  # can't use die(), because I want to avoid forward references
-  echo $THIS_PACKAGE $THIS_SCRIPT error: reject_whitespace() encountered 
\
-   possibly malicious garbage \$1\ 2
-  exit $SHELL_LIB_THROWN_ERROR
-fi
-  fi
-}
-
 reject_unlikely_path_chars () {
   # syntax: reject_unlikely_path_chars [ operand ... ]
   #

commit 0dd71e12416aa7dc60ed68af8127e04609b125f4
Author: Julien Cristau jcris...@debian.org
Date:   Wed Aug 26 18:23:53 2009 +0200

xsfbs.sh: remove unused find_culprits function

diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 7dbb196..b3f4bbe 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -199,53 +199,6 @@ usage_error () {
   exit $SHELL_LIB_USAGE_ERROR
 }
 
-find_culprits () {
-  local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \
-msg
-
-  reject_whitespace $1
-  message Searching for overlapping packages...
-  dpkg_info_dir=/var/lib/dpkg/info
-  if [ -d $dpkg_info_dir ]; then
-if [ $(echo $dpkg_info_dir/*.list) != $dpkg_info_dir/*.list ]; then
-  possible_culprits=$(ls -1 $dpkg_info_dir/*.list | egrep -v \
-(xbase-clients|x11-common|xfs|xlibs))
-  if [ -n $possible_culprits ]; then
-smoking_guns=$(grep -l $1 $possible_culprits || true)
-if [ -n $smoking_guns ]; then
-  bad_packages=$(printf \\n)
-  for f in $smoking_guns; do
-# too bad you can't nest parameter expansion voodoo
-p=${f%*.list}  # strip off the trailing .list
-package=${p##*/}   # strip off the directories
-bad_packages=$(printf %s\n%s $bad_packages $package)
-  done
-  msg=$(cat EOF
-The following packages appear to have file overlaps with the X.Org packages;
-these packages are either very old, or in violation of Debian Policy.  Try
-upgrading each of these packages to the latest available version if possible:
-for example, with the command apt-get install.  If no newer version of a
-package is available, you will have to remove it; for example, with the command
-apt-get remove.  If even the latest available version of the package has
-this file overlap, please file a bug against that package with the Debian Bug
-Tracking System.  You may want to refer the package maintainer to section 12.8
-of the Debian Policy manual.
-EOF
-)
-  message $msg
-  message The overlapping packages are: $bad_packages
-else
-  message no overlaps found.
-fi
-  fi
-else
-  message cannot search; no matches for $dpkg_info_dir/*.list.
-fi
-  else
-message cannot search; $dpkg_info_dir does not exist.
-  fi
-}
-
 font_update

xkb-data: Changes to 'debian-unstable'

2009-09-01 Thread David Nusinow

 debian/changelog  |5 -
 debian/xsfbs/xsfbs.mk |4 
 debian/xsfbs/xsfbs.sh |  239 --
 3 files changed, 4 insertions(+), 244 deletions(-)

New commits:
commit d9b7cc7e635953b46a42d96882679c0144c20b2f
Author: David Nusinow dnusi...@debian.org
Date:   Wed Aug 26 23:27:13 2009 -0400

Update xsfbs to 5693792171d885769e58d053c08b11acd12a

diff --git a/debian/changelog b/debian/changelog
index 38437c2..82680b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,10 @@ xkeyboard-config (1.6-2) UNRELEASED; urgency=low
   * Don't install base.xml in /etc/X11/xkb.  Modifying this creates more
 problems than it solves (closes: #497341).
 
- -- David Nusinow dnusi...@debian.org  Tue, 25 Aug 2009 12:56:16 -0400
+  [ David Nusinow ]
+  * Update xsfbs to 5693792171d885769e58d053c08b11acd12a
+
+ -- David Nusinow dnusi...@debian.org  Wed, 26 Aug 2009 23:27:13 -0400
 
 xkeyboard-config (1.6-1) unstable; urgency=low
 

commit 5693792171d885769e58d053c08b11acd12a
Author: Julien Cristau jcris...@debian.org
Date:   Wed Aug 26 18:53:36 2009 +0200

xsfbs.mk: no need for shlibs.local

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index f0f8953..1f86848 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -265,10 +265,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
#debian/*.prerm
$@
 
-# Generate the shlibs.local file.
-debian/shlibs.local:
-   cat debian/*.shlibs $@
-
 SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2/dev/null)
 VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2/dev/null)
 INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2/dev/null)

commit 1f858adff1ce2687cf542dd9b69b81137412f8a4
Author: Julien Cristau jcris...@debian.org
Date:   Wed Aug 26 18:47:09 2009 +0200

xsfbs.sh: remove unused reject_whitespace function

diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index b3f4bbe..45acd59 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -93,22 +93,6 @@ reject_nondigits () {
   done
 }
 
-reject_whitespace () {
-  # syntax: reject_whitespace [ operand ]
-  #
-  # scan operand (typically a shell variable whose value cannot be trusted) for
-  # whitespace characters and barf if any are found
-  if [ -n $1 ]; then
-# does the operand contain any whitespace?
-if expr $1 : [[:space:]]  /dev/null 21; then
-  # can't use die(), because I want to avoid forward references
-  echo $THIS_PACKAGE $THIS_SCRIPT error: reject_whitespace() encountered 
\
-   possibly malicious garbage \$1\ 2
-  exit $SHELL_LIB_THROWN_ERROR
-fi
-  fi
-}
-
 reject_unlikely_path_chars () {
   # syntax: reject_unlikely_path_chars [ operand ... ]
   #

commit 0dd71e12416aa7dc60ed68af8127e04609b125f4
Author: Julien Cristau jcris...@debian.org
Date:   Wed Aug 26 18:23:53 2009 +0200

xsfbs.sh: remove unused find_culprits function

diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 7dbb196..b3f4bbe 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -199,53 +199,6 @@ usage_error () {
   exit $SHELL_LIB_USAGE_ERROR
 }
 
-find_culprits () {
-  local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \
-msg
-
-  reject_whitespace $1
-  message Searching for overlapping packages...
-  dpkg_info_dir=/var/lib/dpkg/info
-  if [ -d $dpkg_info_dir ]; then
-if [ $(echo $dpkg_info_dir/*.list) != $dpkg_info_dir/*.list ]; then
-  possible_culprits=$(ls -1 $dpkg_info_dir/*.list | egrep -v \
-(xbase-clients|x11-common|xfs|xlibs))
-  if [ -n $possible_culprits ]; then
-smoking_guns=$(grep -l $1 $possible_culprits || true)
-if [ -n $smoking_guns ]; then
-  bad_packages=$(printf \\n)
-  for f in $smoking_guns; do
-# too bad you can't nest parameter expansion voodoo
-p=${f%*.list}  # strip off the trailing .list
-package=${p##*/}   # strip off the directories
-bad_packages=$(printf %s\n%s $bad_packages $package)
-  done
-  msg=$(cat EOF
-The following packages appear to have file overlaps with the X.Org packages;
-these packages are either very old, or in violation of Debian Policy.  Try
-upgrading each of these packages to the latest available version if possible:
-for example, with the command apt-get install.  If no newer version of a
-package is available, you will have to remove it; for example, with the command
-apt-get remove.  If even the latest available version of the package has
-this file overlap, please file a bug against that package with the Debian Bug
-Tracking System.  You may want to refer the package maintainer to section 12.8
-of the Debian Policy manual.
-EOF
-)
-  message $msg
-  message The overlapping packages are: $bad_packages
-else
-  message no overlaps found.
-fi

xorg-docs: Changes to 'debian-unstable'

2009-09-01 Thread David Nusinow

 debian/changelog  |6 +
 debian/xsfbs/xsfbs.mk |4 
 debian/xsfbs/xsfbs.sh |  229 --
 3 files changed, 5 insertions(+), 234 deletions(-)

New commits:
commit a24e5356e813397a8e87f57d4d021022e42da45c
Author: David Nusinow dnusi...@debian.org
Date:   Wed Aug 26 23:27:22 2009 -0400

Update xsfbs to 5693792171d885769e58d053c08b11acd12a

diff --git a/debian/changelog b/debian/changelog
index df51679..5519ef5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
 xorg-docs (1:1.4-6) UNRELEASED; urgency=low
 
+  [ Brice Goglin ]
   * Add README.source, bump Standards-Version to 3.8.2.
   * Use updated xsfbs, closes: #538596.
 
- -- Brice Goglin bgog...@debian.org  Sat, 01 Aug 2009 16:38:44 +0200
+  [ David Nusinow ]
+  * Update xsfbs to 5693792171d885769e58d053c08b11acd12a
+
+ -- David Nusinow dnusi...@debian.org  Wed, 26 Aug 2009 23:27:22 -0400
 
 xorg-docs (1:1.4-5) unstable; urgency=low
 

commit 5693792171d885769e58d053c08b11acd12a
Author: Julien Cristau jcris...@debian.org
Date:   Wed Aug 26 18:53:36 2009 +0200

xsfbs.mk: no need for shlibs.local

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index f0f8953..1f86848 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -265,10 +265,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
#debian/*.prerm
$@
 
-# Generate the shlibs.local file.
-debian/shlibs.local:
-   cat debian/*.shlibs $@
-
 SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2/dev/null)
 VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2/dev/null)
 INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2/dev/null)

commit 1f858adff1ce2687cf542dd9b69b81137412f8a4
Author: Julien Cristau jcris...@debian.org
Date:   Wed Aug 26 18:47:09 2009 +0200

xsfbs.sh: remove unused reject_whitespace function

diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index b3f4bbe..45acd59 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -93,22 +93,6 @@ reject_nondigits () {
   done
 }
 
-reject_whitespace () {
-  # syntax: reject_whitespace [ operand ]
-  #
-  # scan operand (typically a shell variable whose value cannot be trusted) for
-  # whitespace characters and barf if any are found
-  if [ -n $1 ]; then
-# does the operand contain any whitespace?
-if expr $1 : [[:space:]]  /dev/null 21; then
-  # can't use die(), because I want to avoid forward references
-  echo $THIS_PACKAGE $THIS_SCRIPT error: reject_whitespace() encountered 
\
-   possibly malicious garbage \$1\ 2
-  exit $SHELL_LIB_THROWN_ERROR
-fi
-  fi
-}
-
 reject_unlikely_path_chars () {
   # syntax: reject_unlikely_path_chars [ operand ... ]
   #

commit 0dd71e12416aa7dc60ed68af8127e04609b125f4
Author: Julien Cristau jcris...@debian.org
Date:   Wed Aug 26 18:23:53 2009 +0200

xsfbs.sh: remove unused find_culprits function

diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 7dbb196..b3f4bbe 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -199,53 +199,6 @@ usage_error () {
   exit $SHELL_LIB_USAGE_ERROR
 }
 
-find_culprits () {
-  local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \
-msg
-
-  reject_whitespace $1
-  message Searching for overlapping packages...
-  dpkg_info_dir=/var/lib/dpkg/info
-  if [ -d $dpkg_info_dir ]; then
-if [ $(echo $dpkg_info_dir/*.list) != $dpkg_info_dir/*.list ]; then
-  possible_culprits=$(ls -1 $dpkg_info_dir/*.list | egrep -v \
-(xbase-clients|x11-common|xfs|xlibs))
-  if [ -n $possible_culprits ]; then
-smoking_guns=$(grep -l $1 $possible_culprits || true)
-if [ -n $smoking_guns ]; then
-  bad_packages=$(printf \\n)
-  for f in $smoking_guns; do
-# too bad you can't nest parameter expansion voodoo
-p=${f%*.list}  # strip off the trailing .list
-package=${p##*/}   # strip off the directories
-bad_packages=$(printf %s\n%s $bad_packages $package)
-  done
-  msg=$(cat EOF
-The following packages appear to have file overlaps with the X.Org packages;
-these packages are either very old, or in violation of Debian Policy.  Try
-upgrading each of these packages to the latest available version if possible:
-for example, with the command apt-get install.  If no newer version of a
-package is available, you will have to remove it; for example, with the command
-apt-get remove.  If even the latest available version of the package has
-this file overlap, please file a bug against that package with the Debian Bug
-Tracking System.  You may want to refer the package maintainer to section 12.8
-of the Debian Policy manual.
-EOF
-)
-  message $msg
-  message The overlapping packages are: $bad_packages
-else
-  message no overlaps found.
-fi
-  fi

doc-hackers: Changes to 'master'

2009-09-01 Thread David Nusinow

 mrconfig |   24 +++-
 1 file changed, 19 insertions(+), 5 deletions(-)

New commits:
commit 78e72794418c842744045ee19a654d62c4381c78
Author: David Nusinow dnusi...@debian.org
Date:   Tue Sep 1 20:32:05 2009 -0400

Code motion

diff --git a/mrconfig b/mrconfig
index 1b07590..f7c14bb 100644
--- a/mrconfig
+++ b/mrconfig
@@ -60,18 +60,6 @@ git_debhelper = if [ $@ ]; then
 fi
   fi
 
-git_needsupload = if [ $@ ]; then
-BRANCH=$@
-  else
-BRANCH=debian-unstable
-  fi
-  TAGNAME=`git describe --abbrev=0 $BRANCH`
-  DESCRIPTION=`git describe $BRANCH`
-  COMMITDIFF=`echo $DESCRIPTION | sed -e s/$TAGNAME// -e 's/^-//' | sed -e 
's/-.*//'`
-  if [[ $COMMITDIFF  '0' ]]; then
-echo `basename $MR_REPO` has $COMMITDIFF commits since the last upload 
 $HOME/mr_needsupload.log
-  fi
-
 git_policy = if [ $@ ]; then
 BRANCH=$@
   else
@@ -86,6 +74,18 @@ git_policy = if [ $@ ]; then
 fi
   fi
 
+git_needsupload = if [ $@ ]; then
+BRANCH=$@
+  else
+BRANCH=debian-unstable
+  fi
+  TAGNAME=`git describe --abbrev=0 $BRANCH`
+  DESCRIPTION=`git describe $BRANCH`
+  COMMITDIFF=`echo $DESCRIPTION | sed -e s/$TAGNAME// -e 's/^-//' | sed -e 
's/-.*//'`
+  if [[ $COMMITDIFF  '0' ]]; then
+echo `basename $MR_REPO` has $COMMITDIFF commits since the last upload 
 $HOME/mr_needsupload.log
+  fi
+
 [debian/xorg/app/compiz]
 dummy = true
 [debian/xorg/app/grandr]

commit 09720360ddc30dfad062988c2e22363018bc00de
Author: David Nusinow dnusi...@debian.org
Date:   Tue Sep 1 20:31:29 2009 -0400

Rename version variables to make sense

diff --git a/mrconfig b/mrconfig
index 3315f2d..1b07590 100644
--- a/mrconfig
+++ b/mrconfig
@@ -43,9 +43,9 @@ git_xsfbs = if [ $@ ]; then
   fi# Do we have the merge branch (debian-unstable by default)?
 
 git_debhelper = if [ $@ ]; then
-VERSION=shift $@
+DHVERSION=shift $@
   else
-VERSION=`apt-cache policy debhelper | awk '/Installed:/ { print $2 }' | 
sed 's/\..*//'`
+DHVERSION=`apt-cache policy debhelper | awk '/Installed:/ { print $2 }' | 
sed 's/\..*//'`
   fi
   if [ $@ ]; then
 BRANCH=shift $@
@@ -54,9 +54,9 @@ git_debhelper = if [ $@ ]; then
   fi
   git checkout -q $BRANCH
   if [ -f debian/compat ]; then
-CURVERSION=`cat debian/compat`
-if [ $VERSION -gt $CURVERSION ]; then
- echo `basename $MR_REPO` is at Debhelper Version $CURVERSION  
$HOME/mr_debhelper.log
+PKGVERSION=`cat debian/compat`
+if [ $DHVERSION -gt $PKGVERSION ]; then
+ echo `basename $MR_REPO` is at Debhelper Version $PKGVERSION  
$HOME/mr_debhelper.log
 fi
   fi
 
@@ -79,10 +79,10 @@ git_policy = if [ $@ ]; then
   fi
   git checkout -q $BRANCH
   if [ -e debian/control ]; then
-PACKAGEVERSION=`awk '/^Standards-Version/ { print $2 }' debian/control`
-VERSION=`apt-cache policy debian-policy | awk '/Installed:/ { print $2 }'`
-if [ ! `dpkg --compare-versions $PACKAGEVERSION eq $VERSION` ]; then
-  echo `basename $MR_REPO` is at standards version $PACKAGEVERSION  
$HOME/mr_policy.log
+PKGVERSION=`awk '/^Standards-Version/ { print $2 }' debian/control`
+CURVERSION=`apt-cache policy debian-policy | awk '/Installed:/ { print $2 
}'`
+if [ ! `dpkg --compare-versions $PKGVERSION eq $CURVERSION` ]; then
+  echo `basename $MR_REPO` is at standards version $PKGVERSION  
$HOME/mr_policy.log
 fi
   fi
 

commit 866d263657135f94b69bd5df4a1b336923f25aff
Author: David Nusinow dnusi...@debian.org
Date:   Tue Sep 1 20:26:57 2009 -0400

Add a policy command to mrconfig

This will look for packages that need an updated standards version

diff --git a/mrconfig b/mrconfig
index bea5dad..3315f2d 100644
--- a/mrconfig
+++ b/mrconfig
@@ -72,6 +72,20 @@ git_needsupload = if [ $@ ]; then
 echo `basename $MR_REPO` has $COMMITDIFF commits since the last upload 
 $HOME/mr_needsupload.log
   fi
 
+git_policy = if [ $@ ]; then
+BRANCH=$@
+  else
+BRANCH=debian-unstable
+  fi
+  git checkout -q $BRANCH
+  if [ -e debian/control ]; then
+PACKAGEVERSION=`awk '/^Standards-Version/ { print $2 }' debian/control`
+VERSION=`apt-cache policy debian-policy | awk '/Installed:/ { print $2 }'`
+if [ ! `dpkg --compare-versions $PACKAGEVERSION eq $VERSION` ]; then
+  echo `basename $MR_REPO` is at standards version $PACKAGEVERSION  
$HOME/mr_policy.log
+fi
+  fi
+
 [debian/xorg/app/compiz]
 dummy = true
 [debian/xorg/app/grandr]


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

Re: X.org plans for the squeeze cycle

2009-08-31 Thread David Nusinow

David Nusinow wrote:
 Julien Cristau wrote:
 [other xsf members, feel free to chime in if I'm forgetting something or
  saying something stupid :)]

 On Sun, Aug 16, 2009 at 14:41:24 +0200, Marc Brockschmidt wrote:

  
 * Which major upstream releases of X.org are expected in the next two
   years? Which of those are material for Debian stable, which might
 be a bit
   flaky?

 
 X.org release management is notoriously pretty bad.  Releases often slip
 by months, and bugs in .0 server releases aren't unheard of.  See also
 http://www.openbsd.org/papers/asiabsdcon2009-release_engineering/mgp9.html


 Anyway, there's no schedule for 1.7 to my knowledge, let alone for the
 subsequent releases.  I'd guess server 1.7 (and X.Org 7.5) will come
 before the end of the year, though, so that seems like a good candidate
 for a squeeze release in 2010.
   
 
 My main worry for 1.7 is that it probably won't give us a lot of time to
 shake bugs out of XKB2. We're not historically very good at dealing with
 the guts of the input system anyway, and that XKB2 won't provide any
 immediate user-visible changes that seem to make it a must have (if I'm
 wrong here, please correct me!) On the other hand, with the 1.6 servers
 we finally have a stable input system again, so my sense is that we
 should probably be conservative and go with the 1.6 branches for squeeze
 given our short time frame.

Upstream just announced that they won't be including XKB2 in this
release after all, since it needs some more time to cook. Given that, I
think we should shoot for 1.7 and any further useful patches for squeeze.

 - David Nusinow


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

doc-hackers: Changes to 'master'

2009-08-31 Thread David Nusinow

 mrconfig |  408 +++
 1 file changed, 408 insertions(+)

New commits:
commit ee3683624bd5a4ea0253013a24a689ea4e1c5b02
Author: David Nusinow dnusi...@debian.org
Date:   Mon Aug 31 21:53:58 2009 -0400

Add mrconfig

diff --git a/mrconfig b/mrconfig
new file mode 100644
index 000..9dd8958
--- /dev/null
+++ b/mrconfig
@@ -0,0 +1,408 @@
+# Let emacs know how to highlite this file: -*-shell-script-*-
+[DEFAULT]
+git_gc = git gc $@
+checkout = REPONAME=`basename $MR_REPO`;
+  git clone git+ssh://dnusi...@git.debian.org/git/pkg-xorg/app/$REPONAME 
+  cd $MR_REPO 
+  git remote add xsfbs git+ssh://dnusi...@git.debian.org/git/pkg-xorg/xsfbs 
+  git remote update xsfbs 
+  for REPO in upstream-unstable debian-experimental upstream-experimental
+  do
+if [ `git branch -a | grep $REPO` ]; then
+  git branch --track $REPO origin/$REPO
+fi
+  done
+
+# git_addxsfbs = cd $MR_REPO  
+#   git remote add xsfbs git+ssh://dnusi...@git.debian.org/git/pkg-xorg/xsfbs 

+#   git remote update xsfbs
+
+git_xsfbs = if [ $@ ]; then
+BRANCH=$@
+  else 
+BRANCH=debian-unstable 
+  fi
+  if git branch | grep $BRANCH; then
+git checkout $BRANCH
+if [[ $MR_REPO != xsfbs  -d debian/xsfbs ]]; then
+  git remote update xsfbs
+ COMMITMSG=Merge xsfbs in to $BRANCH
+ git merge -m $COMMITMSG xsfbs/debian-unstable
+ LASTCOMMIT=`git log -1 --pretty='%s'`
+ if [ $LASTCOMMIT = $COMMITMSG ]; then
+COMMITHASH=`git log -1 --pretty='%H' xsfbs/debian-unstable`
+   if head -n1 debian/changelog | awk '{print $3}' | grep 'UNRELEASED' 
 /dev/null; then
+ dch -a Update xsfbs to $COMMITHASH
+   else
+ dch -i -D UNRELEASED Update xsfbs to $COMMITHASH
+   fi
+   git add debian/changelog
+git commit -m Update xsfbs to $COMMITHASH
+  fi# Did the merge actually provide new commits?
+fi  # Do we have debian/xsfbs and we're not xsfbs itself?
+  fi# Do we have the merge branch (debian-unstable by default)?
+
+[debian/xorg/app/compiz]
+dummy = true
+[debian/xorg/app/grandr]
+dummy = true
+[debian/xorg/app/twm]
+dummy = true
+[debian/xorg/app/x11-apps]
+dummy = true
+[debian/xorg/app/x11-session-utils]
+dummy = true
+[debian/xorg/app/x11-utils]
+dummy = true
+[debian/xorg/app/x11-xfs-utils]
+dummy = true
+[debian/xorg/app/x11-xkb-utils]
+dummy = true
+[debian/xorg/app/x11-xserver-utils]
+dummy = true
+[debian/xorg/app/xauth]
+dummy = true
+[debian/xorg/app/xbacklight]
+dummy = true
+[debian/xorg/app/xdm]
+dummy = true
+[debian/xorg/app/xfs]
+dummy = true
+[debian/xorg/app/xinit]
+dummy = true
+[debian/xorg/app/xprint-utils]
+dummy = true
+[debian/xorg/app/xterm]
+dummy = true
+[debian/xorg/app/xutils]
+dummy = true
+[debian/xorg/app/xutils-dev]
+dummy = true
+[debian/xorg/bling/ccsm]
+dummy = true
+[debian/xorg/bling/compizconfig-backend-gconf]
+dummy = true
+[debian/xorg/bling/compizconfig-backend-kconfig]
+dummy = true
+[debian/xorg/bling/compizconfig-backend-kconfig4]
+dummy = true
+[debian/xorg/bling/compizconfig-python]
+dummy = true
+[debian/xorg/bling/compiz-fusion-bcop]
+dummy = true
+[debian/xorg/bling/compiz-fusion-plugins-extra]
+dummy = true
+[debian/xorg/bling/compiz-fusion-plugins-main]
+dummy = true
+[debian/xorg/bling/compiz-fusion-plugins-unsupported]
+dummy = true
+[debian/xorg/bling/libcompizconfig]
+dummy = true
+[debian/xorg/data/xbitmaps]
+dummy = true
+[debian/xorg/data/xcursor-themes]
+dummy = true
+[debian/xorg/data/xkb-data]
+dummy = true
+[debian/xorg/debian/xorg]
+dummy = true
+[debian/xorg/doc-hackers]
+dummy = true
+[debian/xorg/doc/xorg-docs]
+dummy = true
+[debian/xorg/doc/xorg-sgml-doctools]
+dummy = true
+[debian/xorg/driver/xserver-xorg-input-acecad]
+dummy = true
+[debian/xorg/driver/xserver-xorg-input-aiptek]
+dummy = true
+[debian/xorg/driver/xserver-xorg-input-citron]
+dummy = true
+[debian/xorg/driver/xserver-xorg-input-elographics]
+dummy = true
+[debian/xorg/driver/xserver-xorg-input-evdev]
+dummy = true
+[debian/xorg/driver/xserver-xorg-input-evtouch]
+dummy = true
+[debian/xorg/driver/xserver-xorg-input-fpit]
+dummy = true
+[debian/xorg/driver/xserver-xorg-input-hyperpen]
+dummy = true
+[debian/xorg/driver/xserver-xorg-input-joystick]
+dummy = true
+[debian/xorg/driver/xserver-xorg-input-keyboard]
+dummy = true
+[debian/xorg/driver/xserver-xorg-input-mouse]
+dummy = true
+[debian/xorg/driver/xserver-xorg-input-mutouch]
+dummy = true
+[debian/xorg/driver/xserver-xorg-input-penmount]
+dummy = true
+[debian/xorg/driver/xserver-xorg-input-synaptics]
+dummy = true
+[debian/xorg/driver/xserver-xorg-input-vmmouse]
+dummy = true
+[debian/xorg/driver/xserver-xorg-input-void]
+dummy = true
+[debian/xorg/driver/xserver-xorg-video-amd]
+dummy = true
+[debian/xorg/driver/xserver-xorg-video-apm]
+dummy = true
+[debian/xorg/driver/xserver-xorg-video-ark]
+dummy = true
+[debian/xorg/driver/xserver-xorg-video-ati

Re: doc-hackers: Changes to 'master'

2009-08-31 Thread David Nusinow

David Nusinow wrote:
  mrconfig |  408 
 +++
  1 file changed, 408 insertions(+)
 
 New commits:
 commit ee3683624bd5a4ea0253013a24a689ea4e1c5b02
 Author: David Nusinow dnusi...@debian.org
 Date:   Mon Aug 31 21:53:58 2009 -0400
 
 Add mrconfig

This is the beginning of a config file for Joey Hess's mr program that
will hopefully save us a lot of pain and drudgery. My shell scripting
abilities are pretty weak, so please tear it apart and critique it. I've
got a few more features I'd like to add to what's here as well that I'll
be writing and uploading in the next week or two.

 - David Nusinow


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

xorg-server: Changes to 'debian-unstable'

2009-08-26 Thread David Nusinow

 debian/changelog  |6 +
 debian/xsfbs/xsfbs.mk |4 
 debian/xsfbs/xsfbs.sh |  229 --
 3 files changed, 5 insertions(+), 234 deletions(-)

New commits:
commit 39d2081b60eacc4bafab88d5d468090e463f64a3
Author: David Nusinow dnusi...@debian.org
Date:   Wed Aug 26 23:24:26 2009 -0400

Update xsfbs to 5693792171d885769e58d053c08b11acd12a

diff --git a/debian/changelog b/debian/changelog
index 3616a36..94be5a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 xorg-server (2:1.6.3-2) UNRELEASED; urgency=low
 
+  [ Julien Cristau ]
   * Add patch stolen from Fedora to add the vboxvideo driver to the
 autodetection routine (closes: #540884).
   * Add built-ins to the default font path so that non-Xorg servers can use
@@ -7,7 +8,10 @@ xorg-server (2:1.6.3-2) UNRELEASED; urgency=low
   * Add avr32 to the libselinux-dev/libaudit-dev build-deps (closes: #543540).
 Thanks, Bradley Smith!
 
- -- Julien Cristau jcris...@debian.org  Tue, 11 Aug 2009 11:09:25 +0200
+  [ David Nusinow ]
+  * Update xsfbs to 5693792171d885769e58d053c08b11acd12a
+
+ -- David Nusinow dnusi...@debian.org  Wed, 26 Aug 2009 23:24:25 -0400
 
 xorg-server (2:1.6.3-1) unstable; urgency=low
 

commit 5693792171d885769e58d053c08b11acd12a
Author: Julien Cristau jcris...@debian.org
Date:   Wed Aug 26 18:53:36 2009 +0200

xsfbs.mk: no need for shlibs.local

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index f0f8953..1f86848 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -265,10 +265,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
#debian/*.prerm
$@
 
-# Generate the shlibs.local file.
-debian/shlibs.local:
-   cat debian/*.shlibs $@
-
 SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2/dev/null)
 VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2/dev/null)
 INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2/dev/null)

commit 1f858adff1ce2687cf542dd9b69b81137412f8a4
Author: Julien Cristau jcris...@debian.org
Date:   Wed Aug 26 18:47:09 2009 +0200

xsfbs.sh: remove unused reject_whitespace function

diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index b3f4bbe..45acd59 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -93,22 +93,6 @@ reject_nondigits () {
   done
 }
 
-reject_whitespace () {
-  # syntax: reject_whitespace [ operand ]
-  #
-  # scan operand (typically a shell variable whose value cannot be trusted) for
-  # whitespace characters and barf if any are found
-  if [ -n $1 ]; then
-# does the operand contain any whitespace?
-if expr $1 : [[:space:]]  /dev/null 21; then
-  # can't use die(), because I want to avoid forward references
-  echo $THIS_PACKAGE $THIS_SCRIPT error: reject_whitespace() encountered 
\
-   possibly malicious garbage \$1\ 2
-  exit $SHELL_LIB_THROWN_ERROR
-fi
-  fi
-}
-
 reject_unlikely_path_chars () {
   # syntax: reject_unlikely_path_chars [ operand ... ]
   #

commit 0dd71e12416aa7dc60ed68af8127e04609b125f4
Author: Julien Cristau jcris...@debian.org
Date:   Wed Aug 26 18:23:53 2009 +0200

xsfbs.sh: remove unused find_culprits function

diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 7dbb196..b3f4bbe 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -199,53 +199,6 @@ usage_error () {
   exit $SHELL_LIB_USAGE_ERROR
 }
 
-find_culprits () {
-  local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \
-msg
-
-  reject_whitespace $1
-  message Searching for overlapping packages...
-  dpkg_info_dir=/var/lib/dpkg/info
-  if [ -d $dpkg_info_dir ]; then
-if [ $(echo $dpkg_info_dir/*.list) != $dpkg_info_dir/*.list ]; then
-  possible_culprits=$(ls -1 $dpkg_info_dir/*.list | egrep -v \
-(xbase-clients|x11-common|xfs|xlibs))
-  if [ -n $possible_culprits ]; then
-smoking_guns=$(grep -l $1 $possible_culprits || true)
-if [ -n $smoking_guns ]; then
-  bad_packages=$(printf \\n)
-  for f in $smoking_guns; do
-# too bad you can't nest parameter expansion voodoo
-p=${f%*.list}  # strip off the trailing .list
-package=${p##*/}   # strip off the directories
-bad_packages=$(printf %s\n%s $bad_packages $package)
-  done
-  msg=$(cat EOF
-The following packages appear to have file overlaps with the X.Org packages;
-these packages are either very old, or in violation of Debian Policy.  Try
-upgrading each of these packages to the latest available version if possible:
-for example, with the command apt-get install.  If no newer version of a
-package is available, you will have to remove it; for example, with the command
-apt-get remove.  If even the latest available version of the package has
-this file overlap, please file a bug against that package with the Debian Bug

xkb-data: Changes to 'debian-unstable'

2009-08-25 Thread David Nusinow

 debian/NEWS  |   10 ++
 debian/changelog |6 ++
 2 files changed, 16 insertions(+)

New commits:
commit 0518c6c344a25eac64fb9ae1f2d88c47b570f6d3
Author: David Nusinow dnusi...@debian.org
Date:   Tue Aug 25 12:57:18 2009 -0400

Add a note about re-enabling ctrl-alt-backspace killing to NEWS.Debian.

diff --git a/debian/NEWS b/debian/NEWS
new file mode 100644
index 000..eb9994f
--- /dev/null
+++ b/debian/NEWS
@@ -0,0 +1,10 @@
+xkeyboard-config (1.6-2) unstable; urgency=low
+
+  * The current defaults do not enable the traditional
+Ctrl-Alt-Backspace key combination to kill the X server. If you
+would like to re-enable this feature, you may do so in your
+desktop's Keyboard Preferences application. You may also enable it
+for the current session using the command 
+   setxkbmap -option terminate:ctrl_alt_bkspc.
+
+ -- David Nusinow dnusi...@debian.org  Tue, 25 Aug 2009 12:52:38 -0400
diff --git a/debian/changelog b/debian/changelog
index 54cc157..d22f70b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xkeyboard-config (1.6-2) UNRELEASED; urgency=low
+
+  * Add a note about re-enabling ctrl-alt-backspace killing to NEWS.Debian.
+
+ -- David Nusinow dnusi...@debian.org  Tue, 25 Aug 2009 12:56:16 -0400
+
 xkeyboard-config (1.6-1) unstable; urgency=low
 
   * Add Breaks on old libx11-6.  It seems some people are keeping very, very


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

xorg-server: Changes to 'debian-unstable'

2009-08-25 Thread David Nusinow

 debian/changelog  |6 +-
 debian/xserver-xorg-core.NEWS |   10 --
 2 files changed, 1 insertion(+), 15 deletions(-)

New commits:
commit e01795938cbbcda93011a3a82acd888104ce4738
Author: David Nusinow dnusi...@debian.org
Date:   Tue Aug 25 12:58:16 2009 -0400

Revert Add a note about re-enabling ctrl-alt-backspace killing to 
NEWS.Debian.

Move this note to xkb-data instead where it's better suited. Thanks Julien!

This reverts commit 8411516487c98a7216853cdd2705f37a23e98785.

diff --git a/debian/changelog b/debian/changelog
index f70a0a7..984a16b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,11 @@
 xorg-server (2:1.6.3-2) UNRELEASED; urgency=low
 
-  [ Julien Cristau ]
   * Add patch stolen from Fedora to add the vboxvideo driver to the
 autodetection routine (closes: #540884).
   * Add built-ins to the default font path so that non-Xorg servers can use
 them (closes: #542707).  Thanks, Josselin Mouette!
 
-  [ David Nusinow ]
-  * Add a note about re-enabling ctrl-alt-backspace killing to NEWS.Debian.
-
- -- David Nusinow dnusi...@debian.org  Mon, 24 Aug 2009 23:40:55 -0400
+ -- Julien Cristau jcris...@debian.org  Tue, 11 Aug 2009 11:09:25 +0200
 
 xorg-server (2:1.6.3-1) unstable; urgency=low
 
diff --git a/debian/xserver-xorg-core.NEWS b/debian/xserver-xorg-core.NEWS
index 273f558..1048b56 100644
--- a/debian/xserver-xorg-core.NEWS
+++ b/debian/xserver-xorg-core.NEWS
@@ -1,13 +1,3 @@
-xorg-server (3:1.6.3-2) unstable; urgency=low
-
- * The X server no longer allows you to use ctrl-alt-backspace to kill the
-   X server by default. If you wish to re-enable this feature for the
-   current session you may do so by running the command 
-   setxkbmap -option terminate:ctrl_alt_bkspc. You may also enable this
-command in your xorg.conf using the XkbOptions Option.
-
- -- David Nusinow dnusi...@debian.org  Mon, 24 Aug 2009 23:34:19 -0400
-
 xorg-server (2:1.3.0.0.dfsg-3) unstable; urgency=low
 
   * The server now includes a patch to always include the font paths


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

xorg-server: Changes to 'debian-unstable'

2009-08-24 Thread David Nusinow

 debian/changelog  |6 +-
 debian/xserver-xorg-core.NEWS |   10 ++
 2 files changed, 15 insertions(+), 1 deletion(-)

New commits:
commit 8411516487c98a7216853cdd2705f37a23e98785
Author: David Nusinow dnusi...@debian.org
Date:   Mon Aug 24 23:45:59 2009 -0400

Add a note about re-enabling ctrl-alt-backspace killing to NEWS.Debian.

diff --git a/debian/changelog b/debian/changelog
index 984a16b..f70a0a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
 xorg-server (2:1.6.3-2) UNRELEASED; urgency=low
 
+  [ Julien Cristau ]
   * Add patch stolen from Fedora to add the vboxvideo driver to the
 autodetection routine (closes: #540884).
   * Add built-ins to the default font path so that non-Xorg servers can use
 them (closes: #542707).  Thanks, Josselin Mouette!
 
- -- Julien Cristau jcris...@debian.org  Tue, 11 Aug 2009 11:09:25 +0200
+  [ David Nusinow ]
+  * Add a note about re-enabling ctrl-alt-backspace killing to NEWS.Debian.
+
+ -- David Nusinow dnusi...@debian.org  Mon, 24 Aug 2009 23:40:55 -0400
 
 xorg-server (2:1.6.3-1) unstable; urgency=low
 
diff --git a/debian/xserver-xorg-core.NEWS b/debian/xserver-xorg-core.NEWS
index 1048b56..273f558 100644
--- a/debian/xserver-xorg-core.NEWS
+++ b/debian/xserver-xorg-core.NEWS
@@ -1,3 +1,13 @@
+xorg-server (3:1.6.3-2) unstable; urgency=low
+
+ * The X server no longer allows you to use ctrl-alt-backspace to kill the
+   X server by default. If you wish to re-enable this feature for the
+   current session you may do so by running the command 
+   setxkbmap -option terminate:ctrl_alt_bkspc. You may also enable this
+command in your xorg.conf using the XkbOptions Option.
+
+ -- David Nusinow dnusi...@debian.org  Mon, 24 Aug 2009 23:34:19 -0400
+
 xorg-server (2:1.3.0.0.dfsg-3) unstable; urgency=low
 
   * The server now includes a patch to always include the font paths


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

Re: X.org plans for the squeeze cycle

2009-08-23 Thread David Nusinow


Julien Cristau wrote:

[other xsf members, feel free to chime in if I'm forgetting something or
 saying something stupid :)]

On Sun, Aug 16, 2009 at 14:41:24 +0200, Marc Brockschmidt wrote:

  

* Which major upstream releases of X.org are expected in the next two
  years? Which of those are material for Debian stable, which might be a bit
  flaky?



X.org release management is notoriously pretty bad.  Releases often slip
by months, and bugs in .0 server releases aren't unheard of.  See also
http://www.openbsd.org/papers/asiabsdcon2009-release_engineering/mgp9.html

Anyway, there's no schedule for 1.7 to my knowledge, let alone for the
subsequent releases.  I'd guess server 1.7 (and X.Org 7.5) will come
before the end of the year, though, so that seems like a good candidate
for a squeeze release in 2010.
  


My main worry for 1.7 is that it probably won't give us a lot of time to 
shake bugs out of XKB2. We're not historically very good at dealing with 
the guts of the input system anyway, and that XKB2 won't provide any 
immediate user-visible changes that seem to make it a must have (if I'm 
wrong here, please correct me!) On the other hand, with the 1.6 servers 
we finally have a stable input system again, so my sense is that we 
should probably be conservative and go with the 1.6 branches for squeeze 
given our short time frame.



FWIW, the pattern so far looks like:
Apr 19  2007 xorg-server-1.3.0.0.tar.gz
Sep  6  2007 xorg-server-1.4.tar.gz
Jun 10  2008 xorg-server-1.4.1.tar.gz
Jun 11  2008 xorg-server-1.4.2.tar.gz
Sep  3  2008 xorg-server-1.5.0.tar.gz
Sep 23  2008 xorg-server-1.5.1.tar.gz
Oct 10  2008 xorg-server-1.5.2.tar.gz
Nov  5  2008 xorg-server-1.5.3.tar.gz
Feb 25 12:19 xorg-server-1.6.0.tar.gz
Apr 14 13:09 xorg-server-1.6.1.tar.gz
Jul  7 16:39 xorg-server-1.6.2.tar.gz
Jul 31 23:42 xorg-server-1.6.3.tar.gz

  

* How much time do you usually need from a new upstream release of X.org
  to a stable Debian package in unstable?



I'd say 6 months to a year from a .0 server to something we can ship in
stable.  Depending if RedHat/Fedora are shipping it too and thus fixing
most bugs for us.

  

* How many big transitions will the upcoming changes cause? When should those
  happen? Can we do something to make them easier?



Lately the big problems were related to the stability of the intel
driver, which went through several big changes (full modesetting in the
driver instead of using the bios, then switch of acceleration
architecture to EXA, then a kernel memory manager, then kernel mode
setting, and I'm probably forgetting some).  Hopefully most of that is
over, and we can migrate it to testing soon along with the rest of the X
stack.
Kernel mode setting for the radeon driver is being worked on, will be in
staging in the 2.6.31 kernel, so hopefully we can ship that stack with
squeeze.  The nouveau driver is also lining up for inclusion in the
kernel (maybe in staging in 2.6.32?) so it'd be really great to be able
to ship that in the release, too.
Some of that depends on having enough people available to package new
releases, triage/forward bugs, and test the new stuff.  I won't be able
to do much of that myself in the foreseeable future.
  


This is the big one to me. I don't interface at all with the 
debian-kernel folk, and have no idea what their plans are. Given the 
user demand that I've seen, I'd much rather throw whatever effort we can 
in to providing optional KMS bits for radeon, as well as high quality 
intel, than worry about XKB2 and Xserver 1.7. I don't know that we'll 
have the manpower to do that either, but this seems to be where we'll 
get the most payoff for our energy.



One thing that might cause some minor disruption in sid is the moving
around of headers between libxext and x11proto-xext
(http://lists.freedesktop.org/pipermail/xorg-announce/2009-August/000953.html).
Fedora already went through that, though, and the change should be
mostly invisible to clients.
  


I don't really know what to think about this.

- David Nusinow


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

Bug#492888: [xserver-xorg-input-kbd] Can confirm this bug

2009-08-19 Thread David Nusinow


severity 492888 important
thanks

Bastien ROUCARIES wrote:

severity 492888 grave
thanks
Package: xserver-xorg-input-kbd
Version: 1:1.3.1-1

I can confirm this bug. It is really a boring bug. dmesg is empty, log also. 
How can I debug this bug ?
  


Are you saying that the /var/log/Xorg.0.log is entirely empty? Or that 
there's nothing interesting? We'd like it if it has any text at all in 
it, as well as an xorg.conf if you have one.


Also what would be helpful is for you to get an X server backtrace if 
you have another machine you can use to ssh in to the crashed one. 
Instructions are here: http://wiki.debian.org/XStrikeForce/XserverDebugging.


Raise importance to grave because it completly render keyboard unusable after 
random time, and destroy completly my X session. Only mouse work, and I need 
to disconnect using mouse.
  


This is not a grave bug. Please don't inflate bug severities.

- David Nusinow



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

Bug#531295: libx11-6: warning: obsolete option '--print-installation-architecture'

2009-08-19 Thread David Nusinow


fixed 531295 2:1.2.2-1
thanks

Kurt Roeckx wrote:

Package: libx11-6
Version: 2:1.2.1-1

Hi,

I'm seeing this:
Unpacking libx11-6 (from .../libx11-6_2%3a1.2.1-1_amd64.deb) ...
dpkg: warning: obsolete option '--print-installation-architecture', please use 
'--print-architecture' instead.

I'm seeing this in almost every build log, and sbuild is sending
me a separate mail with those warnings.  So I would like it that
that this gets fixed soon.
  


This was fixed with the xsfbs merge in the last upload. Thanks for 
reporting it.


- David Nusinow


Kurt




  





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

xcursor-themes: Changes to 'debian-unstable'

2009-08-19 Thread David Nusinow

 debian/README.Debian |   19 +
 debian/README.source |   73 ++
 debian/changelog |   22 +-
 debian/compat|2 
 debian/control   |   16 -
 debian/copyright |2 
 debian/rules |   31 +-
 debian/watch |2 
 debian/xsfbs/repack.sh   |   32 ++
 debian/xsfbs/xsfbs-autoreconf.mk |  150 --
 debian/xsfbs/xsfbs.mk|  127 +--
 debian/xsfbs/xsfbs.sh|  417 +--
 12 files changed, 374 insertions(+), 519 deletions(-)

New commits:
commit ae793fbc07b96952274c685d340754e19f265d48
Author: David Nusinow dnusi...@debian.org
Date:   Wed Aug 19 21:13:04 2009 -0400

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index dc0d1c4..5234f4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xcursor-themes (1.0.1-6) UNRELEASED; urgency=low
+xcursor-themes (1.0.1-6) unstable; urgency=low
 
   [ Brice Goglin ]
   * Replace xbase-clients with x11-apps in Build-Depends since this is
@@ -21,7 +21,7 @@ xcursor-themes (1.0.1-6) UNRELEASED; urgency=low
   * Fix the copyright notice to point to the right place
   * Remove dh_clean -k and add a dh_prep in configure target
 
- -- David Nusinow dnusi...@debian.org  Wed, 19 Aug 2009 20:44:56 -0400
+ -- David Nusinow dnusi...@debian.org  Wed, 19 Aug 2009 21:05:10 -0400
 
 xcursor-themes (1.0.1-5) unstable; urgency=high
 

commit 8dcd05eaee07ce9ef5203f1e7d864d4c6645aa9f
Author: David Nusinow dnusi...@debian.org
Date:   Wed Aug 19 20:45:14 2009 -0400

Remove dh_clean -k and add a dh_prep in configure target

diff --git a/debian/changelog b/debian/changelog
index 01755f1..dc0d1c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,8 +19,9 @@ xcursor-themes (1.0.1-6) UNRELEASED; urgency=low
   * autoreconf at build time. Add automake to build-deps.
   * Bump debhelper compat to 7. No changes needed.
   * Fix the copyright notice to point to the right place
+  * Remove dh_clean -k and add a dh_prep in configure target
 
- -- David Nusinow dnusi...@debian.org  Wed, 19 Aug 2009 20:42:28 -0400
+ -- David Nusinow dnusi...@debian.org  Wed, 19 Aug 2009 20:44:56 -0400
 
 xcursor-themes (1.0.1-5) unstable; urgency=high
 
diff --git a/debian/rules b/debian/rules
index ce2fa57..63fc576 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,6 +34,7 @@ endif
 
 configure:
dh_testdir
+   dh_prep
autoreconf -vfi
 
 build: build-stamp
@@ -69,7 +70,6 @@ clean: xsfclean cleanscripts
 install: build
dh_testdir
dh_testroot
-   dh_clean -k
dh_installdirs
 
cd obj-$(DEB_BUILD_GNU_TYPE)  $(MAKE) DESTDIR=$(CURDIR)/debian/tmp 
install

commit 8c503e6a0ee401b547bfa9d962b8ac1a1da577ae
Author: David Nusinow dnusi...@debian.org
Date:   Wed Aug 19 20:42:45 2009 -0400

Fix the copyright notice to point to the right place

diff --git a/debian/changelog b/debian/changelog
index 44ad3c7..01755f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,8 +18,9 @@ xcursor-themes (1.0.1-6) UNRELEASED; urgency=low
   * Add a watch file
   * autoreconf at build time. Add automake to build-deps.
   * Bump debhelper compat to 7. No changes needed.
+  * Fix the copyright notice to point to the right place
 
- -- David Nusinow dnusi...@debian.org  Wed, 19 Aug 2009 20:40:27 -0400
+ -- David Nusinow dnusi...@debian.org  Wed, 19 Aug 2009 20:42:28 -0400
 
 xcursor-themes (1.0.1-5) unstable; urgency=high
 
diff --git a/debian/copyright b/debian/copyright
index 271163c..0422670 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,2 +1,2 @@
 This package is licensed under the MIT/X11 licence; please see
-/usr/share/doc/x-common/copyright for full copyright information.
+/usr/share/doc/x11-common/copyright for full copyright information.

commit a1a4ab3d9a18a39bf986ccbbf6e9019fc3fb7ce5
Author: David Nusinow dnusi...@debian.org
Date:   Wed Aug 19 20:40:55 2009 -0400

Bump debhelper compat to 7. No changes needed.

diff --git a/debian/changelog b/debian/changelog
index b9c4a7c..44ad3c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,8 +17,9 @@ xcursor-themes (1.0.1-6) UNRELEASED; urgency=low
   * Bump standards version to 3.8.3.0
   * Add a watch file
   * autoreconf at build time. Add automake to build-deps.
+  * Bump debhelper compat to 7. No changes needed.
 
- -- David Nusinow dnusi...@debian.org  Wed, 19 Aug 2009 20:38:44 -0400
+ -- David Nusinow dnusi...@debian.org  Wed, 19 Aug 2009 20:40:27 -0400
 
 xcursor-themes (1.0.1-5) unstable; urgency=high
 
diff --git a/debian/compat b/debian/compat
index b8626c4..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+7
diff --git a/debian/control b/debian/control
index d368e23..09a949f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force

xcursor-themes: Changes to 'refs/tags/xcursor-themes-1.0.1-6'

2009-08-19 Thread David Nusinow

Tag 'xcursor-themes-1.0.1-6' created by David Nusinow dnusi...@debian.org at 
2009-08-20 01:15 +

Tagging upload of xcursor-themes-1.0.1-6 to unstable.

Changes since the dawn of time:
Adam Jackson (1):
  Stub COPYING files

Branden Robinson (4):
  Set svn:keywords property to Id (keyword already present).
  Note probable out-of-dateness of maplink() function body.
  Add high-level documentation to XSFBS shell library, intended to reduce
  Test for existence of debian/patches directory before creating a symlink 
to it.

Brice Goglin (8):
  Fix displaying of patches applied by quilt.
  Minor fixes in the patching system.
  Fix display the output of quilt push/pop.
  Do not call laptop-detect, let the only user call it directly
  Restore the missing 1.0.1-5 changes
  Replace xbase-clients with x11-apps in Build-Depends
  Merge ../../../xsfbs/xsfbs into debian-unstable
  Update xsfbs/quilt patching rules to be compatible with the

Daniel Stone (1):
  Initial autotooling.

David Nusinow (36):
  Move the data and add packaging for what ubuntu has already packaged
  Pull in xsfbs
  * Hack off versioned build-dep on xbase-clients. Thanks Zephenia E. Hull 
for
  Prepare changelogs for upload to unstable
  Move xsfbs back to its rightful place
  * Add pkg-config to build-depends. Thanks Daniel Schepler. (closes: 
#362097)
  * Add libxcursor-dev to buld-depends
  Make us error out if we call patch and don't have quilt installed
  Fix the last commit and fix spelling error. Thanks Brice Goglin for the 
spelling catch.
  Prepare changelog for upload
  Fix for bug #371152. Thanks Joey Hess.
  Pull patches from ubuntu for ARCHITECTURE, LAPTOP, RECONFIGURE, 
FIRSTINST, and UPGRADE variables
  Move the files so they'll be put in debian/xsfbs automatically when pulled
  Merge branch 'upstream-unstable' into debian-unstable
  Update serverabi generation to also account for driver Provides
  Fix name of serverminver
  Add support for X server input ABI versioning
  Fix typo that prevented the input abi versioning from working.
  Fix one missed bit from the serverabiver - serverminver rename
  Remove make-orig-tar-gz target
  Kill the manifest code.
  Add README.source
  Merge commit 'xsfbs/debian-unstable' into debian-unstable
  Update xsfbs
  Add README.Debian explaining how to use these cursors
  Clean up the package description a little. Closes: #408837
  Remove Branden and Fabio from the Maintainer list
  Remove conflicts and replaces on ancient xlibs-data
  Add support for parallel make
  Bump standards version to 3.8.3.0
  Add a watch file
  autoreconf at build time. Add automake to build-deps.
  Bump debhelper compat to 7. No changes needed.
  Fix the copyright notice to point to the right place
  Remove dh_clean -k and add a dh_prep in configure target
  Prepare changelog for upload

Julien Cristau (16):
  Add new serverabi rule to generate drivers dependency on the server.
  Fix copy/paste typo in the input driver provides.
  xsfbs.mk: make 'serverabi' depend on 'install'
  Remove xsfbs-autoreconf.mk
  Remove the .pc directory properly
  xsfbs.sh: add remove_conffile_lookup
  xsfbs.sh: use 'local' now that policy allows it
  xsfbs.mk: fix the prepare target for parallel make
  xsfbs.mk: more parallel make fixing
  xsfbs.mk: update the list of releases, and drop some unused code
  xsfbs.mk: make 'log' a separate target
  xsfbs: add a repack script for uscan
  xsfbs.sh: kill {,de}register_x_lib_dir_with_ld_so
  xsfbs: repack.sh needs to be executable
  xsfbs: don't run dpkg --print-installation-architecture
  Kill custom readlink function

Kaleb Keithley (3):
  Initial revision
  XFree86 4.3.0.1
  XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks

Keith Packard (1):
  Avoid gumby trademark and copyright

Kevin E Martin (7):
  Fix handhelds cursor dependencies and EXTRA_DIST
  Various changes preparing packages for RC0:
  Add .xcf files to dist
  Update package version number for RC1 release.
  Get the cursor install dir from xcursor.pc.
  Update package version number for final X11R7 release candidate.
  Update package version for X11R7 release.

Steve Langasek (5):
  copy in old xlibs-data maintainer scripts lost in the R7 shuffle
  copy in old xlibs-data maintainer scripts lost in the R7 shuffle
  Add back maintainer scripts for managing default theme alternatives.
  update for X11R7 paths
  change names of all remaining data package directories to , for a more 
persistent naming scheme


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

Re: KMS and DRI support for radeon

2009-08-18 Thread David Nusinow


Eric Valette wrote:

Hi,

While successfully testing KMS for radeon with upcoming 2.6.31, I
discovered DRI stopped working when using XBMC.
Looking at the log, I found a message indicating user space was to old.

I tried first to update libdrm from git but this was not sufficient. I
tried then xf86-video-ati but then faced a problem due to upstream
changes xorg-server changes in dri2.h.

As a result I cannot test KMS and still get DRI working. KMS seems to
solve some laptop internal LVDS versus external screen when undocking
problem for me.

Do you plan a drop of a more recent X server git build in experimental
anytime soon? Or shall I try to build it myself using debian patches as
a staring point?

-- eric
  


You should definitely try to manage this yourself. Given that the 
release date for stable is rapidly approaching, and we're already rather 
strapped for manpower on this team, tracking the bleeding edge and still 
unfinished software (which radeon KMS most definitely is) remains a very 
low priority for us at the moment. You'll have a much better time 
working this out for yourself than waiting for us to deal with it. Good 
luck!


- David Nusinow


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

xorg: Changes to 'debian-unstable'

2009-08-13 Thread David Nusinow

 debian/changelog |   10 --
 debian/compat|2 +-
 debian/control   |4 ++--
 debian/rules |   24 
 4 files changed, 23 insertions(+), 17 deletions(-)

New commits:
commit 4d0132f3a02edac5e64dd84402a450a9052e1da2
Author: David Nusinow dnusi...@debian.org
Date:   Thu Aug 13 21:33:17 2009 -0400

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 5dd22bc..5ebc662 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.4+4) UNRELEASED; urgency=low
+xorg (1:7.4+4) unstable; urgency=low
 
   [ Timo Aaltonen ]
   * debian-x11-keymap.fdi: Check for input.keys from info.capabilities.
@@ -23,7 +23,7 @@ xorg (1:7.4+4) UNRELEASED; urgency=low
   * Bump standards version to 3.8.2. No changes necessary.
   * Remove obsolete and misplaced -k flag on a dh_clean
   
- -- Timo Aaltonen tjaal...@ubuntu.com  Thu, 02 Jul 2009 17:23:57 +0300
+ -- David Nusinow dnusi...@debian.org  Thu, 13 Aug 2009 21:19:12 -0400
 
 xorg (1:7.4+3) unstable; urgency=low
 

commit 554513e48c54e0cd3a2d5dfcae8b770ccfe7b6bd
Author: David Nusinow dnusi...@debian.org
Date:   Thu Aug 13 20:29:53 2009 -0400

Remove obsolete and misplaced -k flag on a dh_clean

diff --git a/debian/changelog b/debian/changelog
index f96601d..5dd22bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ xorg (1:7.4+4) UNRELEASED; urgency=low
   * Bump debhelper compat to v7. No changes necessary.
   * Rename stamps to take advantage of dh_clean v7 handling them automatically
   * Bump standards version to 3.8.2. No changes necessary.
+  * Remove obsolete and misplaced -k flag on a dh_clean
   
  -- Timo Aaltonen tjaal...@ubuntu.com  Thu, 02 Jul 2009 17:23:57 +0300
 
diff --git a/debian/rules b/debian/rules
index 0e86a55..5c26be2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -76,7 +76,7 @@ install-stamp: build-stamp
dh_testdir
dh_testroot
umask 022
-   dh_clean -k
+   dh_clean
chmod 755 debian/local/debian-setup-keyboard
touch $@
 

commit 4c8a446780a327eb3c934af4b2539a9f202b0c15
Author: David Nusinow dnusi...@debian.org
Date:   Thu Aug 13 20:26:05 2009 -0400

Bump standards version to 3.8.2. No changes necessary.

diff --git a/debian/changelog b/debian/changelog
index bc55380..f96601d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ xorg (1:7.4+4) UNRELEASED; urgency=low
   [ David Nusinow ]
   * Bump debhelper compat to v7. No changes necessary.
   * Rename stamps to take advantage of dh_clean v7 handling them automatically
+  * Bump standards version to 3.8.2. No changes necessary.
   
  -- Timo Aaltonen tjaal...@ubuntu.com  Thu, 02 Jul 2009 17:23:57 +0300
 
diff --git a/debian/control b/debian/control
index 14e83d9..6f45da2 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: David Nusinow dnusi...@debian.org, Branden Robinson 
bran...@debian.org, Drew Parsons dpars...@debian.org, Julien Cristau 
jcris...@debian.org
-Standards-Version: 3.8.1
+Standards-Version: 3.8.2
 Build-Depends: dpkg (= 1.7.0), po-debconf, debhelper (= 7)
 
 Package: x11-common

commit 34258a4f516104c9d7ef0f9243ccabbb2126948c
Author: David Nusinow dnusi...@debian.org
Date:   Thu Aug 13 20:25:39 2009 -0400

Bump debhelper build-dep version

diff --git a/debian/control b/debian/control
index 7c3d3e4..14e83d9 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: David Nusinow dnusi...@debian.org, Branden Robinson 
bran...@debian.org, Drew Parsons dpars...@debian.org, Julien Cristau 
jcris...@debian.org
 Standards-Version: 3.8.1
-Build-Depends: dpkg (= 1.7.0), po-debconf, debhelper (= 4.1.16)
+Build-Depends: dpkg (= 1.7.0), po-debconf, debhelper (= 7)
 
 Package: x11-common
 Architecture: all

commit 42f813b14218f5b2800ea5e763291d8cfbdca534
Author: David Nusinow dnusi...@debian.org
Date:   Thu Aug 13 20:11:06 2009 -0400

Rename stamps to take advantage of dh_clean v7 handling them automatically

diff --git a/debian/changelog b/debian/changelog
index 8571362..bc55380 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ xorg (1:7.4+4) UNRELEASED; urgency=low
 
   [ David Nusinow ]
   * Bump debhelper compat to v7. No changes necessary.
+  * Rename stamps to take advantage of dh_clean v7 handling them automatically
   
  -- Timo Aaltonen tjaal...@ubuntu.com  Thu, 02 Jul 2009 17:23:57 +0300
 
diff --git a/debian/rules b/debian/rules
index 0ede679..0e86a55 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,7 +43,7 @@ include debian/scripts/vars.$(ARCH)
 
 clean: cleanscripts
dh_testdir
-   dh_clean stamp-* debian/local/X debian/po/pothead
+   dh_clean debian/local/X debian/po/pothead
-rm -rf stampdir
-debconf-updatepo
 
@@ -52,17

xorg: Changes to 'refs/tags/xorg-1_7.4+4'

2009-08-13 Thread David Nusinow

Tag 'xorg-1_7.4+4' created by David Nusinow dnusi...@debian.org at 2009-08-14 
01:41 +

Tagging upload of xorg-1_7.4+4 to unstable.

Changes since xorg-1_7.4+3:
David Nusinow (6):
  Bump debhelper compat to v7. No changes necessary.
  Rename stamps to take advantage of dh_clean v7 handling them automatically
  Bump debhelper build-dep version
  Bump standards version to 3.8.2. No changes necessary.
  Remove obsolete and misplaced -k flag on a dh_clean
  Prepare changelog for upload

Julien Cristau (4):
  xserver-wrapper: recognize /usr/bin/X as a path to the wrapper.
  xserver-wrapper: don't print an error message if Xwrapper.config doesn't 
exist
  xserver-wrapper: add missing unprivileged options
  xserver-wrapper: don't check the mode of /dev/dri.

Timo Aaltonen (2):
  debian-x11-keymap.fdi: Check for input.keys from info.capabilities. 
(closes: #535291)
  control: Move xserver-xorg dependency on evdev after -input-all. 
Otherwise only evdev is installed by default.

---
 debian/changelog   |   27 +++
 debian/compat  |2 +-
 debian/control |6 +++---
 debian/local/debian-x11-keymap.fdi |2 +-
 debian/local/xserver-wrapper.c |   37 +
 debian/rules   |   24 
 6 files changed, 61 insertions(+), 37 deletions(-)
---


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

Re: Disabling the patch system from packages

2009-05-25 Thread David Nusinow


Bernhard R. Link wrote:

* Timo Aaltonen tjaal...@cc.hut.fi [090525 08:51]:
  

Why would it do that? Having a patch system in place allows them to just
add the patch and be done with it.



Which means you have to deal with a patch system. Without a patch system
you can just unpack the package, apply the patch, edit the changelog
and build the package.

I don't know how the security team thinks about those things, but I
personaly found packages without any patch system to be much easier to
deal with and to modify it.
  


The patch target is now standardized in policy, so our system shouldn't 
present any major surprises. With the massive increase in the use of 
quilt across the distro over the past year or two (it's obvious if 
you've been reading the changelogs) it's pretty clear that it's a 
standard tool at this point and shouldn't be shied away from by anyone 
in Debian. Furthermore, if they're willing to patch X, then they're 
surely brave enough to add a patch to the quilt stack. We should 
probably start shipping a standardized debian/README.source in all our 
packages to fully comply with policy though.


I'm personally also fine with leaving the patch system enabled by 
default, since quilt has been quite reliable for years now. If it 
actively helps out our downstreams then all the better.


- David Nusinow


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

xorg-server: Changes to 'debian-unstable'

2009-05-25 Thread David Nusinow

 debian/README.source |   73 +++
 debian/changelog |6 +++-
 2 files changed, 78 insertions(+), 1 deletion(-)

New commits:
commit a6e2afdc8759dd3baf7a73ed324396c17ae80f66
Author: David Nusinow dnusi...@debian.org
Date:   Mon May 25 21:22:33 2009 -0400

Changelog entry for README.source

diff --git a/debian/changelog b/debian/changelog
index 7b57c10..1d0468a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 xorg-server (2:1.6.1.901-3) UNRELEASED; urgency=low
 
+  [ Julien Cristau ]
   * xvfb-run: don't pass the magic cookie to xauth on the command line
 (CVE-2009-1573; closes: #526678).  Thanks, Loïc Minier!
   * xvfb-run: use mktemp to create the temporary directory.
@@ -17,7 +18,10 @@ xorg-server (2:1.6.1.901-3) UNRELEASED; urgency=low
 specify BusIDs, the server would just fail to start, so this hack should
 improve things.
 
- -- Julien Cristau jcris...@debian.org  Thu, 14 May 2009 21:05:26 +0200
+  [ David Nusinow ]
+  * Add README.source
+
+ -- David Nusinow dnusi...@debian.org  Mon, 25 May 2009 21:21:55 -0400
 
 xorg-server (2:1.6.1.901-2) unstable; urgency=low
 

commit 4178d948cd66a938222d0d7c6353ee8d60229e40
Author: David Nusinow dnusi...@debian.org
Date:   Mon May 25 20:08:50 2009 -0400

Add README.source

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 000..34ab4bf
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,73 @@
+--
+Quick Guide To Patching This Package For The Impatient
+--
+
+1. Make sure you have quilt installed
+2. Unpack the package as usual with dpkg-source -x
+3. Run the patch target in debian/rules
+4. Create a new patch with quilt new (see quilt(1))
+5. Edit all the files you want to include in the patch with quilt edit 
+   (see quilt(1)).
+6. Write the patch with quilt refresh (see quilt(1))
+7. Run the clean target in debian/rules
+
+Alternatively, instead of using quilt directly, you can drop the patch in to 
+debian/patches and add the name of the patch to debian/patches/series.
+
+
+Guide To The X Strike Force Packages
+
+
+The X Strike Force team maintains X packages in git repositories on
+git.debian.org in the pkg-xorg subdirectory. Most upstream packages
+are actually maintained in git repositories as well, so they often
+just need to be pulled into git.debian.org in a upstream-* branch.
+Otherwise, the upstream sources are manually installed in the Debian
+git repository.
+
+The .orig.tar.gz upstream source file could be generated this
+upstream-* branch in the Debian git repository but it is actually
+copied from upstream tarballs directly.
+
+Due to X.org being highly modular, packaging all X.org applications
+as their own independent packages would have created too many Debian
+packages. For this reason, some X.org applications have been grouped
+into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils,
+x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils.
+Most packages, including the X.org server itself and all libraries
+and drivers are, however maintained independently.
+
+The Debian packaging is added by creating the debian-* git branch
+which contains the aforementioned upstream-* branch plus the debian/
+repository files.
+When a patch has to be applied to the Debian package, two solutions
+are involved:
+* If the patch is available in one of the upstream branches, it
+  may be git'cherry-picked into the Debian repository. In this
+  case, it appears directly in the .diff.gz.
+* Otherwise, the patch is added to debian/patches/ which is managed
+  with quilt as documented in /usr/share/doc/quilt/README.source.
+
+quilt is actually invoked by the Debian X packaging through a larger
+set of scripts called XSFBS. XSFBS brings some other X specific
+features such as managing dependencies and conflicts due to the video
+and input driver ABIs.
+XSFBS itself is maintained in a separate repository at
+  git://git.debian.org/pkg-xorg/xsfbs.git
+and it is pulled inside the other Debian X repositories when needed.
+
+The XSFBS patching system requires a build dependency on quilt. Also
+a dependency on $(STAMP_DIR)/patch has to be added to debian/rules
+so that the XSFBS patching occurs before the actual build. So the
+very first target of the build (likely the one running autoreconf)
+should depend on $(STAMP_DIR)/patch. It should also not depend on
+anything so that parallel builds are correctly supported (nothing
+should probably run while patching is being done). And finally, the
+clean target should depend on the xsfclean target so that patches
+are unapplied on clean.
+
+When the upstream sources contain some DFSG-nonfree files, they are
+listed in text files in debian/prune/ in the debian-* branch of
+the Debian repository. XSFBS

Re: status of the 7.4 transition

2009-05-21 Thread David Nusinow


Thanks for managing this Julien.

Julien Cristau wrote:

On the second point I'm not quite sure:
- xorg-server has one outstanding serious bug, #508476: when
  xserver-xorg-video-fbdev is installed and you have no xorg.conf, X
  FatalErrors for no good reason.  Should this be a blocker?  Anything
  else?
  


Yuck. One thing we might want to do is install an empty xorg.conf by 
default. Since the codepaths for no xorg.conf and empty xorg.conf are 
slightly different, this might help us. If we can get a bug reporter to 
confirm that this solves the issue then it'd be a simple fix. It's also 
in line with where things need to go, since eventually no/empty 
xorg.conf needs to be just a special case for the partial-config setup.


- David Nusinow


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

Re: uploading xserver-xorg-input-synaptics [was Re: xserver-xorg-input-synaptics: Changes to 'upstream']

2009-05-12 Thread David Nusinow


Mattia Dongili wrote:

On Mon, May 11, 2009 at 09:26:23AM -0400, David Nusinow wrote:
  

Mattia Dongili wrote:


On Mon, May 11, 2009 at 10:04:49AM +0200, Julien Cristau wrote:
  

...
  

xserver-xorg-input-synaptics (1.1.1~git20090510-1) unreleased; urgency=low

  [ David Nusinow ]
  * Add NEWS.Debian entry about enabling tapping again (closes: #497523)
  

I think it'd be nice if the NEWS entry explained how to do this with
synclient rather than xorg.conf / hal.


The disadvantage with synclient is that the configuration is not
persistent.

  

The xorg.conf way probably needs things like a ServerLayout section, and
I'm not sure how well it'll keep working.  And fdi is not quite a nice
config file format.  Or we could point at gpointing-device-settings,
since that has been accepted in the archive now.


How about showing the synclient command line and pointing at the
existing documentation for how to configure hal/xorg.conf?
Something along the lines of:

  * Tapping has been disabled by default on many touchpads by upstream.
If you want to re-enable it, you can do so from within the X
environment by running the following commands in a terminal:

$ synclient TapButton1=1
$ synclient TapButton2=2
$ synclient TapButton3=3

Note that the configuration will not be permanently modified, to do
so please read the documentation about how to set up your xorg.conf
file in the synaptics(4) manpage or in
/usr/share/doc/xserver-xorg-input-synaptics.
Another alternative is to use desktop environment specific tools
like gpointing-device-settings or touchfreeze.

Thoughts?

  

This sounds good to me, although it might be a good idea to write either
a section in the manpage devoted to setting this up and pointing users
to that section in the NEWS file (e.g. Please see the section Tapping
in your xorg.conf) so that users don't have to crawl through the entire
manpage for what's very likely going to be a common thing.



Hmmm, I'm unsure about how appropriate it would be to have a section
just for tapping.
Pointing to the NOTES section should be good though. I'll add a few
words about tapping being disabled by default and the TapButton* options
being the ones to look for.

How's this?
Index: xserver-xorg-input-synaptics/man/synaptics.man
===
--- xserver-xorg-input-synaptics.orig/man/synaptics.man 2009-05-13 
00:14:36.753651106 +0900
+++ xserver-xorg-input-synaptics/man/synaptics.man  2009-05-13 
00:27:28.785651827 +0900
@@ -813,6 +813,9 @@
 vertical scrolling is enabled, horizontal two-finger scrolling is disabled and
 edge scrolling is disabled. If no multi-finger capabilities are reported,
 edge scrolling is enabled for both horizontal and vertical scrolling.
+Tapping is disabled by default for touchpads with two buttons or more, to 
enable
+it you need to map tap actions to buttons. See the TapButton1, TapButton2
+and TapButton3 option descriptions for their meaning.
 .LP
 Button mapping for physical buttons is handled in the server.
 If the device is switched to left-handed (an in-server mapping of physical

and this:

xserver-xorg-input-synaptics (1.1.1~git20090510-1) unstable; urgency=low

  * Tapping has been disabled by default on many touchpads by upstream, see
the NOTES section in the synaptics(4) manpage for a short overview
about how defaults are calculated.
If you want to re-enable it, you can do so from within the X
environment by running the following commands in a terminal:

$ synclient TapButton1=1
$ synclient TapButton2=2
$ synclient TapButton3=3

Note that the configuration will not be permanently modified, to do
so assign the above option values in your xorg.conf or custom fdi file
(see the synaptics(4) manpage or the documents in
/usr/share/doc/xserver-xorg-input-synaptics for additional details).
Another alternative is to use desktop environment specific tools
like gpointing-device-settings or touchfreeze.

 -- David Nusinow dnusi...@debian.org  Sat, 11 Apr 2009 16:23:11 -0400
  


Looks good to me.

- David Nusinow


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

Re: Bug#527920: please break circular dependency

2009-05-11 Thread David Nusinow

Bernhard R. Link wrote:
 At least the description of xserver-xorg should be changed. It still
 says:
 
 | This package depends on the  full suite of the server  and drivers
 | for the X.Org  X server, as well as providing a configuration
 | infrastructure to manage xorg.conf. It does not  provide the actual
 | server itself, but removing it is strongly discouraged.
 
 This description screams with every single word you are able to remove
 this package but you do not want to unless in strange situations.
 Which is simply not true unless the dependency from xserver-xorg-core
 to xserver-xorg is not a bug. (And of course increases the confusion
 of our users (and of the developers, reading this description I also
 first thought the dependency from xserver-xorg-core to xserver-xorg
 was some bug introduced by someone trying to fix some bug without
 thinking)).

Dude... you already reported this bug in #523630, which I've tagged
pending because it's already fixed in git and will be in the next
upload. Please don't pester us with this again.

 - David Nusinow


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

Re: uploading xserver-xorg-input-synaptics [was Re: xserver-xorg-input-synaptics: Changes to 'upstream']

2009-05-11 Thread David Nusinow

Mattia Dongili wrote:
 On Mon, May 11, 2009 at 10:04:49AM +0200, Julien Cristau wrote:
 On Mon, May 11, 2009 at 08:08:43 +0900, Mattia Dongili wrote:

 Later tonight (JST), if nobody objects, I'd like to upload a new
 xserver-xorg-input-synaptics based on the current upstream code of the
 1.1 branch.
 Sounds good!

ACK.

 
 Excellent, let's figure out a good wording for the NEWS file and I'll
 upload it.

Yeah, I wrote the NEWS entry in order to give users some sort of
documentation, but since I don't use synaptics myself it's definitely a
suboptimal entry.

 xserver-xorg-input-synaptics (1.1.1~git20090510-1) unreleased; urgency=low

   [ David Nusinow ]
   * Add NEWS.Debian entry about enabling tapping again (closes: #497523)
 I think it'd be nice if the NEWS entry explained how to do this with
 synclient rather than xorg.conf / hal.
 
 The disadvantage with synclient is that the configuration is not
 persistent.
 
 The xorg.conf way probably needs things like a ServerLayout section, and
 I'm not sure how well it'll keep working.  And fdi is not quite a nice
 config file format.  Or we could point at gpointing-device-settings,
 since that has been accepted in the archive now.
 
 How about showing the synclient command line and pointing at the
 existing documentation for how to configure hal/xorg.conf?
 Something along the lines of:
 
   * Tapping has been disabled by default on many touchpads by upstream.
 If you want to re-enable it, you can do so from within the X
 environment by running the following commands in a terminal:
 
   $ synclient TapButton1=1
   $ synclient TapButton2=2
   $ synclient TapButton3=3
 
 Note that the configuration will not be permanently modified, to do
 so please read the documentation about how to set up your xorg.conf
 file in the synaptics(4) manpage or in
 /usr/share/doc/xserver-xorg-input-synaptics.
 Another alternative is to use desktop environment specific tools
 like gpointing-device-settings or touchfreeze.
 
 Thoughts?
 

This sounds good to me, although it might be a good idea to write either
a section in the manpage devoted to setting this up and pointing users
to that section in the NEWS file (e.g. Please see the section Tapping
in your xorg.conf) so that users don't have to crawl through the entire
manpage for what's very likely going to be a common thing.

Another option is a separate document slipped in to
/usr/share/doc/xserver-xorg-input-synaptics, but I think a manpage
section that can be pushed upstream would be better.

 - David Nusinow


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

xorg-server: Changes to 'refs/tags/xorg-server-2_1.6.1.901-1'

2009-05-11 Thread David Nusinow

Tag 'xorg-server-2_1.6.1.901-1' created by David Nusinow dnusi...@debian.org 
at 2009-05-12 02:58 +

Tagging upload of xorg-server-2_1.6.1.901-1 to experimental.

Changes since xorg-server-2_1.6.1-1:
Ander Conselvan de Oliveira (1):
  xfree86: Remove device from inputInfo.devices if ActivateDevice failed.

Brice Goglin (1):
  Add 20_hurd-i386.diff to fix FTBFS on hurd-i386

David Nusinow (3):
  Have the reportbug script append lshal and drm info.
  Merge branch 'upstream-experimental' into debian-experimental
  New upstream development release

Eamon Walsh (3):
  security: Revert behavior of extension access for compatibility.
  security: Fix a crash caused by wrong ordering of format arguments.
  security: Grant untrusted windows remove access on all windows.

Ian Romanick (1):
  DRI2: Send the version the code actually supports

Jesse Barnes (1):
  Don't prepare outputs  crtcs if set_mode_major is present

Julien Cristau (4):
  Properly initialize libgcrypt in the libgcrypt patch (closes: #524822).
  Add XI 1.5 event and requests to protocol.txt
  Add RandR 1.3 requests to protocol.txt
  Bug#21324: Add quirk for Iiyama Vision Master 450

Keith Packard (1):
  xserver 1.6.1.901

Michel Dänzer (2):
  EXA: Handle separate alpha maps properly in Composite fallback, take two.
  EXA: Guard empty pending region warning by DEBUG_MIGRATE.

Peter Hutterer (1):
  dix: ignore non-pointer events in XineramaCheckMotion (#20557)

Pierre Ossman (2):
  Xi: don't send XKB mapping notifications when XKB is disabled
  dix: fix calculation of number of fake KeyRelease events

Tormod Volden (1):
  xfree86: edid quirk for Philips LCD LP154W01-TLAJ

---
 Xext/security.c |   42 +++--
 Xi/exevents.c   |3 
 configure.ac|4 
 debian/changelog|   23 +++
 debian/patches/20_hurd-i386.diff|  115 
 debian/patches/Add-libgcrypt-as-an-option-for-sha1.diff |   42 +++--
 debian/patches/series   |1 
 debian/xserver-xorg-core.bug.script |   10 +
 dix/events.c|   17 ++
 dix/getevents.c |   14 +
 dix/protocol.txt|   12 +
 exa/exa.c   |   13 +
 exa/exa.h   |   14 +
 exa/exa_migration.c |2 
 exa/exa_unaccel.c   |   25 +++
 hw/xfree86/common/xf86Xinput.c  |4 
 hw/xfree86/dri2/dri2ext.c   |4 
 hw/xfree86/modes/xf86Crtc.c |   11 +
 hw/xfree86/modes/xf86EdidModes.c|   10 +
 19 files changed, 317 insertions(+), 49 deletions(-)
---


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

xorg-docs: Changes to 'debian-unstable'

2009-05-11 Thread David Nusinow

 debian/changelog  |   11 +++
 debian/control|   14 --
 debian/xorg-docs-core.install |7 +++
 debian/xorg-docs.install  |7 ---
 4 files changed, 30 insertions(+), 9 deletions(-)

New commits:
commit 208edd563b8eb1cc586ef18ce8408cf1cdb784e6
Author: David Nusinow dnusi...@debian.org
Date:   Mon May 11 23:06:08 2009 -0400

Make xorg-docs-core replace old xorg-docs

diff --git a/debian/control b/debian/control
index 56c9026..236b415 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@ Package: xorg-docs-core
 Architecture: all
 Depends: ${misc:Depends}
 Suggests: xorg-docs
+Replaces: xorg-docs (  1:1.4-5 )
 Description: Core documentation for the X.org X Window System
  This package contains core documentation for the X.org X Window
  System. This currently includes only a set of manpages which are

commit b3d07d79bb0701a61df613066346e12f41cf317c
Author: David Nusinow dnusi...@debian.org
Date:   Mon May 11 23:06:00 2009 -0400

Minor cleanup of the xorg-docs package description

diff --git a/debian/changelog b/debian/changelog
index 2de56d7..2abe0f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ xorg-docs (1:1.4-5) unstable; urgency=low
 this is just a few manpages. This allows for a slimmer install by
 default, while still maintaining the basic documentation every user
 should expect.
+  * Minor cleanup of the xorg-docs package description
 
  -- David Nusinow dnusi...@debian.org  Mon, 11 May 2009 22:39:29 -0400
 
diff --git a/debian/control b/debian/control
index 746430d..56c9026 100644
--- a/debian/control
+++ b/debian/control
@@ -22,8 +22,8 @@ Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: xprt-xprintorg (= 1:0.1.0.alpha1-10)
 Replaces: xspecs (= 1:1.2+git20061105-2), xprt-xprintorg (= 
1:0.1.0.alpha1-10)
-Description: Miscellaneous documentation for the X.Org software suite
- This package contains various documents on the X.Org software system
+Description: Miscellaneous documentation for the X.org X Window System
+ This package contains various documents on the X.org X Window System
  including the release notes for the current version and instructions on
  the font and xkb subsystems. The documents are in html, pdf, ps, and plain
  text format.

commit 9b21aa5e840eb809d2b195df3771f71a950c53d7
Author: David Nusinow dnusi...@debian.org
Date:   Mon May 11 22:41:52 2009 -0400

Create a new xorg-docs-core package.

This package contains only the standard documents one would expect in an X
installation. Currently this is just a few manpages. This allows for a
slimmer install by default, while still maintaining the basic documentation
every user should expect.

diff --git a/debian/changelog b/debian/changelog
index 94e90d6..2de56d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xorg-docs (1:1.4-5) unstable; urgency=low
+
+  * Create a new xorg-docs-core package. This package contains only the
+standard documents one would expect in an X installation. Currently
+this is just a few manpages. This allows for a slimmer install by
+default, while still maintaining the basic documentation every user
+should expect.
+
+ -- David Nusinow dnusi...@debian.org  Mon, 11 May 2009 22:39:29 -0400
+
 xorg-docs (1:1.4-4) unstable; urgency=low
 
   * Add upstream URL to the copyright file (closes: #512132).
diff --git a/debian/control b/debian/control
index 6909f99..746430d 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,15 @@ Standards-Version: 3.7.2.2
 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/doc/xorg-docs
 XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/doc/xorg-docs.git
 
+Package: xorg-docs-core
+Architecture: all
+Depends: ${misc:Depends}
+Suggests: xorg-docs
+Description: Core documentation for the X.org X Window System
+ This package contains core documentation for the X.org X Window
+ System. This currently includes only a set of manpages which are
+ standard for the system.
+
 Package: xorg-docs
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}
diff --git a/debian/xorg-docs-core.install b/debian/xorg-docs-core.install
new file mode 100644
index 000..a797d07
--- /dev/null
+++ b/debian/xorg-docs-core.install
@@ -0,0 +1,7 @@
+usr/share/man/man7/Xsecurity.7
+usr/share/man/man7/X.7
+usr/share/man/man7/XOrgFoundation.7
+usr/share/man/man7/Xprint.7
+usr/share/man/man7/XProjectTeam.7
+usr/share/man/man7/XStandards.7
+usr/share/man/man7/XConsortium.7
diff --git a/debian/xorg-docs.install b/debian/xorg-docs.install
index 60fe7cd..0cb5ed8 100644
--- a/debian/xorg-docs.install
+++ b/debian/xorg-docs.install
@@ -59,10 +59,3 @@ usr/share/X11/doc/README.sgml
 usr/share/X11/doc/RELNOTES.sgml
 usr/share/X11/doc/Versions.sgml
 usr/share/X11/doc/MAINTAINERS
-usr/share/man/man7/Xsecurity.7
-usr/share/man/man7/X.7
-usr/share/man/man7/XOrgFoundation.7
-usr/share/man/man7/Xprint.7
-usr/share

xorg-docs: Changes to 'refs/tags/xorg-docs-1_1.4-5'

2009-05-11 Thread David Nusinow

Tag 'xorg-docs-1_1.4-5' created by David Nusinow dnusi...@debian.org at 
2009-05-12 03:21 +

Tagging upload of xorg-docs-1_1.4-5 to unstable.

Changes since xorg-docs-1_1.4-4:
David Nusinow (3):
  Create a new xorg-docs-core package.
  Minor cleanup of the xorg-docs package description
  Make xorg-docs-core replace old xorg-docs

---
 debian/changelog  |   11 +++
 debian/control|   14 --
 debian/xorg-docs-core.install |7 +++
 debian/xorg-docs.install  |7 ---
 4 files changed, 30 insertions(+), 9 deletions(-)
---


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

xorg: Changes to 'debian-unstable'

2009-05-11 Thread David Nusinow

 debian/changelog |3 +++
 debian/control   |4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 3b33c7671fd92c301c2ed8076ac9157e30ea92a0
Author: David Nusinow dnusi...@debian.org
Date:   Mon May 11 23:22:05 2009 -0400

Make xorg depend on xorg-docs-core and move xorg-docs to be a suggests.

This makes for a slimmer default while providing the necessary manpages
that we expect to be present on every install.

diff --git a/debian/changelog b/debian/changelog
index 21862a4..51f285c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ xorg (1:7.4+2) UNRELEASED; urgency=low
 It remains tied to -core at this point. (closes: #523630).
   * Add libgl1-mesa-dri to the depends of the xorg package to ensure that
 it gets pulled in even if Recommends are disabled
+  * Make xorg depend on xorg-docs-core and move xorg-docs to be a
+suggests.  This makes for a slimmer default while providing the
+necessary manpages that we expect to be present on every install.
 
   [ Julien Cristau ]
   * Update the NEWS entry for xserver-xorg 1:7.4+1 to include a warning about
diff --git a/debian/control b/debian/control
index 590d225..5a8548b 100644
--- a/debian/control
+++ b/debian/control
@@ -118,9 +118,9 @@ Description: the X.Org X server -- input driver metapackage
 
 Package: xorg
 Architecture: any
-Depends: xserver-xorg, libgl1-mesa-glx | libgl1, libgl1-mesa-dri, 
libglu1-mesa, xfonts-base (= 1:1.0.0-1), xfonts-100dpi (= 1:1.0.0-1), 
xfonts-75dpi (= 1:1.0.0-1), xfonts-scalable (= 1:1.0.0-1), x11-apps, 
x11-session-utils, x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils, 
xauth, xinit, xfonts-utils, xkb-data, xterm | x-terminal-emulator, sparc-utils 
[sparc]
-Recommends: xorg-docs
+Depends: xserver-xorg, libgl1-mesa-glx | libgl1, libgl1-mesa-dri, 
libglu1-mesa, xfonts-base (= 1:1.0.0-1), xfonts-100dpi (= 1:1.0.0-1), 
xfonts-75dpi (= 1:1.0.0-1), xfonts-scalable (= 1:1.0.0-1), x11-apps, 
x11-session-utils, x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils, 
xauth, xinit, xfonts-utils, xkb-data, xorg-docs-core, xterm | 
x-terminal-emulator, sparc-utils [sparc]
 Provides: x-window-system, x-window-system-core
+Suggests: xorg-docs
 Description: X.Org X Window System
  This metapackage provides the components for a standalone
  workstation running the X Window System.  It provides the X libraries, an X


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

Bug#527920: please break circular dependency

2009-05-09 Thread David Nusinow


Holger Levsen wrote:
I'd be nice if you'd either given the number or even better, merged yourself. 
But thats bts-usage nitpicking and hardly worth saying :-)


What's worth saying is, that you didnt give a reason for 396613 being marked 
wontfix here and that there is none in 396613. You dont even give a reason 
why there is this circular dependency which causes real problems for existing 
tools.


Can you please explain?!
  


Because these two packages do actually depend on each other to function. 
That's a hard dependency and there's no way around it. Ian Jackson has 
argued strenuously that circular dependencies are not a bad thing, and 
that dpkg handles them fine, and I'm in agreement with him. That said, 
the reason why xserver-xorg was split from xserver-xorg-core was to 
separate the very large and rapidly changing server config scripts from 
the server itself, allowing us to make rapid improvements to them with 
minimal stress to ourselves and our users. Now that those scripts are 
essentially gone, it's time to start thinking earnestly about reuniting 
them as xserver-xorg, and letting -core go away. This is *not* the same 
thing as removing the circular dependency, which is necessary and 
correct so long as these two packages exist despite whatever buggy tools.


- David Nusinow



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

Re: console-setup + X = broken console

2009-05-09 Thread David Nusinow


Hi Adam,

Adam Majer wrote:

Hello,

I've just installed the console-setup because X server depends on it.
Now, my console is completely unusable. The text does not scroll it just
runs off the screen.

I'm writing to both maintainers because,

  1. Why, why, why is console-setup a dependency of X? X does not
function without console-setup? Is it possible to have X only Suggest or
Recommend console-setup?
  


Please see http://wiki.debian.org/XStrikeForce/InputHotplugGuide for the 
rationale and #515214 for more info.



  2. What are the settings in console-setup that leave my console alone?
I just want to have boot time fonts, with boot time display. The console
fonts look rather *bad* and it doesn't matter which ones I try to set.
Be it VGA or Terminus or whatever. Is it possible for console-setup to
only setup keyboard map and leave the fonts as is?



I'm using nvidia drivers which work perfectly until the console-setup
dependency broke my console :(

- Adam

PS. I'm not on the list(s) - CC me in replies

As requested.

- David Nusinow


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

xserver-xorg-video-chips: Changes to 'debian-unstable'

2009-05-04 Thread David Nusinow

 debian/changelog   |7 +++
 debian/patches/03_gen_pci_ids.diff |   20 
 debian/patches/series  |1 -
 3 files changed, 7 insertions(+), 21 deletions(-)

New commits:
commit e6e008c5508c482858116b353c71f2a7b384a3cc
Author: David Nusinow dnusi...@debian.org
Date:   Mon May 4 21:48:42 2009 -0400

Remove 03_gen_pci_ids.diff.
The server now uses an internal table to pick a video card during 
autoconfig.

diff --git a/debian/changelog b/debian/changelog
index aef95ca..a238b06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-chips (1:1.2.1-3) UNRELEASED; urgency=low
+
+  * Remove 03_gen_pci_ids.diff. The server now uses an internal table to
+pick a video card during autoconfig.
+
+ -- David Nusinow dnusi...@debian.org  Mon, 04 May 2009 21:47:51 -0400
+
 xserver-xorg-video-chips (1:1.2.1-2) unstable; urgency=low
 
   * Upload to unstable.
diff --git a/debian/patches/03_gen_pci_ids.diff 
b/debian/patches/03_gen_pci_ids.diff
deleted file mode 100644
index 5739f27..000
--- a/debian/patches/03_gen_pci_ids.diff
+++ /dev/null
@@ -1,20 +0,0 @@
 /dev/null
-+++ xserver-xorg-video-chips/src/chips.ids
-@@ -0,0 +1,8 @@
-+102C00D8
-+102C00DC
-+102C00E0
-+102C00E4
-+102C00E5
-+102C00F4
-+102C00C0
-+102C0C30
 xserver-xorg-video-chips.orig/src/Makefile.am
-+++ xserver-xorg-video-chips/src/Makefile.am
-@@ -53,3 +53,6 @@
-  ct_regs.c \
-  ct_shadow.c \
-  ct_video.c
-+
-+pcidatadir = $(datadir)/xserver-xorg/pci
-+pcidata_DATA = chips.ids
diff --git a/debian/patches/series b/debian/patches/series
index 861101e..e0b86e5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 01_default_to_noaccel_on_69k.diff
 02_default_to_swcursor_on_69k.diff
-03_gen_pci_ids.diff


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

xserver-xorg-video-cirrus: Changes to 'debian-unstable'

2009-05-04 Thread David Nusinow

 debian/changelog   |8 
 debian/control |1 -
 debian/patches/01_gen_pci_ids.diff |   27 ---
 debian/patches/series  |1 -
 debian/rules   |4 ++--
 5 files changed, 10 insertions(+), 31 deletions(-)

New commits:
commit 5758ae416b4504d892e17b1f071a8c10d58ee5c5
Author: David Nusinow dnusi...@debian.org
Date:   Mon May 4 21:51:42 2009 -0400

Remove 01_gen_pci_ids.diff.

The X server now uses an internal table to pick a driver during autoconfig.
Disable patch system and remove quilt from build-dep

diff --git a/debian/changelog b/debian/changelog
index 120f5f4..43ce2e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-cirrus (1:1.2.1-5) UNRELEASED; urgency=low
+
+  * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to
+pick a driver during autoconfig.
++ Disable patch system and remove quilt from build-dep
+
+ -- David Nusinow dnusi...@debian.org  Mon, 04 May 2009 21:50:40 -0400
+
 xserver-xorg-video-cirrus (1:1.2.1-4) unstable; urgency=low
 
   * Upload to unstable.
diff --git a/debian/control b/debian/control
index 130c387..5d3b8a6 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Uploaders: David Nusinow dnusi...@debian.org, Brice Goglin 
bgog...@debian.org
 Build-Depends:
  debhelper (= 5),
  pkg-config,
- quilt,
  xserver-xorg-dev (= 2:1.5.99.901),
  x11proto-video-dev,
  x11proto-core-dev,
diff --git a/debian/patches/01_gen_pci_ids.diff 
b/debian/patches/01_gen_pci_ids.diff
deleted file mode 100644
index 707426b..000
--- a/debian/patches/01_gen_pci_ids.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: xserver-xorg-video-cirrus/src/cirrus.ids
-===
 /dev/null  1970-01-01 00:00:00.0 +
-+++ xserver-xorg-video-cirrus/src/cirrus.ids   2008-05-22 08:21:10.0 
+0200
-@@ -0,0 +1,11 @@
-+101300A0
-+101300A4
-+101300A8
-+101300AC
-+101300B8
-+101300BC
-+101300D0
-+101300D4
-+101300D5
-+101300D6
-+10130038
-Index: xserver-xorg-video-cirrus/src/Makefile.am
-===
 xserver-xorg-video-cirrus.orig/src/Makefile.am 2008-05-22 
08:20:51.0 +0200
-+++ xserver-xorg-video-cirrus/src/Makefile.am  2008-05-22 08:21:10.0 
+0200
-@@ -57,3 +57,6 @@
-  lg_i2c.c \
-  lg_xaa.c \
-  lg_xaa.h
-+
-+pcidatadir = $(datadir)/xserver-xorg/pci
-+pcidata_DATA = cirrus.ids
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b55d79f..000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01_gen_pci_ids.diff
diff --git a/debian/rules b/debian/rules
index 1aad3af..8476ace 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ endif
 # kbd_drv.a isn't phenomenally useful; kbd_drv.so more so
 confflags += --disable-static
 
-configure: $(STAMP_DIR)/patch
+configure:
dh_testdir
autoreconf -vfi
 
@@ -48,7 +48,7 @@ build-stamp: configure
cd obj-$(DEB_BUILD_GNU_TYPE)  $(MAKE)
$@
 
-clean: xsfclean
+clean:
dh_testdir
dh_testroot
rm -f build-stamp


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

xserver-xorg-video-glint: Changes to 'debian-unstable'

2009-05-04 Thread David Nusinow

 debian/changelog   |7 +++
 debian/patches/03_gen_pci_ids.diff |   26 --
 debian/patches/series  |1 -
 3 files changed, 7 insertions(+), 27 deletions(-)

New commits:
commit 730f8e7272bbb060e28308704f6a8c67937ceac7
Author: David Nusinow dnusi...@debian.org
Date:   Mon May 4 21:54:18 2009 -0400

Remove 03_gen_pci_ids.diff.

The X server now uses an internal table to choose a driver during
autoconfiguration.

diff --git a/debian/changelog b/debian/changelog
index 74d052b..e632a90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-glint (1:1.2.2-3) UNRELEASED; urgency=low
+
+  * Remove 03_gen_pci_ids.diff. The X server now uses an internal table to
+choose a driver during autoconfiguration.
+
+ -- David Nusinow dnusi...@debian.org  Mon, 04 May 2009 21:53:31 -0400
+
 xserver-xorg-video-glint (1:1.2.2-2) unstable; urgency=low
 
   * Upload to unstable.
diff --git a/debian/patches/03_gen_pci_ids.diff 
b/debian/patches/03_gen_pci_ids.diff
deleted file mode 100644
index c9c1f92..000
--- a/debian/patches/03_gen_pci_ids.diff
+++ /dev/null
@@ -1,26 +0,0 @@
 /dev/null
-+++ xserver-xorg-video-glint/src/glint.ids
-@@ -0,0 +1,14 @@
-+104C3D04
-+104C3D07
-+3D3D0001
-+3D3D0002
-+3D3D0003
-+3D3D0004
-+3D3D0006
-+3D3D0007
-+3D3D0008
-+3D3D0009
-+3D3D000A
-+3D3D000C
-+3D3D000D
-+3D3D000E
 xserver-xorg-video-glint.orig/src/Makefile.am
-+++ xserver-xorg-video-glint/src/Makefile.am
-@@ -60,3 +60,6 @@
-  glint_dri.h \
-  glint_dripriv.h
- endif
-+
-+pcidatadir = $(datadir)/xserver-xorg/pci
-+pcidata_DATA = glint.ids
diff --git a/debian/patches/series b/debian/patches/series
index ff7ccb9..96dbfc5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 01_glint_man.diff
-03_gen_pci_ids.diff


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

xserver-xorg-video-i128: Changes to 'debian-unstable'

2009-05-04 Thread David Nusinow

 debian/changelog   |8 
 debian/control |1 -
 debian/patches/01_gen_pci_ids.diff |   16 
 debian/patches/series  |1 -
 debian/rules   |4 ++--
 5 files changed, 10 insertions(+), 20 deletions(-)

New commits:
commit 822951b1341fb9f0f10cd05735c153cd9e366951
Author: David Nusinow dnusi...@debian.org
Date:   Mon May 4 22:01:55 2009 -0400

Remove 01_gen_pci_ids.diff.

The X server now uses an internal table to choose a driver during
autoconfiguration.

Disable the patch system and remove quilt from the build-deps

diff --git a/debian/changelog b/debian/changelog
index 0e00618..9c5d393 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-i128 (1:1.3.1-4) UNRELEASED; urgency=low
+
+  * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to
+choose a driver during autoconfiguration.
++ Disable the patch system and remove quilt from the build-deps
+
+ -- David Nusinow dnusi...@debian.org  Mon, 04 May 2009 22:01:04 -0400
+
 xserver-xorg-video-i128 (1:1.3.1-3) unstable; urgency=low
 
   * Upload to unstable.
diff --git a/debian/control b/debian/control
index a0fbcb0..48f8f06 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Uploaders: David Nusinow dnusi...@debian.org, Julien Cristau 
jcris...@debian.
 Build-Depends:
  debhelper (= 5.0.0),
  pkg-config,
- quilt,
  xserver-xorg-dev (= 2:1.5.99.901),
  x11proto-video-dev,
  x11proto-core-dev,
diff --git a/debian/patches/01_gen_pci_ids.diff 
b/debian/patches/01_gen_pci_ids.diff
deleted file mode 100644
index 0728c01..000
--- a/debian/patches/01_gen_pci_ids.diff
+++ /dev/null
@@ -1,16 +0,0 @@
 xserver-xorg-video-i128.orig/src/Makefile.am
-+++ xserver-xorg-video-i128/src/Makefile.am
-@@ -40,3 +40,6 @@
-  i128reg.h \
-  IBMRGB.h \
-  Ti302X.h
-+
-+pcidatadir = $(datadir)/xserver-xorg/pci
-+pcidata_DATA = i128.ids
 /dev/null
-+++ xserver-xorg-video-i128/src/i128.ids
-@@ -0,0 +1,4 @@
-+105D2309
-+105D2339
-+105D493D
-+105D5348
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b55d79f..000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01_gen_pci_ids.diff
diff --git a/debian/rules b/debian/rules
index d63bfba..3048dc1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ endif
 # kbd_drv.a isn't phenomenally useful; kbd_drv.so more so
 confflags += --disable-static
 
-configure: $(STAMP_DIR)/patch
+configure:
dh_testdir
autoreconf -vfi
 
@@ -47,7 +47,7 @@ build-stamp: configure
cd obj-$(DEB_BUILD_GNU_TYPE)  $(MAKE)
$@
 
-clean: xsfclean
+clean:
dh_testdir
dh_testroot
rm -f build-stamp


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

xserver-xorg-video-i740: Changes to 'debian-unstable'

2009-05-04 Thread David Nusinow

 debian/changelog   |8 
 debian/control |1 -
 debian/patches/01_gen_pci_ids.diff |   14 --
 debian/patches/series  |1 -
 debian/rules   |4 ++--
 5 files changed, 10 insertions(+), 18 deletions(-)

New commits:
commit 8884e2fc690811881c7043bd3f487e18f9ff63bb
Author: David Nusinow dnusi...@debian.org
Date:   Mon May 4 22:05:29 2009 -0400

Remove 01_gen_pci_ids.diff.

The server now uses an internal table to choose a driver during
autoconfiguration.

Disable the patch system and remove quilt from the build-deps

diff --git a/debian/changelog b/debian/changelog
index f52cdae..efe4d58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-i740 (1:1.3.0-2) UNRELEASED; urgency=low
+
+  * Remove 01_gen_pci_ids.diff. The server now uses an internal table to
+choose a driver during autoconfiguration.
++ Disable the patch system and remove quilt from the build-deps
+
+ -- David Nusinow dnusi...@debian.org  Mon, 04 May 2009 22:04:28 -0400
+
 xserver-xorg-video-i740 (1:1.3.0-1) unstable; urgency=low
 
   * Run autoreconf on build.
diff --git a/debian/control b/debian/control
index 8d17fbe..c504b6d 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Uploaders: David Nusinow dnusi...@debian.org, Julien Cristau 
jcris...@debian.
 Build-Depends:
  debhelper (= 5.0.0),
  pkg-config,
- quilt,
  automake,
  libtool,
  xutils-dev,
diff --git a/debian/patches/01_gen_pci_ids.diff 
b/debian/patches/01_gen_pci_ids.diff
deleted file mode 100644
index ff805b5..000
--- a/debian/patches/01_gen_pci_ids.diff
+++ /dev/null
@@ -1,14 +0,0 @@
 xserver-xorg-video-i740.orig/src/Makefile.am
-+++ xserver-xorg-video-i740/src/Makefile.am
-@@ -41,3 +41,6 @@
-i740_pcirename.h \
-  i740_reg.h \
-  i740_video.c
-+
-+pcidatadir = $(datadir)/xserver-xorg/pci
-+pcidata_DATA = i740.ids
 /dev/null
-+++ xserver-xorg-video-i740/src/i740.ids
-@@ -0,0 +1,2 @@
-+003D00D1
-+80867800
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b55d79f..000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01_gen_pci_ids.diff
diff --git a/debian/rules b/debian/rules
index 9e07675..34f3df2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,7 +33,7 @@ endif
 confflags += --disable-static
 
 build: build-stamp
-build-stamp: $(STAMP_DIR)/patch
+build-stamp:
dh_testdir
 
autoreconf -vfi
@@ -45,7 +45,7 @@ build-stamp: $(STAMP_DIR)/patch
cd obj-$(DEB_BUILD_GNU_TYPE)  $(MAKE)
$@
 
-clean: xsfclean
+clean: 
dh_testdir
dh_testroot
rm -f build-stamp


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

xserver-xorg-video-intel: Changes to 'debian-unstable'

2009-05-04 Thread David Nusinow

 debian/changelog   |8 +++-
 debian/control |1 -
 debian/patches/01_gen_pci_ids.diff |   14 --
 debian/patches/series  |1 -
 debian/rules   |4 ++--
 5 files changed, 9 insertions(+), 19 deletions(-)

New commits:
commit 35ad3f37cf6b787bcd9e24bbb008fdb226cea2c4
Author: David Nusinow dnusi...@debian.org
Date:   Mon May 4 22:08:47 2009 -0400

Remove 01_gen_pci_ids.diff.

The X server now uses an internal table to choose a driver during
autoconfiguration.

Disable patch system and remove quilt from build-deps.

diff --git a/debian/changelog b/debian/changelog
index ecc78d3..34f0ad0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,15 @@
 xserver-xorg-video-intel (2:2.7.0-2) UNRELEASED; urgency=low
 
+  [ Brice Goglin ]
   * Install the upstream NEWS file, closes: #524334, #524336.
   * Move the -dbg package to section debug.
 
- -- Brice Goglin bgog...@debian.org  Thu, 16 Apr 2009 13:52:00 +0200
+  [ David Nusinow ]
+  * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to
+choose a driver during autoconfiguration.
++ Disable patch system and remove quilt from build-deps.
+
+ -- David Nusinow dnusi...@debian.org  Mon, 04 May 2009 22:07:53 -0400
 
 xserver-xorg-video-intel (2:2.7.0-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 77db2b1..1cb46bb 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,6 @@ Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: David Nusinow dnusi...@debian.org, Drew Parsons 
dpars...@debian.org, Julien Cristau jcris...@debian.org, Brice Goglin 
bgog...@debian.org
 Build-Depends:
  debhelper (= 5),
- quilt,
  pkg-config,
  xserver-xorg-dev (= 2:1.5.99.901),
  x11proto-gl-dev,
diff --git a/debian/patches/01_gen_pci_ids.diff 
b/debian/patches/01_gen_pci_ids.diff
deleted file mode 100644
index e4d3fc5..000
--- a/debian/patches/01_gen_pci_ids.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: xserver-xorg-video-intel/src/Makefile.am
-===
 xserver-xorg-video-intel.orig/src/Makefile.am
-+++ xserver-xorg-video-intel/src/Makefile.am
-@@ -220,3 +220,9 @@
- intel_drv_la_SOURCES += \
-   $(INTEL_XVMC_SRCS)
- endif
-+
-+pcidatadir = $(datadir)/xserver-xorg/pci
-+pcidata_DATA = intel.ids
-+
-+intel.ids : common.h
-+  awk '/^#define PCI_CHIP/ {print $$3 }' $(srcdir)/common.h | sed 
's/^0x/8086/'  intel.ids
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b55d79f..000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01_gen_pci_ids.diff
diff --git a/debian/rules b/debian/rules
index f693995..83f6c84 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ endif
 # kbd_drv.a isn't phenomenally useful; kbd_drv.so more so
 confflags += --disable-static
 
-configure: $(STAMP_DIR)/patch
+configure:
dh_testdir
autoreconf -vfi
 
@@ -51,7 +51,7 @@ build-stamp: obj-$(DEB_BUILD_GNU_TYPE)/config.status
cd obj-$(DEB_BUILD_GNU_TYPE)  $(MAKE)
$@
 
-clean: xsfclean
+clean:
dh_testdir
dh_testroot
rm -f build-stamp


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

xserver-xorg-video-imstt: Changes to 'debian-unstable'

2009-05-04 Thread David Nusinow

 debian/changelog   |8 +++-
 debian/control |2 +-
 debian/patches/01_gen_pci_ids.diff |   14 --
 debian/patches/series  |1 -
 debian/rules   |4 ++--
 5 files changed, 10 insertions(+), 19 deletions(-)

New commits:
commit 8218ce2efc9449fb6ea9b0a2ba1c1cf8a2f73033
Author: David Nusinow dnusi...@debian.org
Date:   Mon May 4 22:12:05 2009 -0400

Remove 01_gen_pci_ids.diff.

The X server now uses an internal table to choose a driver during
autoconfiguration.

Disable the patch system and remove quilt from the build-depends

diff --git a/debian/changelog b/debian/changelog
index d5ccbd4..741c9d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
 xserver-xorg-video-imstt (1:1.1.0-8) UNRELEASED; urgency=low
 
+  [ Brice Goglin ]
   * Add upstream URL to debian/copyright.
 
- -- Brice Goglin bgog...@debian.org  Sat, 15 Sep 2007 01:56:47 +0200
+  [ David Nusinow ]
+  * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to
+choose a driver during autoconfiguration.
++ Disable the patch system and remove quilt from the build-depends
+  
+ -- David Nusinow dnusi...@debian.org  Mon, 04 May 2009 22:11:12 -0400
 
 xserver-xorg-video-imstt (1:1.1.0-7) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 467d46f..236078c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: David Nusinow dnusi...@debian.org, Branden Robinson 
bran...@debian.org
-Build-Depends: debhelper (= 5.0.0), pkg-config, quilt, xserver-xorg-dev (= 
2:1.4), x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, 
x11proto-render-dev
+Build-Depends: debhelper (= 5.0.0), pkg-config, xserver-xorg-dev (= 2:1.4), 
x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev
 Standards-Version: 3.7.2.2
 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-imstt
 XS-Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-imstt.git
diff --git a/debian/patches/01_gen_pci_ids.diff 
b/debian/patches/01_gen_pci_ids.diff
deleted file mode 100644
index cb4ed29..000
--- a/debian/patches/01_gen_pci_ids.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: xserver-xorg-video-imstt/src/Makefile.am
-===
 xserver-xorg-video-imstt.orig/src/Makefile.am  2007-09-13 
22:42:39.0 -0400
-+++ xserver-xorg-video-imstt/src/Makefile.am   2007-09-13 22:44:21.0 
-0400
-@@ -33,3 +33,9 @@
-  imstt_driver.c \
-  imstt.h \
-  imstt_reg.h
-+
-+pcidatadir = $(datadir)/xserver-xorg/pci
-+pcidata_DATA = imstt.ids
-+
-+imstt.ids : imstt.h
-+  awk '/PCI_/ {print $$3 }' $(srcdir)/imstt.h | sed 's/^0x/10E0/'  
imstt.ids
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b55d79f..000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01_gen_pci_ids.diff
diff --git a/debian/rules b/debian/rules
index c150638..305b500 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,7 +31,7 @@ endif
 # kbd_drv.a isn't phenomenally useful; kbd_drv.so more so
 confflags += --disable-static
 
-build: patch build-stamp
+build: build-stamp
 build-stamp:
dh_testdir
 
@@ -44,7 +44,7 @@ build-stamp:
 
touch build-stamp
 
-clean: xsfclean
+clean: 
dh_testdir
dh_testroot
rm -f build-stamp


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

xserver-xorg-video-mga: Changes to 'debian-unstable'

2009-05-04 Thread David Nusinow

 debian/changelog   |8 
 debian/patches/01_gen_pci_ids.diff |   28 
 debian/patches/01_no_nonfree.diff  |   12 
 debian/patches/03_no_nonfree.diff  |   12 
 debian/patches/series  |3 +--
 5 files changed, 21 insertions(+), 42 deletions(-)

New commits:
commit ef701ceb48e6deb639a067cf2d84f5009e541b36
Author: David Nusinow dnusi...@debian.org
Date:   Mon May 4 22:17:19 2009 -0400

Renumber 03_no_nonfree.diff to 01.

diff --git a/debian/changelog b/debian/changelog
index 4827a35..801fa8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ xserver-xorg-video-mga (1:1.4.10.dfsg-2) UNRELEASED; urgency=low
 
   * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to
 choose a driver during autoconfiguration.
+  * Renumber 03_no_nonfree.diff to 01.
 
- -- David Nusinow dnusi...@debian.org  Mon, 04 May 2009 22:15:22 -0400
+ -- David Nusinow dnusi...@debian.org  Mon, 04 May 2009 22:16:16 -0400
 
 xserver-xorg-video-mga (1:1.4.10.dfsg-1) unstable; urgency=low
 
diff --git a/debian/patches/01_no_nonfree.diff 
b/debian/patches/01_no_nonfree.diff
new file mode 100644
index 000..83e4da4
--- /dev/null
+++ b/debian/patches/01_no_nonfree.diff
@@ -0,0 +1,12 @@
+Index: xserver-xorg-video-mga/src/Makefile.am
+===
+--- xserver-xorg-video-mga.orig/src/Makefile.am2006-10-26 
22:48:24.0 -0400
 xserver-xorg-video-mga/src/Makefile.am 2006-11-06 23:40:03.0 
-0500
+@@ -54,7 +54,6 @@
+  mga_reg.h \
+  mga_sarea.h \
+  mga_shadow.c \
+- mga_ucode.h \
+mga_vga.c \
+  mga_video.c
+ 
diff --git a/debian/patches/03_no_nonfree.diff 
b/debian/patches/03_no_nonfree.diff
deleted file mode 100644
index 83e4da4..000
--- a/debian/patches/03_no_nonfree.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: xserver-xorg-video-mga/src/Makefile.am
-===
 xserver-xorg-video-mga.orig/src/Makefile.am2006-10-26 
22:48:24.0 -0400
-+++ xserver-xorg-video-mga/src/Makefile.am 2006-11-06 23:40:03.0 
-0500
-@@ -54,7 +54,6 @@
-  mga_reg.h \
-  mga_sarea.h \
-  mga_shadow.c \
-- mga_ucode.h \
-mga_vga.c \
-  mga_video.c
- 
diff --git a/debian/patches/series b/debian/patches/series
index 4ae2caf..b7e34e9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-03_no_nonfree.diff
+01_no_nonfree.diff

commit c8315bd45bf246630ce0fc0021e5471ad8c24a84
Author: David Nusinow dnusi...@debian.org
Date:   Mon May 4 22:16:01 2009 -0400

Remove 01_gen_pci_ids.diff.

The X server now uses an internal table to choose a driver during
autoconfiguration.

diff --git a/debian/changelog b/debian/changelog
index 5b79ba4..4827a35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-mga (1:1.4.10.dfsg-2) UNRELEASED; urgency=low
+
+  * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to
+choose a driver during autoconfiguration.
+
+ -- David Nusinow dnusi...@debian.org  Mon, 04 May 2009 22:15:22 -0400
+
 xserver-xorg-video-mga (1:1.4.10.dfsg-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/01_gen_pci_ids.diff 
b/debian/patches/01_gen_pci_ids.diff
deleted file mode 100644
index 55a6770..000
--- a/debian/patches/01_gen_pci_ids.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: xserver-xorg-video-mga/src/Makefile.am
-===
 xserver-xorg-video-mga.orig/src/Makefile.am2007-09-13 
22:12:21.0 -0400
-+++ xserver-xorg-video-mga/src/Makefile.am 2007-09-13 22:13:12.0 
-0400
-@@ -74,3 +74,6 @@
- mga_drv_la_SOURCES += \
- mga_storm.c
- endif
-+
-+pcidatadir = $(datadir)/xserver-xorg/pci
-+pcidata_DATA = mga.ids
-Index: xserver-xorg-video-mga/src/mga.ids
-===
 /dev/null  1970-01-01 00:00:00.0 +
-+++ xserver-xorg-video-mga/src/mga.ids 2007-09-13 22:12:13.0 -0400
-@@ -0,0 +1,12 @@
-+102B0519
-+102B051A
-+102B051B
-+102B051F
-+102B0520
-+102B0521
-+102B0525
-+102B2527
-+102B1000
-+102B1001
-+102B0522
-+102B0524
diff --git a/debian/patches/series b/debian/patches/series
index f6a23fd..4ae2caf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-01_gen_pci_ids.diff
 03_no_nonfree.diff


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

xserver-xorg-video-neomagic: Changes to 'debian-unstable'

2009-05-04 Thread David Nusinow

 debian/changelog   |8 
 debian/control |1 -
 debian/patches/02_gen_pci_ids.diff |   25 -
 debian/patches/series  |1 -
 debian/rules   |4 ++--
 5 files changed, 10 insertions(+), 29 deletions(-)

New commits:
commit 1d1179868686e09907b7cf9b4badda6d573d54c1
Author: David Nusinow dnusi...@debian.org
Date:   Mon May 4 22:20:51 2009 -0400

Remove 01_gen_pci_ids.diff.

The X server now uses an internal table to choose a driver during
autoconfiguration.

Disable the patch system and remove quilt from the build-deps.

diff --git a/debian/changelog b/debian/changelog
index bf6dceb..ad35200 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-neomagic (1:1.2.2-3) UNRELEASED; urgency=low
+
+  * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to
+choose a driver during autoconfiguration.
++ Disable the patch system and remove quilt from the build-deps.
+
+ -- David Nusinow dnusi...@debian.org  Mon, 04 May 2009 22:19:41 -0400
+
 xserver-xorg-video-neomagic (1:1.2.2-2) unstable; urgency=low
 
   * Drop patch 01_implicit_declaration.diff.  The warning is gone.
diff --git a/debian/control b/debian/control
index bf2e4f5..9925cab 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,6 @@ Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: David Nusinow dnusi...@debian.org, Brice Goglin 
bgog...@debian.org
 Build-Depends:
  debhelper (= 5.0.0),
- quilt,
  pkg-config,
  xserver-xorg-dev (= 2:1.5.99.901),
  x11proto-video-dev,
diff --git a/debian/patches/02_gen_pci_ids.diff 
b/debian/patches/02_gen_pci_ids.diff
deleted file mode 100644
index 7bb2860..000
--- a/debian/patches/02_gen_pci_ids.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: xserver-xorg-video-neomagic/src/Makefile.am
-===
 xserver-xorg-video-neomagic.orig/src/Makefile.am
-+++ xserver-xorg-video-neomagic/src/Makefile.am
-@@ -45,3 +45,6 @@
-  neo_video.c \
-  neo_video.h \
-neo_pcirename.h
-+
-+pcidatadir = $(datadir)/xserver-xorg/pci
-+pcidata_DATA = neomagic.ids
-Index: xserver-xorg-video-neomagic/src/neomagic.ids
 /dev/null
-+++ xserver-xorg-video-neomagic/src/neomagic.ids
-===
-@@ -0,0 +1,9 @@
-+10C80001
-+10C80002
-+10C80003
-+10C80083
-+10C80004
-+10C80005
-+10C80025
-+10C80006
-+10C80016
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 84a6b5c..000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-02_gen_pci_ids.diff
diff --git a/debian/rules b/debian/rules
index c725a81..088e815 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ endif
 # kbd_drv.a isn't phenomenally useful; kbd_drv.so more so
 confflags += --disable-static
 
-configure: $(STAMP_DIR)/patch
+configure: 
dh_testdir
autoreconf -vfi
 
@@ -48,7 +48,7 @@ build-stamp: configure
cd obj-$(DEB_BUILD_GNU_TYPE)  $(MAKE)
$@
 
-clean: xsfclean
+clean: 
dh_testdir
dh_testroot
rm -f build-stamp


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

xserver-xorg-video-nsc: Changes to 'debian-unstable'

2009-05-04 Thread David Nusinow

 debian/changelog   |7 +++
 debian/patches/01_gen_pci_ids.diff |   33 -
 debian/patches/series  |1 -
 3 files changed, 7 insertions(+), 34 deletions(-)

New commits:
commit 258ad95862a5838f8badeb45775354ddaf97643b
Author: David Nusinow dnusi...@debian.org
Date:   Mon May 4 22:25:04 2009 -0400

Remove 01_gen_pci_ids.diff.

The X server now uses an internal table to choose a driver during
autoconfiguration.

diff --git a/debian/changelog b/debian/changelog
index 4e7c7b7..314e0c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-nsc (1:2.8.3-5) UNRELEASED; urgency=low
+
+  * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to
+choose a driver during autoconfiguration.
+
+ -- David Nusinow dnusi...@debian.org  Mon, 04 May 2009 22:23:55 -0400
+
 xserver-xorg-video-nsc (1:2.8.3-4) unstable; urgency=low
 
   * Fix 01_gen_pci_ids.diff to drop cyrix ids instead of the ns ones,
diff --git a/debian/patches/01_gen_pci_ids.diff 
b/debian/patches/01_gen_pci_ids.diff
deleted file mode 100644
index d9abfd7..000
--- a/debian/patches/01_gen_pci_ids.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-Generate the PCI ids list that the driver supports. It claims support for:
-Cyrix and NS vendor id with device id: 0104, 0504 and 0030.
-0104 is actually declared twice, that's why there's a sort -u below.
-
-But some of the above hardware actually seems to be supported much better
-in other drivers, or is even actually not supported for real by nsc.
-The upstream driver should be fixed, but we need a workaround for now so
-that the server always autoload the other driver.
-
-For now, we keep the upstream code untouched and we just don't let these IDs
-appear in the nsc.ids:
-* 0030 is Geode GX2 which seems to have never actually been supported in -nsc,
-  while the -geode officially supports it
-* Cyrix ids are supported by the -cyrix better
-  (and device 0504 and 0030 with vendor Cyrix seem to not exist anyway)
-
-See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=483699 for the full
-discussion about this.
-
-Index: xserver-xorg-video-nsc/src/Makefile.am
-===
 xserver-xorg-video-nsc.orig/src/Makefile.am2007-09-13 
09:46:05.0 +0200
-+++ xserver-xorg-video-nsc/src/Makefile.am 2007-09-13 09:48:21.0 
+0200
-@@ -120,3 +120,9 @@
-   gfx/vip_1400.c
- 
- 
-+pcidatadir = $(datadir)/xserver-xorg/pci
-+pcidata_DATA = nsc.ids
-+
-+nsc.ids: nsc_driver.c
-+  awk '/^#define.*PCI_CHIP/ {print $$3}' ${srcdir}/nsc_driver.c | sort -u 
| grep -v 0030 | sed -e 's/0x/100B/'  nsc.ids
-+# awk '/^#define.*PCI_CHIP/ {print $$3}' ${srcdir}/nsc_driver.c | sort -u 
| grep -v 0030 | sed -e 's/0x/1078/'  nsc.ids
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b55d79f..000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01_gen_pci_ids.diff


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

xserver-xorg-video-nv: Changes to 'debian-unstable'

2009-05-04 Thread David Nusinow

 debian/changelog   |8 
 debian/control |1 -
 debian/patches/01_gen_pci_ids.diff |   14 --
 debian/patches/series  |1 -
 debian/rules   |4 ++--
 5 files changed, 10 insertions(+), 18 deletions(-)

New commits:
commit f064ca086d51ad8606ec8f9e2f0b4a01972438b5
Author: David Nusinow dnusi...@debian.org
Date:   Mon May 4 22:28:49 2009 -0400

Remove 01_gen_pci_ids.diff.

The X server now uses an internal table to choose a driver during
autoconfiguration.

Disable patch system and remove quilt from build-deps.

diff --git a/debian/changelog b/debian/changelog
index de1dfcf..ab55273 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-nv (1:2.1.13-2) UNRELEASED; urgency=low
+
+  * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to
+choose a driver during autoconfiguration.
++ Disable patch system and remove quilt from build-deps.
+
+ -- David Nusinow dnusi...@debian.org  Mon, 04 May 2009 22:27:31 -0400
+
 xserver-xorg-video-nv (1:2.1.13-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 79ba5a9..d41b547 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Uploaders: David Nusinow dnusi...@debian.org, Julien Cristau 
jcris...@debian.
 Build-Depends:
  debhelper (= 5.0.0),
  pkg-config,
- quilt,
  xserver-xorg-dev (= 2:1.5.99.901),
  x11proto-video-dev,
  x11proto-core-dev,
diff --git a/debian/patches/01_gen_pci_ids.diff 
b/debian/patches/01_gen_pci_ids.diff
deleted file mode 100644
index 9abc542..000
--- a/debian/patches/01_gen_pci_ids.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: xserver-xorg-video-nv/src/Makefile.am
-===
 xserver-xorg-video-nv.orig/src/Makefile.am 2008-03-26 20:47:57.0 
-0400
-+++ xserver-xorg-video-nv/src/Makefile.am  2008-03-26 20:53:20.0 
-0400
-@@ -103,3 +103,9 @@
- EXTRA_nv_drv_la_SOURCES = local_xf86Rename.h
- nodist_nv_drv_la_SOURCES = $(xmode_sources)
- endif
-+
-+pcidatadir = $(datadir)/xserver-xorg/pci
-+pcidata_DATA = nv.ids
-+
-+nv.ids : nv_driver.c
-+  awk '/{ 0x.*/ || /case 0x.*/ {print $$2}' ${srcdir}/nv_driver.c | sed 
-e s/0x// -e s/,// -e s/:// -e s/^0/10DE0/ | sort -u  nv.ids
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b55d79f..000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01_gen_pci_ids.diff
diff --git a/debian/rules b/debian/rules
index a6599da..db163fa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ endif
 # kbd_drv.a isn't phenomenally useful; kbd_drv.so more so
 confflags += --disable-static
 
-configure: $(STAMP_DIR)/patch
+configure: 
dh_testdir
autoreconf -vfi
 
@@ -50,7 +50,7 @@ build-stamp: obj-$(DEB_BUILD_GNU_TYPE)/config.status
cd obj-$(DEB_BUILD_GNU_TYPE)  $(MAKE)
$@
 
-clean: xsfclean
+clean: 
dh_testdir
dh_testroot
rm -f build-stamp


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

xserver-xorg-video-ati: Changes to 'debian-unstable'

2009-04-30 Thread David Nusinow

 debian/NEWS |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 29213f24669e5f511bff15643036a96dd95ff6a0
Author: David Nusinow dnusi...@debian.org
Date:   Thu Apr 30 10:14:09 2009 -0400

Update NEWS entry to mention 2d and Xvideo

diff --git a/debian/NEWS b/debian/NEWS
index a0a35df..40580e9 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,10 +1,11 @@
 xserver-xorg-video-ati (1:6.12.2-2) unstable; urgency=low
 
-  * The standard linux kernels in Debian as of version 2.6.29-1 do not
-contain the firmware necessary to allow the radeon driver to use 3D
-acceleration via DRI. This firmware has been moved to the
-firmware-linux package in non-free, and must be installed to use
-this feature.
+  * The standard linux kernels in Debian as of version 2.6.29-1 do not contain
+the firmware necessary to allow the radeon driver to use 3D acceleration
+via DRI. In addition, the driver will pay significant performance
+penalties for 2D and Xvideo usage when the firmware is absent. This
+firmware has been moved to the firmware-linux package in non-free, and
+must be installed to use this feature.
 
  -- David Nusinow dnusi...@debian.org  Wed, 29 Apr 2009 21:14:53 -0400
 


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

xserver-xorg-video-ati: Changes to 'debian-unstable'

2009-04-29 Thread David Nusinow

 debian/NEWS  |   10 ++
 debian/changelog |6 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

New commits:
commit bc0bb3790d8858c9073a8adb6de4f4eb24a9abf7
Author: David Nusinow dnusi...@debian.org
Date:   Wed Apr 29 21:19:08 2009 -0400

Add a note in NEWS.Debian about firmware-linux

diff --git a/debian/NEWS b/debian/NEWS
index 0d0674b..a0a35df 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,13 @@
+xserver-xorg-video-ati (1:6.12.2-2) unstable; urgency=low
+
+  * The standard linux kernels in Debian as of version 2.6.29-1 do not
+contain the firmware necessary to allow the radeon driver to use 3D
+acceleration via DRI. This firmware has been moved to the
+firmware-linux package in non-free, and must be installed to use
+this feature.
+
+ -- David Nusinow dnusi...@debian.org  Wed, 29 Apr 2009 21:14:53 -0400
+
 xserver-xorg-video-ati (1:6.8.1~git20080302.a4398ac3-1) experimental; 
urgency=low
 
   * The 'ati' Xorg driver module does not contain the 'r128' and 'mach64'
diff --git a/debian/changelog b/debian/changelog
index c994795..9480f8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
 xserver-xorg-video-ati (1:6.12.2-2) UNRELEASED; urgency=low
 
+  [ Brice Goglin ]
   * xserver-xorg-video-radeon now suggests firmware-linux since
 a firmware may be needed to initialize DRI.
   * Move -dbg packages to section debug.
 
- -- Brice Goglin bgog...@debian.org  Mon, 20 Apr 2009 23:01:33 +0200
+  [ David Nusinow ]
+  * Add a note in NEWS.Debian about firmware-linux
+
+ -- David Nusinow dnusi...@debian.org  Wed, 29 Apr 2009 21:18:41 -0400
 
 xserver-xorg-video-ati (1:6.12.2-1) unstable; urgency=low
 


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

xserver-xorg-video-r128: Changes to 'debian-unstable'

2009-04-29 Thread David Nusinow

 debian/NEWS  |   10 ++
 debian/changelog |6 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

New commits:
commit e1de62031e502cc4f10fafb6c9f7cf391590451d
Author: David Nusinow dnusi...@debian.org
Date:   Wed Apr 29 21:23:04 2009 -0400

Add a note in NEWS.Debian about firmware-linux

diff --git a/debian/NEWS b/debian/NEWS
index 85fde8c..4a746b2 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,13 @@
+xserver-xorg-video-r128 (6.8.0+git20090201.08d56c88-3) experimental; 
urgency=low
+
+  * The standard linux kernels in Debian as of version 2.6.29-1 do not
+contain the firmware necessary to allow the r128 driver to use 3D
+acceleration via DRI. This firmware has been moved to the
+firmware-linux package in non-free, and must be installed to use
+this feature.
+
+ -- David Nusinow dnusi...@debian.org  Wed, 29 Apr 2009 21:21:04 -0400
+
 xserver-xorg-video-r128 (1:6.8.1~git20080301.d855d208-1) experimental; 
urgency=low
 
   * The r128 submodule isn't included in ati anymore. 
diff --git a/debian/changelog b/debian/changelog
index 0c1ac57..93ed660 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
 xserver-xorg-video-r128 (6.8.0+git20090201.08d56c88-3) UNRELEASED; urgency=low
 
+  [ Brice Goglin ]
   * xserver-xorg-video-r128 now suggests firmware-linux since
 a firmware may be needed to initialize DRI.
   * Move -dbg package to section debug.
 
- -- Brice Goglin bgog...@debian.org  Mon, 20 Apr 2009 23:02:58 +0200
+  [ David Nusinow ]
+  * Add a note in NEWS.Debian about firmware-linux
+
+ -- David Nusinow dnusi...@debian.org  Wed, 29 Apr 2009 21:21:53 -0400
 
 xserver-xorg-video-r128 (6.8.0+git20090201.08d56c88-2) unstable; urgency=low
 


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

xserver-xorg-video-ati: Changes to 'debian-unstable'

2009-04-29 Thread David Nusinow

 debian/changelog   |4 +++-
 debian/patches/01_gen_pci_ids.diff |   21 -
 debian/patches/series  |1 -
 3 files changed, 3 insertions(+), 23 deletions(-)

New commits:
commit 1fe8c0d1e7959f7c342beff0330e5cbb121f25a1
Author: David Nusinow dnusi...@debian.org
Date:   Wed Apr 29 21:47:54 2009 -0400

Remove 01_gen_pci_ids.diff patch
The server just uses a built-in  table to choose drivers now

diff --git a/debian/changelog b/debian/changelog
index 9480f8d..f8e8511 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,10 @@ xserver-xorg-video-ati (1:6.12.2-2) UNRELEASED; urgency=low
 
   [ David Nusinow ]
   * Add a note in NEWS.Debian about firmware-linux
+  * Remove 01_gen_pci_ids.diff patch as the server just uses a built-in 
+table to choose drivers now
 
- -- David Nusinow dnusi...@debian.org  Wed, 29 Apr 2009 21:18:41 -0400
+ -- David Nusinow dnusi...@debian.org  Wed, 29 Apr 2009 21:45:58 -0400
 
 xserver-xorg-video-ati (1:6.12.2-1) unstable; urgency=low
 
diff --git a/debian/patches/01_gen_pci_ids.diff 
b/debian/patches/01_gen_pci_ids.diff
deleted file mode 100644
index 4b607bf..000
--- a/debian/patches/01_gen_pci_ids.diff
+++ /dev/null
@@ -1,21 +0,0 @@

- src/Makefile.am |6 ++
- 1 file changed, 6 insertions(+)
-
-Index: xserver-xorg-video-ati/src/Makefile.am
-===
 xserver-xorg-video-ati.orig/src/Makefile.am2007-10-06 
02:44:47.0 +0200
-+++ xserver-xorg-video-ati/src/Makefile.am 2007-10-06 02:48:34.0 
+0200
-@@ -153,3 +153,12 @@
-   pcidb/ati_pciids.csv \
-   pcidb/parse_pci_ids.pl \
-   radeon_atombios.h
-+
-+pcidatadir = $(datadir)/xserver-xorg/pci
-+pcidata_DATA = radeon.ids
-+
-+radeon.ids: ati_pciids_gen.h
-+  cat ${srcdir}/ati_pciids_gen.h \
-+  | grep -v PCI_CHIP_MACH32 | grep -v PCI_CHIP_MACH64 | grep -v 
PCI_CHIP_RAGE128 \
-+  | awk '/^#define.*PCI_CHIP/ {print $$3}' \
-+  | sed -e 's/0x/1002/'  radeon.ids
diff --git a/debian/patches/series b/debian/patches/series
index b55d79f..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-01_gen_pci_ids.diff


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

xserver-xorg-video-r128: Changes to 'debian-unstable'

2009-04-29 Thread David Nusinow

 debian/changelog   |4 +++-
 debian/patches/01_gen_pci_ids.diff |   18 --
 debian/patches/series  |1 -
 3 files changed, 3 insertions(+), 20 deletions(-)

New commits:
commit 2f43ed62f25102512aebfb5d7177bacadd959bb8
Author: David Nusinow dnusi...@debian.org
Date:   Wed Apr 29 21:51:43 2009 -0400

Remove 01_gen_pci_ids.diff.
The server uses a built-in table now to choose drivers.

diff --git a/debian/changelog b/debian/changelog
index 93ed660..32e5092 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,10 @@ xserver-xorg-video-r128 (6.8.0+git20090201.08d56c88-3) 
UNRELEASED; urgency=low
 
   [ David Nusinow ]
   * Add a note in NEWS.Debian about firmware-linux
+  * Remove 01_gen_pci_ids.diff. The server uses a built-in table now to
+choose drivers.
 
- -- David Nusinow dnusi...@debian.org  Wed, 29 Apr 2009 21:21:53 -0400
+ -- David Nusinow dnusi...@debian.org  Wed, 29 Apr 2009 21:50:52 -0400
 
 xserver-xorg-video-r128 (6.8.0+git20090201.08d56c88-2) unstable; urgency=low
 
diff --git a/debian/patches/01_gen_pci_ids.diff 
b/debian/patches/01_gen_pci_ids.diff
deleted file mode 100644
index 29bc50c..000
--- a/debian/patches/01_gen_pci_ids.diff
+++ /dev/null
@@ -1,18 +0,0 @@

- src/Makefile.am |6 ++
- 1 file changed, 6 insertions(+)
-
-Index: xserver-xorg-video-r128/src/Makefile.am
-===
 xserver-xorg-video-r128.orig/src/Makefile.am   2007-10-06 
02:44:47.0 +0200
-+++ xserver-xorg-video-r128/src/Makefile.am2007-10-06 02:48:34.0 
+0200
-@@ -49,3 +49,9 @@
-   r128_sarea.h \
-   r128_version.h \
-   atipcirename.h
-+
-+pcidatadir = $(datadir)/xserver-xorg/pci
-+pcidata_DATA = r128.ids
-+
-+r128.ids:
-+  grep PCI_CHIP_RAGE128 /usr/include/xorg/xf86PciInfo.h | awk 
'/^#define.*PCI_CHIP/ {print $$3}' | sed -e 's/0x/1002/'  r128.ids
diff --git a/debian/patches/series b/debian/patches/series
index b55d79f..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-01_gen_pci_ids.diff


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

xserver-xorg-video-apm: Changes to 'debian-unstable'

2009-04-29 Thread David Nusinow

 debian/changelog  |8 
 debian/control|1 -
 debian/patches/01_gen_pci_ids.diff|   15 ---
 debian/patches/series |1 -
 debian/rules  |4 ++--
 debian/xserver-xorg-video-apm.install |1 -
 6 files changed, 10 insertions(+), 20 deletions(-)

New commits:
commit d386d7dc40828617c2a833372bbd80b869644a82
Author: David Nusinow dnusi...@debian.org
Date:   Wed Apr 29 22:05:55 2009 -0400

Remove 01_gen_pci_ids.diff.

The X server now uses a built-in table to choose drivers.

Disable patch system and remove quilt from build-depends

diff --git a/debian/changelog b/debian/changelog
index 96c6c85..f797df0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-apm (1:1.2.1-3) UNRELEASED; urgency=low
+
+  * Remove 01_gen_pci_ids.diff. The X server now uses a built-in table to
+choose drivers.
++ Disable patch system and remove quilt from build-depends
+
+ -- David Nusinow dnusi...@debian.org  Wed, 29 Apr 2009 21:57:24 -0400
+
 xserver-xorg-video-apm (1:1.2.1-2) unstable; urgency=low
 
   * Upload to unstable.
diff --git a/debian/control b/debian/control
index 0f99a74..557a3a0 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Uploaders: David Nusinow dnusi...@debian.org, Brice Goglin 
bgog...@debian.org
 Build-Depends:
  debhelper (= 5),
  pkg-config,
- quilt,
  xserver-xorg-dev (= 2:1.5.99.901),
  x11proto-xext-dev,
  x11proto-video-dev,
diff --git a/debian/patches/01_gen_pci_ids.diff 
b/debian/patches/01_gen_pci_ids.diff
deleted file mode 100644
index 43658e5..000
--- a/debian/patches/01_gen_pci_ids.diff
+++ /dev/null
@@ -1,15 +0,0 @@
 /dev/null
-+++ xserver-xorg-video-apm/src/apm.ids
-@@ -0,0 +1,3 @@
-+11426422
-+11426424
-+1142643D
 xserver-xorg-video-apm.orig/src/Makefile.am
-+++ xserver-xorg-video-apm/src/Makefile.am
-@@ -46,3 +46,6 @@
-  apm_funcs.c \
-  apm_video.c \
-apm_rush.c
-+
-+pcidatadir = $(datadir)/xserver-xorg/pci
-+pcidata_DATA = apm.ids
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b55d79f..000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01_gen_pci_ids.diff
diff --git a/debian/rules b/debian/rules
index b8acb4f..b130092 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ endif
 # kbd_drv.a isn't phenomenally useful; kbd_drv.so more so
 confflags += --disable-static
 
-configure: $(STAMP_DIR)/patch
+configure: 
dh_testdir
autoreconf -vfi
 
@@ -47,7 +47,7 @@ build-stamp: configure
cd obj-$(DEB_BUILD_GNU_TYPE)  $(MAKE)
$@
 
-clean: xsfclean
+clean: 
dh_testdir
dh_testroot
rm -f build-stamp
diff --git a/debian/xserver-xorg-video-apm.install 
b/debian/xserver-xorg-video-apm.install
index a8fac35..daf7bfe 100644
--- a/debian/xserver-xorg-video-apm.install
+++ b/debian/xserver-xorg-video-apm.install
@@ -1,2 +1 @@
 usr/lib/xorg/modules/drivers/*.so
-usr/share/xserver-xorg/pci/*


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

xserver-xorg-video-ati: Changes to 'debian-unstable'

2009-04-29 Thread David Nusinow

 debian/xserver-xorg-video-radeon.install |1 -
 1 file changed, 1 deletion(-)

New commits:
commit d1d387de7e70bd78b47b9562667ce69eecb827e4
Author: David Nusinow dnusi...@debian.org
Date:   Wed Apr 29 22:11:48 2009 -0400

Don't try to install now-absent PCI ID text file

diff --git a/debian/xserver-xorg-video-radeon.install 
b/debian/xserver-xorg-video-radeon.install
index a2bc59b..d005014 100644
--- a/debian/xserver-xorg-video-radeon.install
+++ b/debian/xserver-xorg-video-radeon.install
@@ -1,3 +1,2 @@
 usr/lib/xorg/modules/drivers/radeon_drv.so
 usr/lib/xorg/modules/multimedia/*.so
-usr/share/xserver-xorg/pci/*


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

xserver-xorg-video-r128: Changes to 'debian-unstable'

2009-04-29 Thread David Nusinow

 debian/xserver-xorg-video-r128.install |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 4a747d832f175a6fbc6459a6e16b5b52332259d4
Author: David Nusinow dnusi...@debian.org
Date:   Wed Apr 29 22:18:16 2009 -0400

Don't try to install the now missing PCI IDs text file

diff --git a/debian/xserver-xorg-video-r128.install 
b/debian/xserver-xorg-video-r128.install
index a8fac35..daf7bfe 100644
--- a/debian/xserver-xorg-video-r128.install
+++ b/debian/xserver-xorg-video-r128.install
@@ -1,2 +1 @@
 usr/lib/xorg/modules/drivers/*.so
-usr/share/xserver-xorg/pci/*


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

xserver-xorg-video-ark: Changes to 'debian-unstable'

2009-04-29 Thread David Nusinow

 debian/changelog  |8 
 debian/control|1 -
 debian/patches/01_gen_pci_ids.diff|   19 ---
 debian/patches/series |1 -
 debian/rules  |4 ++--
 debian/xserver-xorg-video-ark.install |1 -
 6 files changed, 10 insertions(+), 24 deletions(-)

New commits:
commit 9757c789c85108add71cc735fbaa92db03e3ba02
Author: David Nusinow dnusi...@debian.org
Date:   Wed Apr 29 22:40:19 2009 -0400

Remove 01_gen_pci_ids.diff.
The X server now uses a built-in table to autodetect devices.

Disable patch system and remove quilt from build-depends

diff --git a/debian/changelog b/debian/changelog
index bc7b17f..6bbcab5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-ark (1:0.7.1-3) UNRELEASED; urgency=low
+
+  * Remove 01_gen_pci_ids.diff. The X server now uses a built-in table to
+autodetect devices.
++ Disable patch system and remove quilt from build-depends
+
+ -- David Nusinow dnusi...@debian.org  Wed, 29 Apr 2009 22:37:48 -0400
+
 xserver-xorg-video-ark (1:0.7.1-2) unstable; urgency=low
 
   * Upload to unstable.
diff --git a/debian/control b/debian/control
index 60580b8..2ecdd92 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Uploaders: David Nusinow dnusi...@debian.org, Brice Goglin 
bgog...@debian.org
 Build-Depends:
  debhelper (= 5),
  pkg-config,
- quilt,
  xserver-xorg-dev (= 2:1.5.99.901),
  x11proto-core-dev,
  x11proto-fonts-dev,
diff --git a/debian/patches/01_gen_pci_ids.diff 
b/debian/patches/01_gen_pci_ids.diff
deleted file mode 100644
index f245b57..000
--- a/debian/patches/01_gen_pci_ids.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: xserver-xorg-video-ark/src/ark.ids
-===
 /dev/null  1970-01-01 00:00:00.0 +
-+++ xserver-xorg-video-ark/src/ark.ids 2007-09-14 00:44:25.0 -0400
-@@ -0,0 +1,3 @@
-+EDD8A091
-+EDD8A099
-+EDD8A0A1
-Index: xserver-xorg-video-ark/src/Makefile.am
-===
 xserver-xorg-video-ark.orig/src/Makefile.am2007-09-14 
00:44:31.0 -0400
-+++ xserver-xorg-video-ark/src/Makefile.am 2007-09-14 00:44:56.0 
-0400
-@@ -33,3 +33,6 @@
-  ark_driver.c \
-  ark.h \
-  ark_reg.h
-+
-+pcidatadir = $(datadir)/xserver-xorg/pci
-+pcidata_DATA = ark.ids
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b55d79f..000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01_gen_pci_ids.diff
diff --git a/debian/rules b/debian/rules
index 1099900..393cc91 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ endif
 # kbd_drv.a isn't phenomenally useful; kbd_drv.so more so
 confflags += --disable-static
 
-configure: $(STAMP_DIR)/patch
+configure: 
dh_testdir
autoreconf -vfi
 
@@ -48,7 +48,7 @@ build-stamp: configure
cd obj-$(DEB_BUILD_GNU_TYPE)  $(MAKE)
$@
 
-clean: xsfclean
+clean: 
dh_testdir
dh_testroot
rm -f build-stamp
diff --git a/debian/xserver-xorg-video-ark.install 
b/debian/xserver-xorg-video-ark.install
index a8fac35..daf7bfe 100644
--- a/debian/xserver-xorg-video-ark.install
+++ b/debian/xserver-xorg-video-ark.install
@@ -1,2 +1 @@
 usr/lib/xorg/modules/drivers/*.so
-usr/share/xserver-xorg/pci/*


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

libpciaccess: Changes to 'refs/tags/libpciaccess-0.10.4'

2009-04-27 Thread David Nusinow

Tag 'libpciaccess-0.10.4' created by Alan Coopersmith 
alan.coopersm...@sun.com at 2008-10-17 21:16 +

libpciaccess 0.10.4

Changes since libpciaccess-0.10.3:
Alan Coopersmith (11):
  Fix various typos (mostly in comments)
  Correct comment about devices used on Solaris
  scanpci: add -v flag to enable verbose mode like old scanpci
  Correct Sun license notice
  Fix bus probing on Solaris/SPARC
  Clean up formatting of solx_devfs.c
  More minor Solaris cleanups
  Add scanpci man page from Xorg
  Update COPYING with the rest of the copyright/license notices from the 
code
  Add scanpci.man to EXTRA_DIST
  Version 0.10.4

Jesse Barnes (1):
  Support write combine resource files in Linux sysfs

John Tapsell (1):
  configure.ac: Make mtrr.h test more portable

Juan RP (1):
  Add NetBSD support

Julien Cristau (1):
  Hide one more private symbol

Kel Modderman (1):
  Handle compressed pci.ids

Matthieu Herrb (1):
  OpenBSD: allow 2 successives calls to pci_system_init().

Petr Salinger (1):
  Add support for GNU/kFreeBSD

Stefan Dirsch (1):
  Fixed typo in output (performace -- performance).

---
 COPYING  |   49 +
 Makefile.am  |2 
 configure.ac |   39 +
 src/Makefile.am  |4 
 src/common_device_name.c |   39 +
 src/common_init.c|4 
 src/common_interface.c   |   18 
 src/freebsd_pci.c|   13 
 src/linux_devmem.c   |2 
 src/linux_sysfs.c|   45 +
 src/netbsd_pci.c |  409 ++
 src/openbsd_pci.c|7 
 src/pci_tools.h  |   47 -
 src/pciaccess_private.h  |1 
 src/scanpci.c|   19 
 src/scanpci.man  |   44 +
 src/solx_devfs.c | 1334 +--
 17 files changed, 1401 insertions(+), 675 deletions(-)
---


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

libpciaccess: Changes to 'refs/tags/libpciaccess-0.10.3'

2009-04-27 Thread David Nusinow

Tag 'libpciaccess-0.10.3' created by Adam Jackson a...@redhat.com at 
2008-06-10 19:25 +

libpciaccess 0.10.3
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEABECAAYFAkhO1RQACgkQW4otUKDs0NOStACgs6cHVDKCuyk/Yz9iINfXxlAl
RwwAoJBiJSAP8Qwys55RiI6+R35NPdb7
=ulnE
-END PGP SIGNATURE-

Changes since libpciaccess-0.10.2:
Adam Jackson (1):
  libpciaccess 0.10.3

---
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---


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

libpciaccess: Changes to 'refs/tags/libpciaccess-0.10'

2009-04-27 Thread David Nusinow

Tag 'libpciaccess-0.10' created by Adam Jackson a...@redhat.com at 2008-03-06 
20:32 +

libpciaccess 0.10
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.8 (GNU/Linux)

iEYEABECAAYFAkfQVNMACgkQW4otUKDs0NMg3wCfZ4+MFoGopYOJg6z0FRv+KIKM
FMMAnR+AM7av/DOYbIohPkKVvvKaif6e
=IPO2
-END PGP SIGNATURE-

Changes since the dawn of time:
Adam Jackson (1):
  libpciaccess 0.10

Alan Coopersmith (2):
  Fix Solaris build: missing static prototype  typo in variable name
  Need to link with -ldevinfo on Solaris

Doug Chapman (1):
  Bug #14818: Actually return the PCI vendor name, instead of NULL.

Eric Anholt (29):
  Use ENXIO instead of ENODATA for pci reads returning less than desired.
  Add endian macros for BSD.
  Add the beginnings of a FreeBSD port.
  Merge branch 'origin'
  Add missing newline at the end of the file.
  Update .gitignores.
  Add pciaccess_private.h to _SOURCES so it gets included in the dist.
  Enable more warnings when the compiler is GCC.
  Fix many warnings and bugs in the freebsd implementation.
  Remove extra fallback definition of PCIIDS_PATH.
  Open the pci device read-write so we can read and write config regs.
  Add support for getting region information on FreeBSD.
  Update freebsd code for pci_device_cfg_write API change.
  scanpci prototype warning fix
  Fix inverted protection typo for mmap in region mapping.
  FreeBSD: When mapping regions, use the region's base address, not 0.
  FreeBSD: Add system cleanup function.
  FreeBSD: Fix a couple of minor issues in cleanup paths.
  Make scanpci exit cleanly if pci_system_init() fails.
  FreeBSD: Fill in the subdevice ID.
  FreeBSD: Add VGA rom reading through /dev/mem.
  Make the base address printout of scanpci more usable.
  Add FreeBSD MTRR setting support.
  FreeBSD: don't set the MTRR if it's the default mode (uncacheable).
  FreeBSD: Fix unmap_range to return an error value.
  FreeBSD: Add support for multiple PCI domains.
  Add domain output to scanpci.
  FreeBSD: Don't try to unset an MTRR if we didn't set it.
  FreeBSD: for 64-bit BARs, skip the resource slot used for the upper 32 
bits.

George Sapountzis (1):
  scanpci: BIST line offsets were off by 4.

Ian Romanick (28):
  Initial import of libpciaccess.
  Remove src/Makefile.foo from CVS since the generated Makefile can do
  Remove src/pcils.c and src/Makefile.foo. Add src/scanpci.c.
  Bump to version 0.4.0.
  Fix foolish endianess bug. Bump to version 0.4.1.
  Fix byte ordering of the PCI class.
  Add support for querying bridge information.  Bump to version 0.5.0.
  Files missed (for reasons I still don't understand) on the previous
  Add pci_device_get_bridge_buses, bump API version to 0.5.0.
  Added some function preamble comments.
  Fix a segfault in populate_vendor that was triggered when the pci.ids file
  Fix bad cast that caused bit truncation.
  Add interfaces to map / unmap specific memory ranges, bump lib version to 
0.7.0.
  Convert pci_device_write_u* funtions to take a value instead of a pointer.
  Merge branch 'master' of 
git+ssh://git.freedesktop.org/git/xorg/lib/libpciaccess
  Fix bad parameter to pci_device_cfg_write in pci_device_cfg_write_u8.
  Populate device and vendor ID fields at device list creation.
  Make sure header_type is available in read_bridge_info.
  Don't pci_device_probe until absolutely necessary.
  Whitespace police.
  Initial support for reading expansion ROM via VGA BIOS address.
  Bump version to 0.9.0.
  Add linux_devmem.h to file list.
  Bump version to 0.9.1 (sigh).
  New interfaces to map memory with MTRR (or similar) support.
  Update / add comments in struct pci_mem_region.
  Add stub version of pci_device_map_memory_range
  Update bug reporting link.

James Cloos (4):
  Remove deprecated .cvsignore files
  Add *~ to .gitignore to skip patch/emacs droppings
  Merge branch 'master' of 
ssh://git.freedesktop.org/git/xorg/lib/libpciaccess
  Replace static ChangeLog with dist-hook to generate from git log

Julien Cristau (2):
  Use byteswap.h when using glibc, not just on linux
  Don't export private symbols.

Keith Packard (1):
  Don't add MTRR for uncached regions. Remove MTRR on unmap.

Kristian Høgsberg (1):
  Add scanpci as a noinst target.

Matthias Hopf (1):
  Bit-fields have to have type _Bool, signed int, or unsigned int.

edward shu (1):
  Libpciaccess on Solaris Initial integration


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

libpciaccess: Changes to 'refs/tags/libpciaccess-0.10.2'

2009-04-27 Thread David Nusinow

Tag 'libpciaccess-0.10.2' created by Adam Jackson a...@redhat.com at 
2008-06-10 19:23 +

libpciaccess 0.10.2
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEABECAAYFAkhO1KYACgkQW4otUKDs0NNMDQCdHUx9hIzmZoJ3olJ8LTgPGEzu
HaMAoJfElXQ0WiXeTkPLAvx8/ZfSwYl/
=Ptvv
-END PGP SIGNATURE-

Changes since libpciaccess-0.10:
Adam Jackson (2):
  Linux: Fail gracefully on machines without PCI.
  libpciaccess 0.10.2

Alan Coopersmith (3):
  Initialize err to 0 in pci_device_solx_devfs_map_range
  Add pci_system_solx_devfs_create prototype to pciaccess_private.h
  Fix lint warnings in solx_devfs.c

Danny van Dyk (1):
  Fix function prototypes for C++

Dave Airlie (2):
  linux: add pci_device_enable entrypoint and sysfs support for it
  pciaccess: bump to 0.10.1

Eric Anholt (1):
  Catch and recover from yet another linux kernel bug in mprotect.

Hasso Tepper (1):
  Add DragonFly BSD support

Julien Cristau (1):
  solaris: add pci_tools.h to OS_SUPPORT

Keith Packard (1):
  Kludge around linux bug and turn off write-through and cache-disable bits

Mark Kettenis (1):
  OpenBSD support for libpciaccess.

Stuart Bennett (1):
  Bug #13988: Fix reads from 0-sized ROMs.

---
 configure.ac|8 
 include/pciaccess.h |   12 +
 src/Makefile.am |8 
 src/common_init.c   |   13 +
 src/common_interface.c  |   21 ++
 src/common_iterator.c   |3 
 src/common_map.c|1 
 src/linux_devmem.c  |2 
 src/linux_sysfs.c   |   66 ++-
 src/openbsd_pci.c   |  406 
 src/pciaccess_private.h |4 
 src/solx_devfs.c|   14 -
 12 files changed, 528 insertions(+), 30 deletions(-)
---


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

libpciaccess: Changes to 'refs/tags/xf86-video-xgi-0.9.1'

2009-04-27 Thread David Nusinow

Tag 'xf86-video-xgi-0.9.1' created by Ian Romanick i...@us.ibm.com at 
2007-08-27 23:43 +

libpciaccess version 0.9.1

Changes since the dawn of time:
Eric Anholt (21):
  Use ENXIO instead of ENODATA for pci reads returning less than desired.
  Add endian macros for BSD.
  Add the beginnings of a FreeBSD port.
  Merge branch 'origin'
  Add missing newline at the end of the file.
  Update .gitignores.
  Add pciaccess_private.h to _SOURCES so it gets included in the dist.
  Enable more warnings when the compiler is GCC.
  Fix many warnings and bugs in the freebsd implementation.
  Remove extra fallback definition of PCIIDS_PATH.
  Open the pci device read-write so we can read and write config regs.
  Add support for getting region information on FreeBSD.
  Update freebsd code for pci_device_cfg_write API change.
  scanpci prototype warning fix
  Fix inverted protection typo for mmap in region mapping.
  FreeBSD: When mapping regions, use the region's base address, not 0.
  FreeBSD: Add system cleanup function.
  FreeBSD: Fix a couple of minor issues in cleanup paths.
  Make scanpci exit cleanly if pci_system_init() fails.
  FreeBSD: Fill in the subdevice ID.
  FreeBSD: Add VGA rom reading through /dev/mem.

George Sapountzis (1):
  scanpci: BIST line offsets were off by 4.

Ian Romanick (24):
  Initial import of libpciaccess.
  Remove src/Makefile.foo from CVS since the generated Makefile can do
  Remove src/pcils.c and src/Makefile.foo. Add src/scanpci.c.
  Bump to version 0.4.0.
  Fix foolish endianess bug. Bump to version 0.4.1.
  Fix byte ordering of the PCI class.
  Add support for querying bridge information.  Bump to version 0.5.0.
  Files missed (for reasons I still don't understand) on the previous
  Add pci_device_get_bridge_buses, bump API version to 0.5.0.
  Added some function preamble comments.
  Fix a segfault in populate_vendor that was triggered when the pci.ids file
  Fix bad cast that caused bit truncation.
  Add interfaces to map / unmap specific memory ranges, bump lib version to 
0.7.0.
  Convert pci_device_write_u* funtions to take a value instead of a pointer.
  Merge branch 'master' of 
git+ssh://git.freedesktop.org/git/xorg/lib/libpciaccess
  Fix bad parameter to pci_device_cfg_write in pci_device_cfg_write_u8.
  Populate device and vendor ID fields at device list creation.
  Make sure header_type is available in read_bridge_info.
  Don't pci_device_probe until absolutely necessary.
  Whitespace police.
  Initial support for reading expansion ROM via VGA BIOS address.
  Bump version to 0.9.0.
  Add linux_devmem.h to file list.
  Bump version to 0.9.1 (sigh).

James Cloos (1):
  Remove deprecated .cvsignore files

Kristian Høgsberg (1):
  Add scanpci as a noinst target.

edward shu (1):
  Libpciaccess on Solaris Initial integration


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

libpciaccess: Changes to 'refs/tags/libpciaccess-0.10.6-1'

2009-04-27 Thread David Nusinow

Tag 'libpciaccess-0.10.6-1' created by David Nusinow dnusi...@debian.org at 
2009-04-28 01:56 +

Tagging upload of libpciaccess-0.10.6-1 to unstable.

Changes since libpciaccess-0.10.6:
Brice Goglin (1):
  Misc fixes to debian/control and debian/copyright

David Nusinow (9):
  * Debian stores its pci.ids list in /usr/share/misc. Use that for the
  Merge branch 'upstream-experimental' into debian-experimental
  * New upstream git pull
  Autoreconf
  * Add myself to uploaders
  Merge branch 'upstream-unstable' into debian-unstable
  New upstream release
  Add versioned xutils-dev to build-dep, as the macros are now required
  Update standards version to 3.8.1.0. No changes necessary.

Julien Cristau (34):
  Initial packaging.
  Add missing line.
  Prepare changelog for upload.
  Merge branch 'master' of 
git://anongit.freedesktop.org/git/xorg/lib/libpciaccess into debian-experimental
  New upstream snapshot
  Make configure executable in debian/rules clean.
  Prepare changelog for upload.
  * Add a symbols file for libpciaccess.so.0.
  Bump shlibs to = 0.8.0+git20071002
  Bump Standards-Version to 3.7.3.
  Merge branch 'upstream-unstable' into debian-unstable
  autoreconf
  Bump version for new snapshot
  Use byteswap.h when using glibc, not just on linux
  Prepare changelog for upload.
  Merge tag 'libpciaccess-0.10' of 
git.freedesktop.org:/git/xorg/lib/libpciaccess into debian-unstable
  autoreconf
  Update debian/changelog, add and install the upstream ChangeLog
  Prepare changelog for upload
  Add watch file.
  Merge tag 'libpciaccess-0.10.3' into debian-unstable
  autoreconf and update changelogs for new upstream
  Bump shlibs and update symbols file.
  Suggest pciutils, which provides the pci.ids list.
  Prepare changelog for upload
  Merge tag 'libpciaccess-0.10.5' into debian-experimental
  Delete generated files
  Run autoreconf at build time, cleanup generated files in clean.
  Allow reading compressed pci.ids file (closes: #478696).
  Add bug closer
  Prepare changelog for upload
  update upstream changelog
  Prepare changelog for upload
  Prepare changelog for upload

---
 ChangeLog   |  787 
 INSTALL |  236 ---
 debian/changelog|   85 
 debian/compat   |1 
 debian/control  |   33 +
 debian/copyright|  113 +
 debian/libpciaccess-dev.install |4 
 debian/libpciaccess0.install|1 
 debian/libpciaccess0.shlibs |1 
 debian/libpciaccess0.symbols|   36 +
 debian/rules|   94 
 debian/watch|2 
 12 files changed, 1157 insertions(+), 236 deletions(-)
---


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

libpciaccess: Changes to 'refs/tags/libpciaccess-0.9.1'

2009-04-27 Thread David Nusinow

Tag 'libpciaccess-0.9.1' created by Ian Romanick i...@us.ibm.com at 
2007-08-27 23:44 +

libpciaccess version 0.9.1

Changes since the dawn of time:
Eric Anholt (21):
  Use ENXIO instead of ENODATA for pci reads returning less than desired.
  Add endian macros for BSD.
  Add the beginnings of a FreeBSD port.
  Merge branch 'origin'
  Add missing newline at the end of the file.
  Update .gitignores.
  Add pciaccess_private.h to _SOURCES so it gets included in the dist.
  Enable more warnings when the compiler is GCC.
  Fix many warnings and bugs in the freebsd implementation.
  Remove extra fallback definition of PCIIDS_PATH.
  Open the pci device read-write so we can read and write config regs.
  Add support for getting region information on FreeBSD.
  Update freebsd code for pci_device_cfg_write API change.
  scanpci prototype warning fix
  Fix inverted protection typo for mmap in region mapping.
  FreeBSD: When mapping regions, use the region's base address, not 0.
  FreeBSD: Add system cleanup function.
  FreeBSD: Fix a couple of minor issues in cleanup paths.
  Make scanpci exit cleanly if pci_system_init() fails.
  FreeBSD: Fill in the subdevice ID.
  FreeBSD: Add VGA rom reading through /dev/mem.

George Sapountzis (1):
  scanpci: BIST line offsets were off by 4.

Ian Romanick (24):
  Initial import of libpciaccess.
  Remove src/Makefile.foo from CVS since the generated Makefile can do
  Remove src/pcils.c and src/Makefile.foo. Add src/scanpci.c.
  Bump to version 0.4.0.
  Fix foolish endianess bug. Bump to version 0.4.1.
  Fix byte ordering of the PCI class.
  Add support for querying bridge information.  Bump to version 0.5.0.
  Files missed (for reasons I still don't understand) on the previous
  Add pci_device_get_bridge_buses, bump API version to 0.5.0.
  Added some function preamble comments.
  Fix a segfault in populate_vendor that was triggered when the pci.ids file
  Fix bad cast that caused bit truncation.
  Add interfaces to map / unmap specific memory ranges, bump lib version to 
0.7.0.
  Convert pci_device_write_u* funtions to take a value instead of a pointer.
  Merge branch 'master' of 
git+ssh://git.freedesktop.org/git/xorg/lib/libpciaccess
  Fix bad parameter to pci_device_cfg_write in pci_device_cfg_write_u8.
  Populate device and vendor ID fields at device list creation.
  Make sure header_type is available in read_bridge_info.
  Don't pci_device_probe until absolutely necessary.
  Whitespace police.
  Initial support for reading expansion ROM via VGA BIOS address.
  Bump version to 0.9.0.
  Add linux_devmem.h to file list.
  Bump version to 0.9.1 (sigh).

James Cloos (1):
  Remove deprecated .cvsignore files

Kristian Høgsberg (1):
  Add scanpci as a noinst target.

edward shu (1):
  Libpciaccess on Solaris Initial integration


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

libpciaccess: Changes to 'refs/tags/libpciaccess-0.10.5'

2009-04-27 Thread David Nusinow

Tag 'libpciaccess-0.10.5' created by Julien Cristau jcris...@debian.org at 
2008-10-31 17:12 +

libpciaccess 0.10.5
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEABECAAYFAkkLPJgACgkQmEvTgKxfcAwfQACgiLjqmJq0uAZNronunHRw802L
AvgAniLOWfIVe1xKJlCC5EFTJWoP6v+L
=IwN0
-END PGP SIGNATURE-

Changes since libpciaccess-0.10.4:
Julien Cristau (2):
  Make --without-zlib work
  Bump to 0.10.5

Robert Noland (1):
  Fix FreeBSD systems which support pci domains.

---
 configure.ac  |4 ++--
 src/freebsd_pci.c |1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
---


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

libpciaccess: Changes to 'refs/tags/libpciaccess-0.10.6'

2009-04-27 Thread David Nusinow

Tag 'libpciaccess-0.10.6' created by Alan Coopersmith 
alan.coopersm...@sun.com at 2009-04-24 23:32 +

libpciaccess 0.10.6

Changes since libpciaccess-0.10.5:
Alan Coopersmith (12):
  Fill in byte swapping routines for big-endian Solaris machines
  Don't open/gzopen pci.ids if we're not going to read it
  Add AC_SYS_LARGEFILE to configure.ac
  Solaris: Use bus-range properties to limit busses scanned on each node
  Add README with pointers to mailing list, bugzilla  git repos
  Fix const mismatch compiler warnings in Solaris backend
  Sun bug 6811468: pci_device_solx_devfs_probe accesses freed memory
  Move included m4 to a subdir so we can more easily update from upstream
  Fix $CWARNFLAGS addition
  Fix unused variable warnings in Solaris code
  Resync COPYING file with code copyright notices
  Version bump: 0.10.6

Darren Smith (1):
  Be more paranoid about reading bridge info (#20786)

Mark Kettenis (1):
  Make libpciaccess on OpenBSD domain-aware.

Matthieu Herrb (3):
  Fix a logic error in pci_device_openbsd_write().
  Sync with OpenBSD code.
  Fix a logic error in pci_device_netbsd_write()

Owain Ainsworth (1):
  openbsd_pci.c: use the correct size when mapping the legacy vga rom.

Paulo Cesar Pereira de Andrade (1):
  Janitor: Correct make distcheck and compiler warnings.

Robert Noland (1):
  FreeBSD: Incorporate several fixes that have accumulated.

edward shu (1):
  Sun bug 6785726: libpciaccess needs to use the correct BAR index on 
solaris

---
 .gitignore   |9 +
 COPYING  |   28 
 Makefile.am  |9 -
 README   |   35 +
 configure.ac |   56 ++---
 m4/ac_define_dir.m4  |   49 
 src/Makefile.am  |2 
 src/common_bridge.c  |   20 ++-
 src/common_device_name.c |   17 +-
 src/common_interface.c   |   18 ++-
 src/freebsd_pci.c|  183 +++---
 src/netbsd_pci.c |2 
 src/openbsd_pci.c|  282 ---
 src/scanpci.c|1 
 src/solx_devfs.c |  171 
 15 files changed, 665 insertions(+), 217 deletions(-)
---


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

Re: touchpad issues on sid/unstable

2009-04-19 Thread David Nusinow

Louis-David Mitterrand wrote:
 Hi,
 
 After recently dist-upgrading a vaio and a dell laptop I noticed their
 touchpad no longer mouse-click when tapped and scrolls when dragging on
 the edges. Have the defaults changed?

Yes they have, by upstream. Please see
http://wiki.debian.org/XStrikeForce/CurrentProblemsInUnstable and the
bug referenced there #497523. We have a NEWS.Debian entry about this
waiting in git for the next upload.

 - David Nusinow


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

xorg: Changes to 'debian-unstable'

2009-04-18 Thread David Nusinow

 debian/changelog |4 +++-
 debian/control   |2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 061e280e5a8c0747f747e386e55a549bb5089b19
Author: David Nusinow dnusi...@debian.org
Date:   Sat Apr 18 17:15:53 2009 -0400

Add libgl1-mesa-dri to the depends of the xorg package
This will ensure that it gets pulled in even if Recommends are disabled.

diff --git a/debian/changelog b/debian/changelog
index da7c3b5..80c8e71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,13 +5,15 @@ xorg (1:7.4+2) UNRELEASED; urgency=low
   [ David Nusinow ]
   * Don't discuss removal of xserver-xorg in its description. 
 It remains tied to -core at this point. (closes: #523630).
+  * Add libgl1-mesa-dri to the depends of the xorg package to ensure that
+it gets pulled in even if Recommends are disabled
 
   [ Julien Cristau ]
   * Update the NEWS entry for xserver-xorg 1:7.4+1 to include a warning about
 keycode changes breaking Xmodmaps (closes: #523562).  Thanks, Manoj
 Srivastava!
 
- -- Julien Cristau jcris...@debian.org  Fri, 10 Apr 2009 14:12:51 +0100
+ -- David Nusinow dnusi...@debian.org  Sat, 18 Apr 2009 17:14:13 -0400
 
 xorg (1:7.4+1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 350ebb1..590d225 100644
--- a/debian/control
+++ b/debian/control
@@ -118,7 +118,7 @@ Description: the X.Org X server -- input driver metapackage
 
 Package: xorg
 Architecture: any
-Depends: xserver-xorg, libgl1-mesa-glx | libgl1, libglu1-mesa, xfonts-base (= 
1:1.0.0-1), xfonts-100dpi (= 1:1.0.0-1), xfonts-75dpi (= 1:1.0.0-1), 
xfonts-scalable (= 1:1.0.0-1), x11-apps, x11-session-utils, x11-utils, 
x11-xfs-utils, x11-xkb-utils, x11-xserver-utils, xauth, xinit, xfonts-utils, 
xkb-data, xterm | x-terminal-emulator, sparc-utils [sparc]
+Depends: xserver-xorg, libgl1-mesa-glx | libgl1, libgl1-mesa-dri, 
libglu1-mesa, xfonts-base (= 1:1.0.0-1), xfonts-100dpi (= 1:1.0.0-1), 
xfonts-75dpi (= 1:1.0.0-1), xfonts-scalable (= 1:1.0.0-1), x11-apps, 
x11-session-utils, x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils, 
xauth, xinit, xfonts-utils, xkb-data, xterm | x-terminal-emulator, sparc-utils 
[sparc]
 Recommends: xorg-docs
 Provides: x-window-system, x-window-system-core
 Description: X.Org X Window System


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

Bug#524340: Reproducible GUI lockups

2009-04-16 Thread David Nusinow


Hi Ray,

J.H.M. Dassen (Ray) wrote:

(==) intel(0): Using EXA for acceleration
  
Could you try upgrading to kernel 2.6.29 and seeing if that helps? This 
should enable UXA rather than EXA by default, which has been reported to 
fix issues for some people, particularly with this new version.


- David Nusinow



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

Bug#524340: Reproducible GUI lockups

2009-04-16 Thread David Nusinow

Sorry, in my last mail I forgot to mention that you have to enable KMS. 
You should be able to do that by adding

i915.modeset=1 on the kernel command line.

- David Nusinow



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

xorg: Changes to 'debian-unstable'

2009-04-16 Thread David Nusinow

 debian/xserver-xorg.NEWS |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 287674da0a833853f8d976d351f4b50f173c22e0
Author: David Nusinow dnusi...@debian.org
Date:   Thu Apr 16 11:18:33 2009 -0400

Add a note about what people should do for the keycode breakage

diff --git a/debian/xserver-xorg.NEWS b/debian/xserver-xorg.NEWS
index 5212f20..74a460d 100644
--- a/debian/xserver-xorg.NEWS
+++ b/debian/xserver-xorg.NEWS
@@ -17,7 +17,8 @@ xserver-xorg (1:7.4+1) unstable; urgency=low
 
   As a result of using the evdev driver for keyboards, the keycodes for some
   keys are no longer the traditional xfree86 ones.  This will break custom
-  Xmodmaps relying on the old keycodes.
+  Xmodmaps relying on the old keycodes. You'll need to re-configure these
+  custom maps with the new keycodes.
 
  -- Julien Cristau jcris...@debian.org  Thu, 16 Apr 2009 17:01:11 +0200
 


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

Bug#524340: Reproducible GUI lockups

2009-04-16 Thread David Nusinow


J.H.M. Dassen (Ray) wrote:

Hello David,

On Thu, Apr 16, 2009 at 10:40:14 -0400, David Nusinow wrote:
  

J.H.M. Dassen (Ray) wrote:


(==) intel(0): Using EXA for acceleration
  
  

Could you try upgrading to kernel 2.6.29 and seeing if that helps?



Actually, this was with 2.6.29.1 already. I'm building from source, with
CONFIG_DRM_I915=m
CONFIG_DRM_I915_KMS=y
  


Ok, great!


On Thu, Apr 16, 2009 at 11:14:27 -0400, David Nusinow wrote:
  
Sorry, in my last mail I forgot to mention that you have to enable KMS.  
You should be able to do that by adding

i915.modeset=1 on the kernel command line.



This doesn't seem to work:
# dmesg | grep 915
	Command line: root=/dev/mapper/Debsys-Root ro i915.modeset=1 
	Kernel command line: root=/dev/mapper/Debsys-Root ro i915.modeset=1 
	Unknown boot option `i915.modeset=1': ignoring

[drm] Initialized i915 1.6.0 20080730 on minor 0

# egrep -i '(uxa|exa)' /var/log/Xorg.log
(==) intel(0): Using EXA for acceleration
(II) intel(0): Using exact sizes for initial modes
(II) Loading sub module exa
(II) LoadModule: exa
(II) Loading /usr/lib/xorg/modules//libexa.so
(II) Module exa: vendor=X.Org Foundation
(WW) intel(0): DRI2 requires UXA
(II) EXA(0): Offscreen pixmap area of 41287680 bytes
(II) EXA(0): Driver registered support for the following operations:
(II) intel(0): 0x0d8a-0x0fff: exa offscreen (40320 kB)
  
That's a surprise. Could you try forcing UXA by adding 'option 
AccelMethod uxa' to the device section of your xorg.conf?


- David Nusinow



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

xorg-server: Changes to 'debian-unstable'

2009-04-16 Thread David Nusinow

 debian/changelog|7 ++-
 debian/xserver-xorg-core.bug.script |   10 ++
 2 files changed, 16 insertions(+), 1 deletion(-)

New commits:
commit 6f9b448f54d0eed4423d7a155898f333a66daac8
Author: David Nusinow dnusi...@debian.org
Date:   Thu Apr 16 22:44:59 2009 -0400

Have the reportbug script append lshal and drm info.
The drm info comes from grepping dmesg output.

diff --git a/debian/changelog b/debian/changelog
index b3f23bb..543104e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 xorg-server (2:1.6.1-2) UNRELEASED; urgency=low
 
+  [ Brice Goglin ]
   * Add 20_hurd-i386.diff to fix FTBFS on hurd-i386,
 thanks Samuel Thibault! (closes: #523970)
 
- -- Brice Goglin bgog...@debian.org  Wed, 15 Apr 2009 15:32:04 +0200
+  [ David Nusinow ]
+  * Have the reportbug script append lshal and drm info.
+The drm info comes from grepping dmesg output.
+
+ -- David Nusinow dnusi...@debian.org  Thu, 16 Apr 2009 22:44:29 -0400
 
 xorg-server (2:1.6.1-1) unstable; urgency=low
 
diff --git a/debian/xserver-xorg-core.bug.script 
b/debian/xserver-xorg-core.bug.script
index 739cdd3..11f83be 100644
--- a/debian/xserver-xorg-core.bug.script
+++ b/debian/xserver-xorg-core.bug.script
@@ -117,6 +117,16 @@ else
 printf No Xorg X server log files found.\n
 fi
 
+if [ -x /usr/bin/lshal ]; then
+printf HAL Information (lshal):\n
+lshal
+fi
+
+if [ -x /bin/dmesg ]; then
+printf DRM Information from dmesg:\n
+dmesg | grep 'drm'
+fi
+
 printf \n
 
 # vim:set ai et sts=4 sw=4 tw=0:


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

Bug#513545: same problem

2009-04-15 Thread David Nusinow


Ritesh Raj Sarraf wrote:

Hi,

I just upgraded to the new xserver in unstable and I have the same problem. 
Tapping and scrolling doesn't work.


r...@champaran:~$ dpkg -l | grep xserver-xorg-input-synaptics
ii  xserver-xorg-input-synaptics 1.1.0-1  
Synaptics TouchPad driver for X.Org server



This bug report has 2 workarounds mentioned.

One is about modifying the config file. I think that would not be recommended as 
X is supposed to move to a default config less setup.


How about the 2nd one ? The hal fdi ?
Should that be packaged ?

How will this bug be fixed ?

  
X is only supposed to move to a setup without config by default. If you 
need to customize it, as by enabling tapping, editing xorg.conf is a 
perfectly acceptable way to do it. If there wasn't supposed to be 
support for xorg.conf, we would have ripped out the code to handle it a 
long time ago. There isn't really a bug to be fixed here, just a changed 
default that people will have to configure by one method or another.


- David Nusinow




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

Bug#515214: Bug#523960: equivs is surely not the solution to this problem. Recommends: is.

2009-04-15 Thread David Nusinow


Axel Beckert wrote:

I really can't understand how someone can suggest to fake packages
using equivs instead of using the Recommends: header as it's
thought.

The Policy says in 7.2 very clearly in all but unusual
installations, so nobody can't use users who just want it work as
argument. Debian's default is btw. to install recommended packages
anyway. Another reason why users who just want it work are _no_
argument against using Recommends: header.
  
Thank you so much for repeating exactly what other people have said. 
Given that the XSF must be collectively illterate,  we didn't understand 
them the first dozen or so emails stating this, so the above was clearly 
necessary.



X.org not only runs on fat workstations but also on embedded device
where you as less abstraction layers and diskspace used as possible.
Debian always claims to be the _universal_ operating system and it
should also package X.org to be universal. Debian is not (a desktop
focussed) Ubuntu.
  
Note that this is the direction that upstream is heading in. The design 
is conceptually quite simple. The X server asks the system, in this case 
via hal, to enumerate input devices are present and gets them enumerated 
back. It then utilizes that hardware via the kernel rather than driving 
them itself with its own drivers. Note that this system was designed and 
implemented by a Nokia employee for an embedded system. It brings an 
enormous simplification to the overall operating system by putting 
things like keymaps in one place, and only having the kernel driving the 
hardware rather than both the kernel and the X server. It also makes it 
flexible with system changes, allowing hotplugging. Most importantly to 
Debian and the XSF, it means that we don't have to carry around a 
gigantic horrible bunch of shell script just to configure the system. 
All of this is a good thing.


If you object to having the X server depend on external software, you're 
going to have to learn to like it, because the goal has been to decrease 
the amount of OS code that the server needs to duplicate in order to do 
its job. It no longer scans the PCI bus itself, but instead relies on 
libpciaccess to query the OS. It no longer carries its own build system, 
but relies on autotools. All of the video drivers are moving significant 
portions of themselves in to the kernel as well. If you can't deal with 
hal, then you'll have to write a replacement for it that allows the 
server to query the system in a transparent way, and also allows one to 
easily configure device-specific properties. This is something that hal 
currently does very well and the X server can not do otherwise.


All of that said, it's very likely that we will downgrade the depends to 
recommends, just not right now. We have actual important bugs like 
totally broken installs that we want to deal with first.



I herewith vote for demoting hal (#515214) and console-setup (#523960)
to recommends.
  

The BTS is not a voting system.

- David Nusinow



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

xserver-xorg-input-synaptics: Changes to 'debian-unstable'

2009-04-12 Thread David Nusinow

 debian/changelog |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 334fbcd99386f878bcdf13ebab6e9631afdb0034
Author: David Nusinow dnusi...@debian.org
Date:   Sun Apr 12 08:43:49 2009 -0400

Add bug closer

diff --git a/debian/changelog b/debian/changelog
index 4580195..acef7fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 xserver-xorg-input-synaptics (1.1.0-2) unreleased; urgency=low
 
-  * Add NEWS.Debian entry about enabling tapping again
+  * Add NEWS.Debian entry about enabling tapping again (closes: #497523)
 
  -- David Nusinow dnusi...@debian.org  Sat, 11 Apr 2009 16:32:54 -0400
 


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

Bug#497523: NEWS?

2009-04-12 Thread David Nusinow

Brice Goglin wrote:
 David actually wrote a NEWS entry about this yesterday:

 http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-synaptics.git;a=commitdiff;h=598ae3fe8592f80e97f58a1c54822754dcd5378e
 
 If anybody knows how to enable tapping at runtime with hal or xinput, we
 can add it as well.

Additionally, if people who actually have and use synaptics could check
the example in that entry and confirm that it works, I'd very much
appreciate it.

 - David Nusinow



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

xserver-xorg-input-synaptics: Changes to 'debian-unstable'

2009-04-12 Thread David Nusinow

 debian/NEWS |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 47989b59ca05d13765942a8492139723812087f0
Author: David Nusinow dnusi...@debian.org
Date:   Sun Apr 12 09:49:49 2009 -0400

Fix configuration sample in NEWS based on user feedback

diff --git a/debian/NEWS b/debian/NEWS
index cf20a0c..dfa879b 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -7,10 +7,13 @@ xserver-xorg-input-synaptics (1.1.0-2) unstable; urgency=low
 Section InputDevice
 Identifier synaptics
 Driver synaptics
-Option TouchpadOff 2
+Option TapButton1 1
+Option TapButton2 2
+Option TapButton3 3
 EndSection
 
-   For more details see synaptics(4) and
+   You may only require one or two TapButton options for your own
+   configuration. For more details see synaptics(4) and

http://who-t.blogspot.com/2009/04/synaptics-11-and-what-your-touchpad-can.html
 
  -- David Nusinow dnusi...@debian.org  Sat, 11 Apr 2009 16:23:11 -0400


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

Bug#497523: NEWS?

2009-04-12 Thread David Nusinow

Nelson A. de Oliveira wrote:
 Hi!
 
 On Sun, Apr 12, 2009 at 9:42 AM, David Nusinow dnusi...@debian.org wrote:
 Brice Goglin wrote:
 David actually wrote a NEWS entry about this yesterday:

 http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-synaptics.git;a=commitdiff;h=598ae3fe8592f80e97f58a1c54822754dcd5378e

 If anybody knows how to enable tapping at runtime with hal or xinput, we
 can add it as well.
 Additionally, if people who actually have and use synaptics could check
 the example in that entry and confirm that it works, I'd very much
 appreciate it.
 
 Using
 
 Option TouchpadOff 2
 
 didn't work here.
 
 I had to use this however:
 
 Option  TapButton11
 Option  TapButton22
 Option  TapButton33
 
 If there is something that I can do to help (sending logs, etc),
 please, just ask.
 
 Thank you!

This is perfect, I've just updated the NEWS entry accordingly. Thank you!

 - David Nusinow



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

xserver-xorg-video-glide: Changes to 'debian-unstable'

2009-04-12 Thread David Nusinow

 debian/changelog  |9 +++--
 debian/control|1 +
 debian/patches/001_no_ansiheader.diff |   12 
 debian/patches/series |1 +
 debian/rules  |4 ++--
 5 files changed, 23 insertions(+), 4 deletions(-)

New commits:
commit 1d568d48a213ea49ea4657651471de71c3326d2d
Author: David Nusinow dnusi...@debian.org
Date:   Sun Apr 12 11:31:45 2009 -0400

Add 001_no_ansiheader.diff to fix build. Enable quilt to use this.
Also add quilt to build-depends.

diff --git a/debian/changelog b/debian/changelog
index 25533c9..e815408 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,11 @@ xserver-xorg-video-glide (1.0.2-1) unstable; urgency=low
   * Build against xserver 1.6.
   * Allow parallel builds.
 
- -- David Nusinow dnusi...@debian.org  Sun, 12 Apr 2009 10:36:12 -0400
+  [ David Nusinow ]
+  * Add 001_no_ansiheader.diff to fix build. Enable quilt to use this.
+Also add quilt to build-depends.
+
+ -- David Nusinow dnusi...@debian.org  Sun, 12 Apr 2009 11:16:04 -0400
 
 xserver-xorg-video-glide (1.0.1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index ed274be..90b7245 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Uploaders: Brice Goglin bgog...@debian.org
 Build-Depends:
  debhelper (= 5),
  pkg-config,
+ quilt,
  xserver-xorg-dev (= 2:1.6),
  x11proto-core-dev,
  x11proto-fonts-dev,
diff --git a/debian/patches/001_no_ansiheader.diff 
b/debian/patches/001_no_ansiheader.diff
new file mode 100644
index 000..4bc1369
--- /dev/null
+++ b/debian/patches/001_no_ansiheader.diff
@@ -0,0 +1,12 @@
+diff --git a/src/glide_driver.c b/src/glide_driver.c
+index fac93b2..6d6aac4 100644
+--- a/src/glide_driver.c
 b/src/glide_driver.c
+@@ -54,7 +54,6 @@
+ #include colormapst.h
+ #include xf86.h
+ #include xf86_OSproc.h
+-#include xf86_ansic.h
+ #include mipointer.h
+ #include mibstore.h
+ #include micmap.h
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000..8e80199
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+001_no_ansiheader.diff
diff --git a/debian/rules b/debian/rules
index cc98542..27cc179 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,7 +33,7 @@ endif
 confflags += --disable-static
 
 build: build-stamp
-build-stamp:
+build-stamp: $(STAMP_DIR)/patch
dh_testdir
 
autoreconf -vfi
@@ -48,7 +48,7 @@ build-stamp:
 
touch build-stamp
 
-clean:
+clean: xsfclean
dh_testdir
dh_testroot
rm -f build-stamp

commit a8d363fb1e297ef94f612549a6390adcfd186d00
Author: David Nusinow dnusi...@debian.org
Date:   Sun Apr 12 10:36:31 2009 -0400

Prepare for upload to unstable

diff --git a/debian/changelog b/debian/changelog
index be241a0..25533c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
-xserver-xorg-video-glide (1.0.2-1) UNRELEASED; urgency=low
+xserver-xorg-video-glide (1.0.2-1) unstable; urgency=low
 
+  [ Julien Cristau ]
   * New upstream release.
   * Bump build-dep on xutils-dev to = 1:7.4+4.
   * Build against xserver 1.6.
   * Allow parallel builds.
 
- -- Julien Cristau jcris...@debian.org  Sun, 12 Apr 2009 12:12:29 +0100
+ -- David Nusinow dnusi...@debian.org  Sun, 12 Apr 2009 10:36:12 -0400
 
 xserver-xorg-video-glide (1.0.1-1) unstable; urgency=low
 


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

xserver-xorg-video-glide: Changes to 'refs/tags/xserver-xorg-video-glide-1.0.2-1'

2009-04-12 Thread David Nusinow

Tag 'xserver-xorg-video-glide-1.0.2-1' created by David Nusinow 
dnusi...@debian.org at 2009-04-12 15:34 +

Tagging upload of xserver-xorg-video-glide-1.0.2-1 to unstable.

Changes since xserver-xorg-video-glide-1.0.1-1:
Adam Jackson (1):
  Use no bus, not ISA.

Alan Coopersmith (1):
  Remove xorgconfig  xorgcfg from See Also list in man page

David Nusinow (2):
  Prepare for upload to unstable
  Add 001_no_ansiheader.diff to fix build. Enable quilt to use this.

Guillem Jover (5):
  Rename entity to entityIndex to fix build failure
  Add UTF-8 copyright symbol to copyright statements
  Make ChangeLog a .PHONY target
  Use XORG_CHANGELOG and CHANGELOG_CMD to generate the ChangeLog file
  Bump to 1.0.2

Julien Cristau (14):
  xsfbs.mk: fix the prepare target for parallel make
  xsfbs.mk: more parallel make fixing
  xsfbs.mk: update the list of releases, and drop some unused code
  xsfbs.mk: make 'log' a separate target
  xsfbs: add a repack script for uscan
  xsfbs.sh: kill {,de}register_x_lib_dir_with_ld_so
  xsfbs: repack.sh needs to be executable
  Merge tag 'xf86-video-glide-1.0.2' into debian-unstable
  update/add changelogs
  debian/control: wrap Build-Depends
  Bump build-dep on xutils-dev to = 1:7.4+4.
  Build against xserver 1.6.
  Merge branch 'debian-unstable' of git.debian.org:/git/pkg-xorg/xsfbs into 
debian-unstable
  Allow parallel builds.

---
 COPYING   |8 -
 ChangeLog |  224 ++
 Makefile.am   |   10 -
 configure.ac  |   12 +
 debian/changelog  |   14 ++
 debian/control|   16 ++
 debian/patches/001_no_ansiheader.diff |   12 +
 debian/patches/series |1 
 debian/rules  |   13 +
 debian/xsfbs/repack.sh|   32 
 debian/xsfbs/xsfbs.mk |   29 +---
 debian/xsfbs/xsfbs.sh |   66 --
 man/Makefile.am   |2 
 man/glide.man |2 
 src/Makefile.am   |2 
 src/glide_driver.c|8 -
 16 files changed, 340 insertions(+), 111 deletions(-)
---


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

Bug#515214: [PATCH] hal depends - recommends

2009-04-12 Thread David Nusinow

Here's a slight variant on the patch with much stronger wording in the
NEWS entry, and some more detail in debian/changelog. We want to be very
clear that we want people to use hal. I didn't go so far as to say that
not using hal won't be supported in the future, but I did try to get
across that the user is entirely responsible for their input
configuration if they choose not to use hal.

 - David Nusinow
From 9e594116533cedccf273b216ccdce6585c9696bb Mon Sep 17 00:00:00 2001
From: David Nusinow dnusi...@debian.org
Date: Sun, 12 Apr 2009 19:31:26 -0400
Subject: [PATCH] Demote hal Depends: to Recommends:.
 For that add a NEWS.Debian entry that people have to be careful on upgrades
 to not lose their input devices (without hal it needs a config option).
 Thanks Joerg Jaspert.

Require that this config option be set when hal is absent during postinst
---
 debian/changelog|6 ++
 debian/control  |3 +--
 debian/xserver-xorg.NEWS|   21 +
 debian/xserver-xorg.postinst.in |4 
 4 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bc0a3b5..5d4287e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,12 @@ xorg (1:7.4+2) UNRELEASED; urgency=low
 
   * Don't discuss removal of xserver-xorg in its description. 
 It remains tied to -core at this point. (closes: #523630).
+
+  * Demote hal Depends: to Recommends:. For that add a NEWS.Debian entry
+that people have to be careful on upgrades to not lose their input
+devices (without hal it needs a config option). Thanks Joerg Jaspert.
++ Require that this config option be set when hal is absent during
+  postinst
 	
  -- Julien Cristau jcris...@debian.org  Fri, 10 Apr 2009 14:12:51 +0100
 
diff --git a/debian/control b/debian/control
index 350ebb1..cc2b023 100644
--- a/debian/control
+++ b/debian/control
@@ -86,13 +86,12 @@ Depends:
  xserver-xorg-input-evdev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc sparc],
  xserver-xorg-video-all | xserver-xorg-video-5,
  xserver-xorg-input-all | xserver-xorg-input-4,
- hal (= 0.5.12~git20090406),
  console-setup (= 1.29),
  ${shlibs:Depends},
  ${misc:Depends},
  xkb-data (= 1.4),
  x11-xkb-utils
-Recommends: libgl1-mesa-dri, udev
+Recommends: libgl1-mesa-dri, udev, hal (= 0.5.12~git20090406)
 Description: the X.Org X server
  This package depends on the full suite of the server and drivers for the
  X.Org X server, as well as providing a configuration infrastructure to manage
diff --git a/debian/xserver-xorg.NEWS b/debian/xserver-xorg.NEWS
index 6987bec..2221c53 100644
--- a/debian/xserver-xorg.NEWS
+++ b/debian/xserver-xorg.NEWS
@@ -1,3 +1,24 @@
+xserver-xorg (1:7.4+2) unstable; urgency=low
+
+  Starting with this release, hal is a recommended rather than
+  depended-upon package. This is because, although the X server
+  remains capable of configuring input devices without hal, it is
+  strongly recommended that you use this method unless there is a good
+  reason otherwise. Using hal provides the X server with the ability
+  to dynamically and correctly configure input devices while running,
+  and as a result it will be the best supported and most easily
+  maintained method of handling input devices for the forseeable
+  future.
+
+  If you choose to run your system without hal, you will have to take
+  all responsibility for manually configuring your input devices via
+  xorg.conf. To ensure working input devices for your X server when
+  hal is absent, add 'Option AutoAddDevices off' in the
+  ServerLayout section of your /etc/X11/xorg.conf (without the outer
+  '') and configure input devices as you did in the past.
+
+ -- David Nusinow dnusi...@debian.org Sun, 12 Apr 2009 19:24:09 -0400
+
 xserver-xorg (1:7.4+1) unstable; urgency=low
 
   Starting from this version, input devices are no longer configured
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index 7f75de2..be31457 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -270,6 +270,10 @@ fi
 
 debug_echo Configuring $THIS_PACKAGE.
 
+if ! [ -x /usr/sbin/hald ]   ! grep -q AutoAddDevices ${XORGCONFIG}; then
+bomb Please either install hal or configure your xorg.conf to work without, see NEWS entry for xserver-xorg version 1:7.4+2
+fi
+
 if [ -n $FIRSTINST ] || [ -n $RECONFIGURE ]; then
   # BusID
   PRIORITY=low
-- 
1.6.2.2

xorg: Changes to 'debian-experimental'

2009-04-11 Thread David Nusinow

 debian/changelog   |   27 +
 debian/control |6 
 debian/local/debian-setup-keyboard |   21 
 debian/local/debian-x11-keymap.fdi |   10 
 debian/local/rgb.txt   |  754 +
 debian/po/ar.po|  663 -
 debian/po/ast.po   |  541 
 debian/po/be.po|  668 -
 debian/po/bg.po|  698 +--
 debian/po/bs.po|  723 +---
 debian/po/ca.po|  699 +--
 debian/po/cs.po|  661 -
 debian/po/da.po|  712 +--
 debian/po/de.po|  692 --
 debian/po/dz.po|  667 -
 debian/po/el.po|  714 +--
 debian/po/eo.po|  521 +++
 debian/po/es.po|  704 +--
 debian/po/eu.po|  683 --
 debian/po/fi.po|  678 --
 debian/po/fr.po|  708 +--
 debian/po/gl.po|  684 --
 debian/po/gu.po|  650 
 debian/po/he.po|  651 +++-
 debian/po/hr.po|  668 -
 debian/po/hu.po|  672 -
 debian/po/id.po|  653 -
 debian/po/it.po|  693 --
 debian/po/ja.po|  661 -
 debian/po/kk.po|  498 ++
 debian/po/km.po|  682 --
 debian/po/ko.po|  653 -
 debian/po/ku.po|  331 --
 debian/po/lt.po|  666 -
 debian/po/ml.po|  669 -
 debian/po/mr.po|  695 +-
 debian/po/nb.po|  661 -
 debian/po/ne.po|  707 +--
 debian/po/nl.po|  674 -
 debian/po/nn.po|  711 +--
 debian/po/pl.po|  676 --
 debian/po/pt.po|  697 +-
 debian/po/pt_BR.po |  692 --
 debian/po/ro.po|  691 --
 debian/po/ru.po|  679 --
 debian/po/sk.po|  832 +++--
 debian/po/sq.po|  718 +--
 debian/po/sv.po|  680 --
 debian/po/ta.po|  660 -
 debian/po/templates.pot|  325 --
 debian/po/th.po|  638 +++-
 debian/po/tr.po|  671 -
 debian/po/vi.po|  669 -
 debian/po/wo.po|  694 --
 debian/po/zh_CN.po |  619 +++
 debian/po/zh_TW.po |  625 +++
 debian/rules   |1 
 debian/x11-common.install  |1 
 debian/xserver-xorg.NEWS   |   16 
 debian/xserver-xorg.install|2 
 60 files changed, 15434 insertions(+), 18981 deletions(-)

New commits:
commit 6c8bd805b4e8310d4dba68c63b4d5815f84c7819
Author: David Nusinow dnusi...@debian.org
Date:   Sat Apr 11 15:38:33 2009 -0400

Don't discuss removal of xserver-xorg in its description.

It remains tied to -core at this point. (closes: #523630).

diff --git a/debian/changelog b/debian/changelog
index 9adc908..bc0a3b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ xorg (1:7.4+2) UNRELEASED; urgency=low
 
   * Slovak debconf translation updated (closes: #523448).
 
+  * Don't discuss removal of xserver-xorg in its description. 
+It remains tied to -core at this point. (closes: #523630).
+   
  -- Julien Cristau jcris...@debian.org  Fri, 10 Apr 2009 14:12:51 +0100
 
 xorg (1:7.4+1) unstable; urgency=low
diff --git a/debian/control b

xorg: Changes to 'debian-unstable'

2009-04-11 Thread David Nusinow

 debian/changelog |3 +++
 debian/control   |3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 646b475c440c854da466531e1fab08757e8d939b
Author: David Nusinow dnusi...@debian.org
Date:   Sat Apr 11 15:38:33 2009 -0400

Don't discuss removal of xserver-xorg in its description.

It remains tied to -core at this point. (closes: #523630).

diff --git a/debian/changelog b/debian/changelog
index 9adc908..bc0a3b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ xorg (1:7.4+2) UNRELEASED; urgency=low
 
   * Slovak debconf translation updated (closes: #523448).
 
+  * Don't discuss removal of xserver-xorg in its description. 
+It remains tied to -core at this point. (closes: #523630).
+   
  -- Julien Cristau jcris...@debian.org  Fri, 10 Apr 2009 14:12:51 +0100
 
 xorg (1:7.4+1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 6173623..350ebb1 100644
--- a/debian/control
+++ b/debian/control
@@ -96,8 +96,7 @@ Recommends: libgl1-mesa-dri, udev
 Description: the X.Org X server
  This package depends on the full suite of the server and drivers for the
  X.Org X server, as well as providing a configuration infrastructure to manage
- xorg.conf.  It does not provide the actual server itself, but removing it
- is strongly discouraged.
+ xorg.conf.  It does not provide the actual server itself.
 
 Package: xserver-xorg-video-all
 Architecture: any


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

xserver-xorg-input-synaptics: Changes to 'debian-unstable'

2009-04-11 Thread David Nusinow

 debian/NEWS  |   16 
 debian/changelog |6 ++
 2 files changed, 22 insertions(+)

New commits:
commit 598ae3fe8592f80e97f58a1c54822754dcd5378e
Author: David Nusinow dnusi...@debian.org
Date:   Sat Apr 11 16:34:14 2009 -0400

Add NEWS.Debian entry about enabling tapping again

diff --git a/debian/NEWS b/debian/NEWS
new file mode 100644
index 000..cf20a0c
--- /dev/null
+++ b/debian/NEWS
@@ -0,0 +1,16 @@
+xserver-xorg-input-synaptics (1.1.0-2) unstable; urgency=low
+
+ * Tapping has been disabled by default on many touchpads by upstream. If
+   you want to re-enable it, you can do so explicitly by adding the
+   following to your xorg.conf:
+   
+Section InputDevice
+Identifier synaptics
+Driver synaptics
+Option TouchpadOff 2
+EndSection
+
+   For more details see synaptics(4) and
+   
http://who-t.blogspot.com/2009/04/synaptics-11-and-what-your-touchpad-can.html
+
+ -- David Nusinow dnusi...@debian.org  Sat, 11 Apr 2009 16:23:11 -0400
diff --git a/debian/changelog b/debian/changelog
index b037995..4580195 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-synaptics (1.1.0-2) unreleased; urgency=low
+
+  * Add NEWS.Debian entry about enabling tapping again
+
+ -- David Nusinow dnusi...@debian.org  Sat, 11 Apr 2009 16:32:54 -0400
+
 xserver-xorg-input-synaptics (1.1.0-1) unstable; urgency=low
 
   * New upstream release.


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

xorg: Changes to 'debian-unstable'

2009-04-11 Thread David Nusinow

 debian/xserver-xorg.NEWS |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 93f59e7235e077190533abe9723613537b4fbdc5
Author: David Nusinow dnusi...@debian.org
Date:   Sat Apr 11 16:37:18 2009 -0400

s/UNRELEASED/unstable in xserver-xorg.NEWS

diff --git a/debian/xserver-xorg.NEWS b/debian/xserver-xorg.NEWS
index 01ea8c5..6987bec 100644
--- a/debian/xserver-xorg.NEWS
+++ b/debian/xserver-xorg.NEWS
@@ -1,4 +1,4 @@
-xserver-xorg (1:7.4+1) UNRELEASED; urgency=low
+xserver-xorg (1:7.4+1) unstable; urgency=low
 
   Starting from this version, input devices are no longer configured
   statically in /etc/X11/xorg.conf.  Instead, input devices are detected at


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

Bug#523685: RM: xserver-xorg-video-cyrix -- ROM; abandoned upstream

2009-04-11 Thread David Nusinow

Package: ftp.debian.org
Severity: normal

Hello,

   The xserver-xorg-video-cyrix is abandoned upstream and is considered
dead. Please remove it from the archive for the next release. Thank you!

 - David Nusinow



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

Bug#523683: RM: xserver-xorg-video-imstt -- ROM; abandoned upstream

2009-04-11 Thread David Nusinow

Package: ftp.debian.org
Severity: normal

Hello,

   The xserver-xorg-video-imstt driver is abaonded upstream and is
considered dead. Please remove it from the archive for the next release.
Thank you!

 - David Nusinow



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

1 2 3 4 5 6 7 8 9 10 >

1 - 100 of 2768 matches

Mail list logo