debian/changelog      |   27 +++++++++++++++++++++++++++
 debian/control        |   13 ++++++++-----
 debian/copyright      |    3 +++
 debian/rules          |    2 +-
 debian/xsfbs/xsfbs.mk |   36 ++++++++++++++++++++++--------------
 debian/xsfbs/xsfbs.sh |    7 -------
 6 files changed, 61 insertions(+), 27 deletions(-)

New commits:
commit 213fa498d50020cd91603c2df55b836ed58b0280
Author: Brice Goglin <[EMAIL PROTECTED]>
Date:   Thu Sep 13 21:32:19 2007 +0200

    Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 3ffc123..1d91813 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-xserver-xorg-video-ark (1:0.6.0-7) UNRELEASED; urgency=low
+xserver-xorg-video-ark (1:0.6.0-7) experimental; urgency=low
 
   * Build against xserver 1.4.
   * Add upstream URL to debian/copyright.
+  * Add myself to uploaders, and remove Branden with his permission.
 
- -- Brice Goglin <[EMAIL PROTECTED]>  Thu, 13 Sep 2007 21:29:39 +0200
+ -- Brice Goglin <[EMAIL PROTECTED]>  Thu, 13 Sep 2007 21:30:30 +0200
 
 xserver-xorg-video-ark (1:0.6.0-6) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index a853df4..f528fd4 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-video-ark
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL 
PROTECTED]>
+Uploaders: David Nusinow <[EMAIL PROTECTED]>, Brice Goglin <[EMAIL PROTECTED]>
 Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.4), 
x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, 
x11proto-xext-dev
 Standards-Version: 3.7.2
 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-ark

commit 3192dc8a675981d2442b6d0238fc9a73ffb68866
Author: Brice Goglin <[EMAIL PROTECTED]>
Date:   Thu Sep 13 21:30:25 2007 +0200

    Build against xserver 1.4

diff --git a/debian/changelog b/debian/changelog
index 388dc49..3ffc123 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-ark (1:0.6.0-7) UNRELEASED; urgency=low
+
+  * Build against xserver 1.4.
+  * Add upstream URL to debian/copyright.
+
+ -- Brice Goglin <[EMAIL PROTECTED]>  Thu, 13 Sep 2007 21:29:39 +0200
+
 xserver-xorg-video-ark (1:0.6.0-6) unstable; urgency=low
 
   [ Julien Cristau ]
diff --git a/debian/control b/debian/control
index 3d405aa..a853df4 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
 Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL 
PROTECTED]>
-Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 
2:1.2.99.902), x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, 
x11proto-render-dev, x11proto-xext-dev
+Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.4), 
x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, 
x11proto-xext-dev
 Standards-Version: 3.7.2
 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-ark
 XS-Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-ark.git
diff --git a/debian/copyright b/debian/copyright
index 78acc06..67ee849 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,3 +1,6 @@
+This package was downloaded from
+http://xorg.freedesktop.org/releases/individual/driver/
+
      Copyright 2000  Ani Joshi <[EMAIL PROTECTED]>
 
      XFree86 4.x driver for ARK Logic chipset

commit 575efb7249d7cf194f07e45db17e601d9c259231
Author: Brice Goglin <[EMAIL PROTECTED]>
Date:   Wed Aug 29 09:36:00 2007 +0200

    Do not call laptop-detect, let the only user call it directly

diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 52473ca..a90ff7d 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -59,13 +59,6 @@ fi
 
 ARCHITECTURE="$(dpkg --print-installation-architecture)"
 
-LAPTOP=""
-if [ -n "$(which laptop-detect)" ]; then
-    if laptop-detect >/dev/null; then
-       LAPTOP=true
-    fi
-fi
-
 if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then
   RECONFIGURE="true"
 else

commit 12a633f722a2ff9677728d1e2ae56767f804232a
Author: Brice Goglin <[EMAIL PROTECTED]>
Date:   Thu Jul 12 16:06:22 2007 +0200

    Fix "display the output of quilt push/pop".
    
    Fix commit 16d97b30b91da02d5a3edc2b895cbd4a1995f62d to check the
    return value of quilt, not the one of tee.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 5f13302..bfca7bb 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -147,9 +147,11 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
        fi; \
        if $(QUILT) next >/dev/null 2>&1; then \
          echo -n "Applying patches..."; \
-         if $(QUILT) push -a -v 2>&1 | tee $(STAMP_DIR)/log/patch; then \
+         if $(QUILT) push -a -v >$(STAMP_DIR)/log/patch 2>&1; then \
+           cat $(STAMP_DIR)/log/patch; \
            echo "successful."; \
          else \
+           cat $(STAMP_DIR)/log/patch; \
            echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \
            exit 1; \
          fi; \
@@ -164,9 +166,11 @@ unpatch:
        rm -f $(STAMP_DIR)/patch
        @echo -n "Unapplying patches..."; \
        if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \
-         if $(QUILT) pop -a -v 2>&1 | tee $(STAMP_DIR)/log/unpatch; then \
+         if $(QUILT) pop -a -v >$(STAMP_DIR)/log/unpatch 2>&1; then \
+           cat $(STAMP_DIR)/log/unpatch; \
            echo "successful."; \
          else \
+           cat $(STAMP_DIR)/log/unpatch; \
            echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \
            exit 1; \
          fi; \

commit e29b56820909668b062fdba72458ee9483a4ae44
Author: Brice Goglin <[EMAIL PROTECTED]>
Date:   Mon Jul 9 21:50:47 2007 +0200

    Minor fixes in the patching system.
    
     * Fix debian/rules to not be confused by ~/.quiltrc or QUILT_PATCHES (as 
in #369920).
     * Display which patches are applied and removed instead of just the first 
one (for #428090).

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 2930c1e..5f13302 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -21,6 +21,11 @@
 # Pass $(DH_OPTIONS) into the environment for debhelper's benefit.
 export DH_OPTIONS
 
+# force quilt to not use ~/.quiltrc
+QUILT = quilt --quiltrc /dev/null
+# force QUILT_PATCHES to the default in case it is exported in the environment
+QUILT_PATCHES = patches/
+
 # Set up parameters for the upstream build environment.
 
 # Determine (source) package name from Debian changelog.
@@ -140,9 +145,9 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
                echo "Couldn't find quilt. Please install it or add it to the 
build-depends for this package."; \
                exit 1; \
        fi; \
-       if quilt next >/dev/null 2>&1; then \
+       if $(QUILT) next >/dev/null 2>&1; then \
          echo -n "Applying patches..."; \
-         if quilt push -a -v 2>&1 | tee $(STAMP_DIR)/log/patch; then \
+         if $(QUILT) push -a -v 2>&1 | tee $(STAMP_DIR)/log/patch; then \
            echo "successful."; \
          else \
            echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \
@@ -159,7 +164,7 @@ unpatch:
        rm -f $(STAMP_DIR)/patch
        @echo -n "Unapplying patches..."; \
        if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \
-         if quilt pop -a -v 2>&1 | tee $(STAMP_DIR)/log/unpatch; then \
+         if $(QUILT) pop -a -v 2>&1 | tee $(STAMP_DIR)/log/unpatch; then \
            echo "successful."; \
          else \
            echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \
@@ -295,17 +300,17 @@ patch-audit: prepare unpatch
        @echo -n "Auditing patches..."; \
        >$(STAMP_DIR)/log/patch; \
        FUZZY=; \
-       while [ -n "$$(quilt next)" ]; do \
-         RESULT=$$(quilt push -v | tee -a $(STAMP_DIR)/log/patch | grep ^Hunk 
| sed 's/^Hunk.*\(succeeded\|FAILED\).*/\1/');\
+       while [ -n "$$($(QUILT) next)" ]; do \
+         RESULT=$$($(QUILT) push -v | tee -a $(STAMP_DIR)/log/patch | grep 
^Hunk | sed 's/^Hunk.*\(succeeded\|FAILED\).*/\1/');\
          case "$$RESULT" in \
            succeeded) \
-             echo "fuzzy patch: $$(quilt top)" \
-               | tee -a $(STAMP_DIR)/log/$$(quilt top); \
+             echo "fuzzy patch: $$($(QUILT) top)" \
+               | tee -a $(STAMP_DIR)/log/$$($(QUILT) top); \
              FUZZY=yes; \
              ;; \
            FAILED) \
-             echo "broken patch: $$(quilt next)" \
-               | tee -a $(STAMP_DIR)/log/$$(quilt next); \
+             echo "broken patch: $$($(QUILT) next)" \
+               | tee -a $(STAMP_DIR)/log/$$($(QUILT) next); \
              exit 1; \
              ;; \
          esac; \

commit 16d97b30b91da02d5a3edc2b895cbd4a1995f62d
Author: Brice Goglin <[EMAIL PROTECTED]>
Date:   Mon Jul 9 19:06:05 2007 +0200

    Fix displaying of patches applied by quilt.
    
    As requested in bug #428090, we silence the output of quilt next
    and display the output of quilt push/pop.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 63dde45..2930c1e 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -140,9 +140,9 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
                echo "Couldn't find quilt. Please install it or add it to the 
build-depends for this package."; \
                exit 1; \
        fi; \
-       if quilt next; then \
+       if quilt next >/dev/null 2>&1; then \
          echo -n "Applying patches..."; \
-         if quilt push -a -v >$(STAMP_DIR)/log/patch 2>&1; then \
+         if quilt push -a -v 2>&1 | tee $(STAMP_DIR)/log/patch; then \
            echo "successful."; \
          else \
            echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \
@@ -159,7 +159,7 @@ unpatch:
        rm -f $(STAMP_DIR)/patch
        @echo -n "Unapplying patches..."; \
        if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \
-         if quilt pop -a -v >$(STAMP_DIR)/log/unpatch 2>&1; then \
+         if quilt pop -a -v 2>&1 | tee $(STAMP_DIR)/log/unpatch; then \
            echo "successful."; \
          else \
            echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \

commit fe87d3acd25f99ffbe0d15c9df7de8f602c0a8fd
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Wed May 2 14:13:25 2007 +0200

    Prepare changelog for upload.

diff --git a/debian/changelog b/debian/changelog
index 4197079..388dc49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-ark (1:0.6.0-6) UNRELEASED; urgency=low
+xserver-xorg-video-ark (1:0.6.0-6) unstable; urgency=low
 
   [ Julien Cristau ]
   * Add XS-Vcs-* to debian/control.
@@ -15,7 +15,7 @@ xserver-xorg-video-ark (1:0.6.0-6) UNRELEASED; urgency=low
   [ Timo Aaltonen ]
   * Replaces/Conflicts: xserver-xorg-driver-ark.
 
- -- Timo Aaltonen <[EMAIL PROTECTED]>  Tue, 24 Apr 2007 12:52:17 +0300
+ -- Julien Cristau <[EMAIL PROTECTED]>  Wed, 02 May 2007 14:12:54 +0200
 
 xserver-xorg-video-ark (1:0.6.0-5) experimental; urgency=low
 

commit 6b1ec6d070dd1b28b66b8eae7c255fffe5f014c8
Author: Brice Goglin <[EMAIL PROTECTED]>
Date:   Sat Apr 28 01:32:41 2007 +0200

    Miscellaneous fixed in debian/control and debian/rules.
    
      * Install the upstream changelog.
      * Bump Build-Depends: xserver-xorg-dev to >= 2:1.2.99.902
        (needed to let xsfbs get access to serverminver).

diff --git a/debian/changelog b/debian/changelog
index 4a961ec..4197079 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ xserver-xorg-video-ark (1:0.6.0-6) UNRELEASED; urgency=low
   * Drop obsolete CVS information from the description.
 
   [ Brice Goglin ]
+  * Install the upstream changelog.
+  * Bump Build-Depends: xserver-xorg-dev to >= 2:1.2.99.902
+    (needed to let xsfbs get access to serverminver).
   * Add a link to www.X.org and a reference to the xf86-video-ark
     module in the long description.
 
diff --git a/debian/control b/debian/control
index ca2b3e8..3d405aa 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
 Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL 
PROTECTED]>
-Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.2.0), 
x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, 
x11proto-xext-dev
+Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 
2:1.2.99.902), x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, 
x11proto-render-dev, x11proto-xext-dev
 Standards-Version: 3.7.2
 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-ark
 XS-Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-ark.git
diff --git a/debian/rules b/debian/rules
index 5c9dc36..905520f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -71,7 +71,7 @@ binary-arch: build install serverabi
        dh_testroot
 
        dh_installdocs
-       dh_installchangelogs
+       dh_installchangelogs ChangeLog
        dh_install --sourcedir=debian/tmp --list-missing --exclude=ark_drv.la
        dh_link
        dh_strip

commit 3dd117e634c87d865f53bc2992f99152fed66da6
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date:   Tue Apr 24 12:53:00 2007 +0300

    Replaces/Conflicts: xserver-xorg-driver-ark.

diff --git a/debian/changelog b/debian/changelog
index 2d664b3..4a961ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,10 @@ xserver-xorg-video-ark (1:0.6.0-6) UNRELEASED; urgency=low
   * Add a link to www.X.org and a reference to the xf86-video-ark
     module in the long description.
 
- -- Brice Goglin <[EMAIL PROTECTED]>  Tue, 24 Apr 2007 01:14:26 +0200
+  [ Timo Aaltonen ]
+  * Replaces/Conflicts: xserver-xorg-driver-ark.
+
+ -- Timo Aaltonen <[EMAIL PROTECTED]>  Tue, 24 Apr 2007 12:52:17 +0300
 
 xserver-xorg-video-ark (1:0.6.0-5) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index c61e9e4..ca2b3e8 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,8 @@ Package: xserver-xorg-video-ark
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
 Provides: ${xviddriver:Provides}
-Replaces: xserver-xorg (<< 6.8.2-35)
+Replaces: xserver-xorg (<< 6.8.2-35), xserver-xorg-driver-ark
+Conflicts: xserver-xorg-driver-ark
 Description: X.Org X server -- ark display driver
  This package provides the driver for the ark family
  of chipsets.

commit 37f70658e984cb1d43c38d703e3d73471448dd01
Author: Brice Goglin <[EMAIL PROTECTED]>
Date:   Tue Apr 24 01:15:14 2007 +0200

    Add a link to www.X.org and a reference to the xf86-video-ark module in the 
long description.

diff --git a/debian/changelog b/debian/changelog
index dc86d28..2d664b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,15 @@
 xserver-xorg-video-ark (1:0.6.0-6) UNRELEASED; urgency=low
 
+  [ Julien Cristau ]
   * Add XS-Vcs-* to debian/control.
   * Remove Fabio from Uploaders, with his permission.
   * Drop obsolete CVS information from the description.
 
- -- Julien Cristau <[EMAIL PROTECTED]>  Mon, 23 Apr 2007 05:52:34 +0200
+  [ Brice Goglin ]
+  * Add a link to www.X.org and a reference to the xf86-video-ark
+    module in the long description.
+
+ -- Brice Goglin <[EMAIL PROTECTED]>  Tue, 24 Apr 2007 01:14:26 +0200
 
 xserver-xorg-video-ark (1:0.6.0-5) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index e3e001d..c61e9e4 100644
--- a/debian/control
+++ b/debian/control
@@ -18,5 +18,8 @@ Description: X.Org X server -- ark display driver
  of chipsets.
  .
  More information about X.Org can be found at:
+ <URL:http://www.X.org>
  <URL:http://xorg.freedesktop.org>
  <URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
+ .
+ This package is built from the X.org xf86-video-ark driver module.

commit 2d9cc40dca66578f790e7e0fe5ab118eaa2f0834
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Mon Apr 23 05:54:43 2007 +0200

    debian/control cleanup
    
    - Add XS-Vcs-*
    - Remove Fabio from Uploaders
    - Drop obsolete CVS information

diff --git a/debian/changelog b/debian/changelog
index 4fc97eb..dc86d28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-ark (1:0.6.0-6) UNRELEASED; urgency=low
+
+  * Add XS-Vcs-* to debian/control.
+  * Remove Fabio from Uploaders, with his permission.
+  * Drop obsolete CVS information from the description.
+
+ -- Julien Cristau <[EMAIL PROTECTED]>  Mon, 23 Apr 2007 05:52:34 +0200
+
 xserver-xorg-video-ark (1:0.6.0-5) experimental; urgency=low
 
   * Generate server dependencies automatically from the ABI
diff --git a/debian/control b/debian/control
index 27bdb7b..e3e001d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,11 @@ Source: xserver-xorg-video-ark
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL 
PROTECTED]>, Fabio M. Di Nitto <[EMAIL PROTECTED]>
+Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL 
PROTECTED]>
 Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.2.0), 
x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, 
x11proto-xext-dev
 Standards-Version: 3.7.2
+XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-ark
+XS-Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-ark.git
 
 Package: xserver-xorg-video-ark
 Architecture: any
@@ -18,6 +20,3 @@ Description: X.Org X server -- ark display driver
  More information about X.Org can be found at:
  <URL:http://xorg.freedesktop.org>
  <URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
- .
- This module can be found as the module 'driver/xf86-video-ark' at
- :pserver:[EMAIL PROTECTED]:/cvs/xorg

commit 271778bd6338575afa3e4ae7f614f38cdff8e2fb
Author: Branden Robinson <[EMAIL PROTECTED](none)>
Date:   Thu Apr 12 23:18:32 2007 -0400

    Test for existence of debian/patches directory before creating a symlink to 
it.
    
    This prevents packages that apply no patches from ending up with a broken
    symlink in them.
    
    Remove SVN keyword.
    
    Update copyright notice.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index d88c6db..63dde45 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -1,11 +1,10 @@
 #!/usr/bin/make -f
-# $Id$
 
-# Debian rules file for xorg-x11 source package
+# Debian X Strike Force Build System (XSFBS): Make portion
 
 # Copyright 1996 Stephen Early
 # Copyright 1997 Mark Eichin
-# Copyright 1998-2005 Branden Robinson
+# Copyright 1998-2005, 2007 Branden Robinson
 # Copyright 2005 David Nusinow
 #
 # Licensed under the GNU General Public License, version 2.  See the file
@@ -127,7 +126,7 @@ $(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir
        if [ ! -e $(STAMP_DIR)/log ]; then \
                mkdir $(STAMP_DIR)/log; \
        fi; \
-       if [ ! -e patches ]; then \
+       if [ -e debian/patches ] && [ ! -e patches ]; then \
                ln -s debian/patches patches; \
        fi; \
        >$@

commit 72811b4cede7275a35d36b44bcb5f431a8aa0133
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Fri Mar 2 20:28:15 2007 +0100

    Fix copy/paste typo in the input driver provides.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 0343aec..d88c6db 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -359,7 +359,7 @@ VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 
2>/dev/null)
 INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null)
 SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS))
 VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
-INPDRIVER_PROVIDES = xserver-xorg-video-$(INPUTABI)
+INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI)
 ifeq ($(PACKAGE),)
 PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
 endif


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to