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

2013-09-16 Thread Julien Cristau
 ChangeLog|  173 +++
 debian/changelog |8 +-
 debian/control   |2 
 debian/rules |3 
 4 files changed, 182 insertions(+), 4 deletions(-)

New commits:
commit cd23c3ad7f29cbce2f8e50fd0fa6b6d35363b91e
Author: Julien Cristau jcris...@debian.org
Date:   Mon Sep 16 23:58:19 2013 +0200

Update ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 20c5867..de05faf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,176 @@
+commit 8d63c607ceab903dbe36eccf2315065e6830a47e
+Author: Dave Airlie airl...@redhat.com
+Date:   Tue Jul 17 16:05:09 2012 +1000
+
+xf86-video-ark: bump to version 0.7.5
+
+Signed-off-by: Dave Airlie airl...@redhat.com
+
+commit daf57a350326ff886de77609702944ec939a3495
+Author: Dave Airlie airl...@redhat.com
+Date:   Tue Jul 17 14:51:38 2012 +1000
+
+convert to new X screen conversion api
+
+Signed-off-by: Dave Airlie airl...@redhat.com
+
+commit 8c29d34510d7dfd786660827a09d1d60454ea32a
+Author: Dave Airlie airl...@redhat.com
+Date:   Tue Jul 17 13:59:15 2012 +1000
+
+ark: update for compat X server ABI.
+
+Signed-off-by: Dave Airlie airl...@redhat.com
+
+commit 7f115c9df7431e73b558b18aba7b64a1e253bb0a
+Author: Dave Airlie airl...@redhat.com
+Date:   Tue Jul 17 13:53:00 2012 +1000
+
+ark: make build against XAA-less server.
+
+Signed-off-by: Dave Airlie airl...@redhat.com
+
+commit da0262acee5ea37ea8c69ebadbf5e9e34d83b5f3
+Author: Matt Turner matts...@gmail.com
+Date:   Thu Feb 16 18:39:50 2012 -0500
+
+Don't check for unneeded proto headers.
+
+Signed-off-by: Matt Turner matts...@gmail.com
+
+commit e7baf1df0bbc45e1cd697f5df959586ab27103f9
+Author: Matt Turner matts...@gmail.com
+Date:   Thu Jan 26 18:04:34 2012 -0500
+
+xf86-video-ark 0.7.4
+
+Signed-off-by: Matt Turner matts...@gmail.com
+
+commit c2667fb882429f9393b0700a2befe6dde4523f02
+Author: Matt Turner matts...@gmail.com
+Date:   Thu Jan 26 18:03:16 2012 -0500
+
+Change types of FBBase/MMIOBase to pointer, remove casts
+
+Signed-off-by: Matt Turner matts...@gmail.com
+
+commit 99ed41779e28bace7c3321a6d05e6436d4784c48
+Author: Matt Turner matts...@gmail.com
+Date:   Thu Jan 26 17:57:42 2012 -0500
+
+Use pci_device_map_legacy rather than xf86MapDomainMemory
+
+Signed-off-by: Matt Turner matts...@gmail.com
+
+commit 5634e78e42d14ab2325854093a42536844cae07f
+Author: Matt Turner matts...@gmail.com
+Date:   Thu Jan 26 17:44:36 2012 -0500
+
+Fix typo in 5ab0bf04
+
+Signed-off-by: Matt Turner matts...@gmail.com
+
+commit c043cc44316f655c9f267bd20d1ea3e3e2b2da91
+Author: Matt Turner matts...@gmail.com
+Date:   Thu Jan 26 17:32:12 2012 -0500
+
+Use unsigned long rather than deprecated IOADDRESS
+
+Signed-off-by: Matt Turner matts...@gmail.com
+
+commit 1cac2174beb340f9a8b868818a5261b80435d3eb
+Author: Matt Turner matts...@gmail.com
+Date:   Thu Jan 26 17:31:26 2012 -0500
+
+Remove uses of xf86PciInfo.h
+
+Signed-off-by: Matt Turner matts...@gmail.com
+
+commit bd0aa75692cc421bfeada64239fc381c40bc2ec9
+Author: Matt Turner matts...@gmail.com
+Date:   Thu Jan 26 17:19:36 2012 -0500
+
+Add component=Driver/ark to Bugzilla link
+
+Signed-off-by: Matt Turner matts...@gmail.com
+
+commit 97a1aa4b460e6ffda16704954012063c094d770b
+Author: Matt Turner matts...@gmail.com
+Date:   Mon Sep 26 22:48:08 2011 -0400
+
+Remove if(E != NULL) checks around free(E)
+
+Signed-off-by: Matt Turner matts...@gmail.com
+
+commit 70321db733c380a3b5f2198d733d75916f54c10b
+Author: Matt Turner matts...@gmail.com
+Date:   Mon Sep 26 22:46:51 2011 -0400
+
+Remove xalloc/xcalloc/xrealloc/xfree
+
+Signed-off-by: Matt Turner matts...@gmail.com
+
+commit 5ab0bf04c400f3d7d97c931b5d9e1f0318cc6f59
+Author: Adam Jackson a...@redhat.com
+Date:   Mon Dec 19 17:44:49 2011 -0500
+
+Fix for new vgaHW ABI
+
+Signed-off-by: Adam Jackson a...@redhat.com
+
+commit 075a675e424cc2fbf7ab65e086b111ecfca7105f
+Author: Adam Jackson a...@redhat.com
+Date:   Mon Dec 19 16:11:53 2011 -0500
+
+Make failure to XAA non-fatal
+
+No shadowfb support in this driver yet.
+
+Signed-off-by: Adam Jackson a...@redhat.com
+
+commit d9492762b862aa02392a011ed70e38e77e33ee40
+Author: Adam Jackson a...@redhat.com
+Date:   Thu Nov 17 16:22:16 2011 -0500
+
+Adapt to videoabi 12
+
+Signed-off-by: Adam Jackson a...@redhat.com
+
+commit 9d3769bed020e9796e51411c63de337da5073bb4
+Author: Ondrej Zary li...@rainbow-software.org
+Date:   Fri Dec 3 19:23:51 2010 -0500
+
+Don't assume that FB address registers are initialized properly
+
+https://bugs.freedesktop.org/show_bug.cgi?id=28249
+
+ark driver does not work with Hercules Stingray 64 card (ark2000pv).
+X fails to start with:
+
+[...]
+(II) ark(0): vgaHWGetIOBase: hwp-IOBase is 0x03d0, hwp-PIOOffset is
+0x
+(II) ark(0): Creating default Display 

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

2013-07-28 Thread Michele Cane
 ChangeLog|  141 ---
 configure.ac |   19 +++
 debian/changelog |   12 
 debian/control   |4 -
 src/Makefile.am  |1 
 src/ark.h|7 ++
 src/ark_accel.c  |   12 ++--
 src/ark_driver.c |   60 +++
 src/compat-api.h |   99 ++
 9 files changed, 174 insertions(+), 181 deletions(-)

New commits:
commit 57bcb9ae17f642d80558d62789d39bd4300893d2
Author: Michele Cane michele.c...@gmail.com
Date:   Fri Jul 26 19:35:37 2013 +0200

Build against Xserver 1.14.

diff --git a/debian/changelog b/debian/changelog
index 058c588..be5112a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ xserver-xorg-video-ark (1:0.7.5-1) UNRELEASED; urgency=low
 
   [ Michele Cane ]
   * Bump Standards-Version to 3.9.4, no changes needed.
+  * Build against Xserver 1.14.
 
  -- Maarten Lankhorst maarten.lankho...@canonical.com  Wed, 18 Jul 2012 
15:51:26 +0200
 
diff --git a/debian/control b/debian/control
index 9299cbe..decf147 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
  dh-autoreconf,
  quilt,
  pkg-config,
- xserver-xorg-dev (= 2:1.9.4),
+ xserver-xorg-dev (= 2:1.14),
  x11proto-core-dev,
  x11proto-fonts-dev,
  x11proto-xext-dev,

commit 12f4e025f1b481977e2978300e79beaaaf4ca81d
Author: Michele Cane michele.c...@gmail.com
Date:   Fri Jul 26 19:32:37 2013 +0200

Bump Standards-Version to 3.9.4, no changes needed.

diff --git a/debian/changelog b/debian/changelog
index dbd4316..058c588 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 xserver-xorg-video-ark (1:0.7.5-1) UNRELEASED; urgency=low
 
+  [ Maarten Lankhorst ]
   * New upstream release.
   * Bump Standards-Version to 3.9.3 (no changes needed)
 
+  [ Michele Cane ]
+  * Bump Standards-Version to 3.9.4, no changes needed.
+
  -- Maarten Lankhorst maarten.lankho...@canonical.com  Wed, 18 Jul 2012 
15:51:26 +0200
 
 xserver-xorg-video-ark (1:0.7.4-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index fc5d34e..9299cbe 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends:
  x11proto-xext-dev,
  xutils-dev (= 1:7.5+4),
  libpciaccess-dev (= 0.12.901),
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-ark
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-ark.git
 

commit 13c0ee016ade090b1b127ac9cfff522484718218
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jul 18 15:52:41 2012 +0200

Bump Standards-Version to 3.9.3 (no changes needed)

diff --git a/debian/changelog b/debian/changelog
index 34d8b0a..dbd4316 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xserver-xorg-video-ark (1:0.7.5-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Bump Standards-Version to 3.9.3 (no changes needed)
 
  -- Maarten Lankhorst maarten.lankho...@canonical.com  Wed, 18 Jul 2012 
15:51:26 +0200
 
diff --git a/debian/control b/debian/control
index bd366a8..fc5d34e 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends:
  x11proto-xext-dev,
  xutils-dev (= 1:7.5+4),
  libpciaccess-dev (= 0.12.901),
-Standards-Version: 3.9.1
+Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-ark
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-ark.git
 

commit 593c3750a34d2a7ccc4e3bfb356dcb652b0b706b
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jul 18 15:51:49 2012 +0200

New upstream release.

diff --git a/debian/changelog b/debian/changelog
index 9e9fdd9..34d8b0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-ark (1:0.7.5-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Maarten Lankhorst maarten.lankho...@canonical.com  Wed, 18 Jul 2012 
15:51:26 +0200
+
 xserver-xorg-video-ark (1:0.7.4-1) unstable; urgency=low
 
   * New upstream release.

commit 79eba4c6279d24f79d3210b2d2adc64a2abc8d19
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Wed Jul 18 15:51:19 2012 +0200

Bump changelog

diff --git a/ChangeLog b/ChangeLog
index 4b677a2..20c5867 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,144 +1,3 @@
-commit da0262acee5ea37ea8c69ebadbf5e9e34d83b5f3
-Author: Matt Turner matts...@gmail.com
-Date:   Thu Feb 16 18:39:50 2012 -0500
-
-Don't check for unneeded proto headers.
-
-Signed-off-by: Matt Turner matts...@gmail.com
-
-commit e7baf1df0bbc45e1cd697f5df959586ab27103f9
-Author: Matt Turner matts...@gmail.com
-Date:   Thu Jan 26 18:04:34 2012 -0500
-
-xf86-video-ark 0.7.4
-
-Signed-off-by: Matt Turner matts...@gmail.com
-
-commit c2667fb882429f9393b0700a2befe6dde4523f02
-Author: Matt Turner matts...@gmail.com
-Date:   Thu Jan 26 18:03:16 2012 -0500
-
-Change types of 

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

2012-03-19 Thread Cyril Brulebois
 ChangeLog|  141 +++
 configure.ac |8 +--
 debian/changelog |   13 +
 debian/control   |5 -
 src/ark.h|   12 +++-
 src/ark_accel.c  |6 +-
 src/ark_driver.c |  108 --
 7 files changed, 233 insertions(+), 60 deletions(-)

New commits:
commit 00495b90e2ee5c18fd3834dea60fa50a8eac0af9
Author: Cyril Brulebois k...@debian.org
Date:   Mon Mar 19 21:23:30 2012 +

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index ee053f2..9e9fdd9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-ark (1:0.7.4-1) UNRELEASED; urgency=low
+xserver-xorg-video-ark (1:0.7.4-1) unstable; urgency=low
 
   * New upstream release.
   * Actually merge upstream master up to da0262acee (one extra commit) to
@@ -9,7 +9,7 @@ xserver-xorg-video-ark (1:0.7.4-1) UNRELEASED; urgency=low
   * Add explicit build-dep on libpciaccess-dev, which is pulled by
 xserver-xorg-dev, just to make sure.
 
- -- Cyril Brulebois k...@debian.org  Mon, 19 Mar 2012 21:16:38 +
+ -- Cyril Brulebois k...@debian.org  Mon, 19 Mar 2012 21:23:25 +
 
 xserver-xorg-video-ark (1:0.7.3-2) unstable; urgency=low
 

commit 9c6f1732ccc85a27e79146c1f1bd62c7505a5eb8
Author: Cyril Brulebois k...@debian.org
Date:   Mon Mar 19 22:23:22 2012 +0100

Add explicit build-dep on libpciaccess-dev, which is pulled by 
xserver-xorg-dev, just to make sure.

diff --git a/debian/changelog b/debian/changelog
index 33df645..ee053f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ xserver-xorg-video-ark (1:0.7.4-1) UNRELEASED; urgency=low
 build-deps.
   * Drop x11proto-randr-dev and x11proto-render-dev build-deps
 accordingly.
+  * Add explicit build-dep on libpciaccess-dev, which is pulled by
+xserver-xorg-dev, just to make sure.
 
  -- Cyril Brulebois k...@debian.org  Mon, 19 Mar 2012 21:16:38 +
 
diff --git a/debian/control b/debian/control
index 8f43a71..bd366a8 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,8 @@ Build-Depends:
  x11proto-core-dev,
  x11proto-fonts-dev,
  x11proto-xext-dev,
- xutils-dev (= 1:7.5+4)
+ xutils-dev (= 1:7.5+4),
+ libpciaccess-dev (= 0.12.901),
 Standards-Version: 3.9.1
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-ark
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-ark.git

commit 45725e58ecd2aae17398ab5225af1f1c41916232
Author: Cyril Brulebois k...@debian.org
Date:   Mon Mar 19 21:21:18 2012 +

Drop x11proto-randr-dev and x11proto-render-dev build-deps accordingly.

diff --git a/debian/changelog b/debian/changelog
index 7595be1..33df645 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ xserver-xorg-video-ark (1:0.7.4-1) UNRELEASED; urgency=low
   * Actually merge upstream master up to da0262acee (one extra commit) to
 get rid of unneeded checks in configure.ac, letting us drop unneeded
 build-deps.
+  * Drop x11proto-randr-dev and x11proto-render-dev build-deps
+accordingly.
 
  -- Cyril Brulebois k...@debian.org  Mon, 19 Mar 2012 21:16:38 +
 
diff --git a/debian/control b/debian/control
index d9b5bec..8f43a71 100644
--- a/debian/control
+++ b/debian/control
@@ -11,8 +11,6 @@ Build-Depends:
  xserver-xorg-dev (= 2:1.9.4),
  x11proto-core-dev,
  x11proto-fonts-dev,
- x11proto-randr-dev,
- x11proto-render-dev,
  x11proto-xext-dev,
  xutils-dev (= 1:7.5+4)
 Standards-Version: 3.9.1

commit 7549d7357cc43eb2697dcda57dcf6acc79f46b0c
Author: Cyril Brulebois k...@debian.org
Date:   Mon Mar 19 21:18:53 2012 +

Bump changelogs.

diff --git a/ChangeLog b/ChangeLog
index 20c5867..4b677a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,144 @@
+commit da0262acee5ea37ea8c69ebadbf5e9e34d83b5f3
+Author: Matt Turner matts...@gmail.com
+Date:   Thu Feb 16 18:39:50 2012 -0500
+
+Don't check for unneeded proto headers.
+
+Signed-off-by: Matt Turner matts...@gmail.com
+
+commit e7baf1df0bbc45e1cd697f5df959586ab27103f9
+Author: Matt Turner matts...@gmail.com
+Date:   Thu Jan 26 18:04:34 2012 -0500
+
+xf86-video-ark 0.7.4
+
+Signed-off-by: Matt Turner matts...@gmail.com
+
+commit c2667fb882429f9393b0700a2befe6dde4523f02
+Author: Matt Turner matts...@gmail.com
+Date:   Thu Jan 26 18:03:16 2012 -0500
+
+Change types of FBBase/MMIOBase to pointer, remove casts
+
+Signed-off-by: Matt Turner matts...@gmail.com
+
+commit 99ed41779e28bace7c3321a6d05e6436d4784c48
+Author: Matt Turner matts...@gmail.com
+Date:   Thu Jan 26 17:57:42 2012 -0500
+
+Use pci_device_map_legacy rather than xf86MapDomainMemory
+
+Signed-off-by: Matt Turner matts...@gmail.com
+
+commit 5634e78e42d14ab2325854093a42536844cae07f
+Author: Matt Turner matts...@gmail.com
+Date:   Thu Jan 26 17:44:36 2012 -0500
+
+Fix typo in 5ab0bf04
+
+Signed-off-by: Matt Turner matts...@gmail.com
+
+commit 

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

2011-02-05 Thread Cyril Brulebois
 .gitignore |   70 +
 COPYING|   26 +-
 ChangeLog  |  233 ++
 Makefile.am|   11 
 configure.ac   |   50 +--
 debian/README.source   |   24 -
 debian/changelog   |   30 ++
 debian/compat  |2 
 debian/control |   25 +
 debian/patches/series  |1 
 debian/rules   |  103 
 debian/xsfbs/repack.sh |   32 --
 debian/xsfbs/xsfbs.mk  |  285 --
 debian/xsfbs/xsfbs.sh  |  622 -
 src/.gitignore |6 
 src/Makefile.am|3 
 16 files changed, 405 insertions(+), 1118 deletions(-)

New commits:
commit 30cff508b0267f133d8ecb5defa18622e0654ba3
Author: Cyril Brulebois k...@debian.org
Date:   Sat Feb 5 14:42:12 2011 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 9604e2e..906e7cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-ark (1:0.7.3-2) UNRELEASED; urgency=low
+xserver-xorg-video-ark (1:0.7.3-2) unstable; urgency=low
 
   * Switch to dh:
 - Use debhelper 8.
@@ -12,7 +12,7 @@ xserver-xorg-video-ark (1:0.7.3-2) UNRELEASED; urgency=low
   * Bump Standards-Version to 3.9.1 (no changes needed).
   * Add quilt build-dep for future use.
 
- -- Cyril Brulebois k...@debian.org  Thu, 03 Feb 2011 11:00:15 +0100
+ -- Cyril Brulebois k...@debian.org  Sat, 05 Feb 2011 14:42:12 +0100
 
 xserver-xorg-video-ark (1:0.7.3-1) experimental; urgency=low
 

commit 55ed80e726360631b12b83bfb53659674a98e1df
Author: Cyril Brulebois k...@debian.org
Date:   Sat Feb 5 09:32:07 2011 +0100

Add a placeholding series file.

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000..fdffa2a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+# placeholder

commit 0355a58ed2063d410a9d4f3db4ea7885ec711bcc
Author: Cyril Brulebois k...@debian.org
Date:   Fri Feb 4 11:42:11 2011 +0100

Fix sequence ordering.

Since both the autoreconf and quilt sequences insert a command before
dh_auto_configure, it is important that we use the quilt one in the first
place, so that autoreconf is run on a patched tree. Ditto for dh_clean.

diff --git a/debian/rules b/debian/rules
index 63d3106..3d192dc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,4 +14,4 @@ override_dh_shlibdeps:
dh_shlibdeps -- --warnings=6
 
 %:
-   dh $@ --with autoreconf,quilt,xsf --builddirectory=build/
+   dh $@ --with quilt,autoreconf,xsf --builddirectory=build/

commit 36be7c88c85ec624ebfe34f13e1e6ea2bbf62ccd
Author: Cyril Brulebois k...@debian.org
Date:   Fri Feb 4 11:42:10 2011 +0100

Add quilt build-dep for future use.

diff --git a/debian/changelog b/debian/changelog
index eaa007a..9604e2e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ xserver-xorg-video-ark (1:0.7.3-2) UNRELEASED; urgency=low
   * Update Uploaders list. Thanks, David  Brice!
   * Wrap Depends/Provides.
   * Bump Standards-Version to 3.9.1 (no changes needed).
+  * Add quilt build-dep for future use.
 
  -- Cyril Brulebois k...@debian.org  Thu, 03 Feb 2011 11:00:15 +0100
 
diff --git a/debian/control b/debian/control
index 663694c..d9b5bec 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Uploaders: Cyril Brulebois k...@debian.org
 Build-Depends:
  debhelper (= 8),
  dh-autoreconf,
+ quilt,
  pkg-config,
  xserver-xorg-dev (= 2:1.9.4),
  x11proto-core-dev,

commit 807dc59754c6126ae3f79192d166c115c8219295
Author: Cyril Brulebois k...@debian.org
Date:   Thu Feb 3 11:19:26 2011 +0100

Remove xsfbs accordingly.

diff --git a/debian/README.source b/debian/README.source
index b09a1ab..4ecd5e6 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -47,27 +47,3 @@ are involved:
   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.

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

2010-05-07 Thread Mikhail Gusarov
 debian/control |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 86c510538d6ea769a234e15c13c013513a8864e2
Author: Mikhail Gusarov dotted...@debian.org
Date:   Fri May 7 18:58:57 2010 +0700

Remove duplicate xorg.fd.o URL and confusing mailing list URL from 
debian/control

diff --git a/debian/control b/debian/control
index 339f752..fe65ea6 100644
--- a/debian/control
+++ b/debian/control
@@ -32,7 +32,5 @@ Description: X.Org X server -- ark display driver
  .
  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.


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1oamnu-0007z5...@alioth.debian.org



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

2010-05-03 Thread Cyril Brulebois
 debian/README.source  |2 +-
 debian/changelog  |   12 ++--
 debian/control|8 
 debian/xsfbs/xsfbs.mk |   35 ++-
 4 files changed, 37 insertions(+), 20 deletions(-)

New commits:
commit fd552a249940a7703eb062a9faa49ec30d2b0479
Author: Cyril Brulebois k...@debian.org
Date:   Mon May 3 22:48:01 2010 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index ff443f3..8d87e14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-ark (1:0.7.2-2) UNRELEASED; urgency=low
+xserver-xorg-video-ark (1:0.7.2-2) unstable; urgency=low
 
   [ Julien Cristau ]
   * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
@@ -12,7 +12,7 @@ xserver-xorg-video-ark (1:0.7.2-2) UNRELEASED; urgency=low
   * Add myself to Uploaders.
   * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
 
- -- Julien Cristau jcris...@debian.org  Sat, 23 Jan 2010 02:18:25 +0100
+ -- Cyril Brulebois k...@debian.org  Mon, 03 May 2010 22:47:56 +0200
 
 xserver-xorg-video-ark (1:0.7.2-1) experimental; urgency=low
 

commit 6fcfdadb31ea7b1281008354a5a8a421d341cf6a
Author: Cyril Brulebois k...@debian.org
Date:   Mon May 3 22:45:52 2010 +0200

Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).

diff --git a/debian/changelog b/debian/changelog
index 6db4cc0..ff443f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ xserver-xorg-video-ark (1:0.7.2-2) UNRELEASED; urgency=low
 ${xviddriver:Depends} in Depends, and bump B-D on xserver-xorg-dev
 accordingly.
   * Add myself to Uploaders.
+  * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
 
  -- Julien Cristau jcris...@debian.org  Sat, 23 Jan 2010 02:18:25 +0100
 
diff --git a/debian/control b/debian/control
index 1a89bd9..339f752 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends:
  automake,
  libtool,
  xutils-dev
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-ark
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-ark.git
 

commit 858ac6e301d76cdc7eda76f8481d3ffbcf4bdc0d
Author: Cyril Brulebois k...@debian.org
Date:   Mon May 3 22:42:14 2010 +0200

Add myself to Uploaders.

diff --git a/debian/changelog b/debian/changelog
index 90c8956..6db4cc0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ xserver-xorg-video-ark (1:0.7.2-2) UNRELEASED; urgency=low
   * Update to new xsfbs, replace deprecated ${xserver:Depends} with
 ${xviddriver:Depends} in Depends, and bump B-D on xserver-xorg-dev
 accordingly.
+  * Add myself to Uploaders.
 
  -- Julien Cristau jcris...@debian.org  Sat, 23 Jan 2010 02:18:25 +0100
 
diff --git a/debian/control b/debian/control
index 3d38526..1a89bd9 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 dnusi...@debian.org, Brice Goglin 
bgog...@debian.org
+Uploaders: David Nusinow dnusi...@debian.org, Brice Goglin 
bgog...@debian.org, Cyril Brulebois k...@debian.org
 Build-Depends:
  debhelper (= 5),
  pkg-config,

commit 13c02332eb268d503d9c77cb05551429e269f638
Author: Cyril Brulebois k...@debian.org
Date:   Mon May 3 22:39:17 2010 +0200

Update to new xsfbs, replace deprecated ${xserver:Depends} with 
${xviddriver:Depends} in Depends, and bump B-D on xserver-xorg-dev accordingly.

diff --git a/debian/changelog b/debian/changelog
index 8732a98..90c8956 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,15 @@
 xserver-xorg-video-ark (1:0.7.2-2) UNRELEASED; urgency=low
 
+  [ Julien Cristau ]
   * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
 good reason.  Thanks, Colin Watson!
   * Remove myself from Uploaders
 
+  [ Cyril Brulebois ]
+  * Update to new xsfbs, replace deprecated ${xserver:Depends} with
+${xviddriver:Depends} in Depends, and bump B-D on xserver-xorg-dev
+accordingly.
+
  -- Julien Cristau jcris...@debian.org  Sat, 23 Jan 2010 02:18:25 +0100
 
 xserver-xorg-video-ark (1:0.7.2-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 6ba7b18..3d38526 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow dnusi...@debian.org, Brice Goglin 
bgog...@debian.org
 Build-Depends:
  debhelper (= 5),
  pkg-config,
- xserver-xorg-dev (= 2:1.7),
+ xserver-xorg-dev (= 2:1.7.6.901),
  x11proto-core-dev,
  x11proto-fonts-dev,
  x11proto-randr-dev,
@@ -22,7 +22,7 @@ Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-ark.git
 
 Package: xserver-xorg-video-ark
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xviddriver:Depends}
 Provides: 

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

2010-01-22 Thread Julien Cristau
 debian/changelog |   17 -
 debian/control   |2 +-
 2 files changed, 13 insertions(+), 6 deletions(-)

New commits:
commit 51ed1e425d17681f19169a6580ce549a044e8f7d
Author: Julien Cristau jcris...@debian.org
Date:   Sat Jan 23 01:46:34 2010 +0100

Remove myself from Uploaders

diff --git a/debian/changelog b/debian/changelog
index 0845b51..6f8d69e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ xserver-xorg-video-ark (1:0.7.2-1) UNRELEASED; urgency=low
   [ Julien Cristau ]
   * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
 good reason.  Thanks, Colin Watson!
+  * Remove myself from Uploaders
 
  -- Timo Aaltonen tjaal...@ubuntu.com  Sat, 05 Dec 2009 01:49:05 +0200
 
diff --git a/debian/control b/debian/control
index 7319018..6ba7b18 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 dnusi...@debian.org, Brice Goglin 
bgog...@debian.org, Julien Cristau jcris...@debian.org
+Uploaders: David Nusinow dnusi...@debian.org, Brice Goglin 
bgog...@debian.org
 Build-Depends:
  debhelper (= 5),
  pkg-config,

commit 815843fc3e3f3b91fa3d12695958143fe9ba1e5c
Author: Cyril Brulebois k...@debian.org
Date:   Sun Dec 6 03:32:56 2009 +0100

Upload to experimental.

diff --git a/debian/changelog b/debian/changelog
index 5961f41..81988a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-ark (1:0.7.2-1) UNRELEASED; urgency=low
+xserver-xorg-video-ark (1:0.7.2-1) experimental; urgency=low
 
   [ David Nusinow ]
   * Remove 01_gen_pci_ids.diff. The X server now uses a built-in table to
@@ -10,7 +10,10 @@ xserver-xorg-video-ark (1:0.7.2-1) UNRELEASED; urgency=low
   * Bump Standards-Version to 3.8.3.
   * Build against Xserver 1.7.
 
- -- Timo Aaltonen tjaal...@ubuntu.com  Sat, 05 Dec 2009 01:49:05 +0200
+  [ Cyril Brulebois ]
+  * Upload to experimental.
+
+ -- Cyril Brulebois k...@debian.org  Sun, 06 Dec 2009 03:32:41 +0100
 
 xserver-xorg-video-ark (1:0.7.1-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-ark: Changes to 'debian-unstable'

2010-01-16 Thread Julien Cristau
 debian/changelog |4 
 debian/rules |   10 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 3a1f763ef58aace5c2d996924f7a5bd52d46738b
Author: Julien Cristau jcris...@debian.org
Date:   Sat Jan 16 16:48:47 2010 +

Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good 
reason.  Thanks, Colin Watson!

diff --git a/debian/changelog b/debian/changelog
index 5961f41..0845b51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,10 @@ xserver-xorg-video-ark (1:0.7.2-1) UNRELEASED; urgency=low
   * Bump Standards-Version to 3.8.3.
   * Build against Xserver 1.7.
 
+  [ Julien Cristau ]
+  * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
+good reason.  Thanks, Colin Watson!
+
  -- Timo Aaltonen tjaal...@ubuntu.com  Sat, 05 Dec 2009 01:49:05 +0200
 
 xserver-xorg-video-ark (1:0.7.1-2) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 393cc91..fc543e6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,12 +40,12 @@ build: build-stamp
 build-stamp: configure
dh_testdir
 
-   mkdir -p obj-$(DEB_BUILD_GNU_TYPE)
-   cd obj-$(DEB_BUILD_GNU_TYPE)  \
+   mkdir -p build
+   cd build  \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
 --infodir=\$${prefix}/share/info $(confflags) \
 CFLAGS=$(CFLAGS) 
-   cd obj-$(DEB_BUILD_GNU_TYPE)  $(MAKE)
+   cd build  $(MAKE)
$@
 
 clean: 
@@ -57,7 +57,7 @@ clean:
rm -f */config.cache */config.log */config.status
rm -f conftest* */conftest*
rm -rf autom4te.cache */autom4te.cache
-   rm -rf obj-*
+   rm -rf build
rm -f aclocal.m4 config.guess config.sub config.h.in configure
rm -f depcomp install-sh ltmain.sh missing mkinstalldirs
rm -f $$(find -name Makefile.in)
@@ -70,7 +70,7 @@ install: build
dh_clean -k
dh_installdirs
 
-   cd obj-$(DEB_BUILD_GNU_TYPE)  $(MAKE) DESTDIR=$(CURDIR)/debian/tmp 
install
+   cd build  $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
 
 # Build architecture-dependent files here.
 binary-arch: build install serverabi


-- 
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-12-04 Thread Timo Aaltonen
 debian/changelog |3 ++-
 debian/control   |2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 108a151014421a97c0dc2deac368090d79e7f7cd
Author: Timo Aaltonen tjaal...@cc.hut.fi
Date:   Sat Dec 5 02:09:25 2009 +0200

Build against Xserver 1.7.

diff --git a/debian/changelog b/debian/changelog
index 7b45e94..5961f41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,9 @@ xserver-xorg-video-ark (1:0.7.2-1) UNRELEASED; urgency=low
   [ Timo Aaltonen ]
   * New upstream release.
   * Bump Standards-Version to 3.8.3.
+  * Build against Xserver 1.7.
 
- -- Timo Aaltonen tjaal...@ubuntu.com  Mon, 30 Nov 2009 15:59:01 +0200
+ -- Timo Aaltonen tjaal...@ubuntu.com  Sat, 05 Dec 2009 01:49:05 +0200
 
 xserver-xorg-video-ark (1:0.7.1-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 594effd..7319018 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow dnusi...@debian.org, Brice Goglin 
bgog...@debian.org
 Build-Depends:
  debhelper (= 5),
  pkg-config,
- xserver-xorg-dev (= 2:1.5.99.901),
+ xserver-xorg-dev (= 2:1.7),
  x11proto-core-dev,
  x11proto-fonts-dev,
  x11proto-randr-dev,


-- 
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-11-30 Thread Timo Aaltonen
 ChangeLog |   36 +++
 README|   20 
 configure.ac  |2 
 debian/README.source  |   73 ++
 debian/changelog  |9 +
 debian/control|2 
 debian/xsfbs/xsfbs.mk |   21 
 debian/xsfbs/xsfbs.sh |  245 --
 src/ark_driver.c  |   55 +--
 9 files changed, 149 insertions(+), 314 deletions(-)

New commits:
commit 848087c51b264fb20fb879dbf0492eb5ab3b
Author: Timo Aaltonen tjaal...@cc.hut.fi
Date:   Mon Nov 30 15:59:54 2009 +0200

Bump Standards-Version to 3.8.3.

diff --git a/debian/changelog b/debian/changelog
index 06a3f4d..7b45e94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xserver-xorg-video-ark (1:0.7.2-1) UNRELEASED; urgency=low
 
   [ Timo Aaltonen ]
   * New upstream release.
+  * Bump Standards-Version to 3.8.3.
 
  -- Timo Aaltonen tjaal...@ubuntu.com  Mon, 30 Nov 2009 15:59:01 +0200
 
diff --git a/debian/control b/debian/control
index 2ecdd92..594effd 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends:
  automake,
  libtool,
  xutils-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-ark
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-ark.git
 

commit 6d3d76414dc6764c935656f1fbdc26011dae77f5
Author: Timo Aaltonen tjaal...@cc.hut.fi
Date:   Mon Nov 30 15:59:24 2009 +0200

Update the changelogs.

diff --git a/ChangeLog b/ChangeLog
index 4442211..66892fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,39 @@
+commit 9d2a2c6b8de41c39f59602e04aac68644dadf45e
+Author: Dave Airlie airl...@redhat.com
+Date:   Mon Sep 7 14:47:47 2009 +1000
+
+ark: fix make distcheck
+
+commit 93856287f1e753d7df0ebfc51b12b425447138cf
+Author: Dave Airlie airl...@redhat.com
+Date:   Mon Sep 7 14:44:22 2009 +1000
+
+bump release to 0.7.2
+
+commit e521e8240c1acc49a514db123cb67beb669dea81
+Author: Dave Airlie airl...@redhat.com
+Date:   Tue Jul 28 13:32:28 2009 +1000
+
+ark: update for resources/RAC API removal
+
+commit 150d86dd0fff038db660f993d080cc3f7a09f6c5
+Author: Dave Airlie airl...@redhat.com
+Date:   Tue Jul 28 10:03:50 2009 +1000
+
+ark: switch to using pci config instead of active
+
+commit 05ce888200307d9c6f16fbdbf732cbae8b5a3dae
+Author: Adam Jackson a...@redhat.com
+Date:   Thu May 28 14:46:19 2009 -0400
+
+Remove useless loader symbol lists.
+
+commit 9acf6f68c98159ea5bb2d2945ed143e7d6f2
+Author: Alan Coopersmith alan.coopersm...@sun.com
+Date:   Fri Jan 30 20:30:48 2009 -0800
+
+Add README with pointers to mailing list, bugzilla  git repos
+
 commit e686088ac1c4517184bbd676ec16c9bf5d010469
 Author: Dave Airlie airl...@redhat.com
 Date:   Mon Dec 22 15:24:57 2008 +1000
diff --git a/debian/changelog b/debian/changelog
index 6bbcab5..06a3f4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
-xserver-xorg-video-ark (1:0.7.1-3) UNRELEASED; urgency=low
+xserver-xorg-video-ark (1:0.7.2-1) UNRELEASED; urgency=low
 
+  [ David Nusinow ]
   * 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
+  [ Timo Aaltonen ]
+  * New upstream release.
+
+ -- Timo Aaltonen tjaal...@ubuntu.com  Mon, 30 Nov 2009 15:59:01 +0200
 
 xserver-xorg-video-ark (1:0.7.1-2) unstable; urgency=low
 

commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau jcris...@debian.org
Date:   Fri Sep 25 16:39:23 2009 +0200

xsfbs.mk: remove more obsolete code

We can use plain debconf-updatepo, and don't need to clean the 'imports'
directory or shlibs.local.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 82eb45f..5e16b10 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -177,19 +177,7 @@ xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
rm -rf $(STAMP_DIR)
-   rm -rf imports
-   dh_clean debian/shlibs.local \
-debian/po/pothead
-
-# Generate the debconf templates POT file header.
-debian/po/pothead: debian/po/pothead.in
-   sed -e 's/SOURCE_VERSION/$(SOURCE_VERSION)/' \
- -e 's/DATE/$(shell date +%F %X%z/)' $ $@
-
-# Update POT and PO files.
-.PHONY: updatepo
-updatepo: debian/po/pothead
-   debian/scripts/debconf-updatepo --pot-header=pothead --verbose
+   dh_clean
 
 # Remove files from the upstream source tree that we don't need, or which have
 # licensing problems.  It must be run before creating the .orig.tar.gz.

commit 9a4314c976e0d22e8d47f5d86163791e407a6ecc
Author: Julien Cristau jcris...@debian.org
Date:   Fri Sep 25 15:43:28 2009 +0200

xsfbs.mk: kill obsolete DEFAULT_DCRESOLUTIONS and SOURCE_DIR usage

These variables aren't set anywhere.

diff --git a/debian/xsfbs/xsfbs.mk 

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



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

2009-04-09 Thread Julien Cristau
 ChangeLog  |   12 
 Makefile.in|  674 -
 aclocal.m4 | 8256 -
 config.guess   | 1526 ---
 config.h.in|   66 
 config.sub | 1658 ---
 configure  |22964 -
 configure.ac   |2 
 debian/changelog   |   22 
 debian/control |   15 
 debian/rules   |   23 
 debian/xsfbs/repack.sh |   32 
 debian/xsfbs/xsfbs.mk  |   29 
 debian/xsfbs/xsfbs.sh  |   66 
 depcomp|  589 -
 install-sh |  519 -
 ltmain.sh  | 6964 --
 missing|  367 
 mkinstalldirs  |  161 
 src/Makefile.in|  545 -
 src/ark_driver.c   |1 
 21 files changed, 107 insertions(+), 44384 deletions(-)

New commits:
commit 4df953926385f04aca9200c2c82b515ad39942a8
Author: Julien Cristau jcris...@debian.org
Date:   Thu Apr 9 09:49:12 2009 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index e13ddf3..bc7b17f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-ark (1:0.7.1-2) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Julien Cristau jcris...@debian.org  Thu, 09 Apr 2009 09:49:06 +0100
+
 xserver-xorg-video-ark (1:0.7.1-1) experimental; urgency=low
 
   * New upstream release.

commit 2ed171f9f390de4e97141c0016d3ba615e8c943e
Author: Julien Cristau jcris...@debian.org
Date:   Tue Feb 17 17:20:42 2009 +0100

xsfbs.sh: kill {,de}register_x_lib_dir_with_ld_so

libx11's postinst was the only post-sarge user, and it's gone now.

diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 72efa95..8840ff9 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -719,72 +719,6 @@ run () {
   fi
 }
 
-register_x_lib_dir_with_ld_so () {
-  # syntax: register_x_lib_dir_with_ld_so
-  #
-  # Configure the dynamic loader ld.so to search /usr/X11R6/lib for shared
-  # libraries.
-  #
-  # Call this function from the postinst script of a package that places a
-  # shared library in /usr/X11R6/lib, before invoking ldconfig.
-
-  local dir ldsoconf
-
-  dir=/usr/X11R6/lib
-  ldsoconf=/etc/ld.so.conf
-
-  # is the line not already present?
-  if ! fgrep -qsx $dir $ldsoconf; then
-observe adding $dir directory to $ldsoconf
-echo $dir  $ldsoconf
-  fi
-}
-
-deregister_x_lib_dir_with_ld_so () {
-  # syntax: deregister_x_lib_dir_with_ld_so
-  #
-  # Configure dynamic loader ld.so to not search /usr/X11R6/lib for shared
-  # libraries, if and only if no shared libaries remain there.
-  #
-  # Call this function from the postrm script of a package that places a shared
-  # library in /usr/X11R6/lib, in the event $1 is remove, and before
-  # invoking ldconfig.
-
-  local dir ldsoconf fgrep_status cmp_status
-
-  dir=/usr/X11R6/lib
-  ldsoconf=/etc/ld.so.conf
-
-  # is the line present?
-  if fgrep -qsx $dir $ldsoconf; then
-# are there any shared objects in the directory?
-if [ $(echo $dir/lib*.so.*.*) = $dir/lib*.so.*.* ]; then
-  # glob expansion produced nothing, so no shared libraries are present
-  observe removing $dir directory from $ldsoconf
-  # rewrite the file (very carefully)
-  set +e
-  fgrep -svx $dir $ldsoconf  $ldsoconf.dpkg-tmp
-  fgrep_status=$?
-  set -e
-  case $fgrep_status in
-0|1) ;; # we don't actually care if any lines matched or not
-*) die error reading \$ldsoconf\; fgrep exited with status \
-  $fgrep_status ;;
-  esac
-  set +e
-  cmp -s $ldsoconf.dpkg-tmp $ldsoconf
-  cmp_status=$?
-  set -e
-  case $cmp_status in
-0) rm $ldsoconf.dpkg-tmp ;; # files are identical
-1) mv $ldsoconf.dpkg-tmp $ldsoconf ;; # files differ
-*) die error comparing \$ldsoconf.dpkg-tmp\ to \$ldsoconf\; \
-  cmp exited with status $cmp_status ;;
-  esac
-fi
-  fi
-}
-
 make_symlink_sane () {
   # syntax: make_symlink_sane symlink target
   #

commit 84b7d5bf7a57cab80ba3696ce95028c2f67ba76d
Author: Julien Cristau jcris...@debian.org
Date:   Sun Feb 1 01:31:31 2009 +0100

xsfbs: add a repack script for uscan

This will automatically prune upstream tarballs

diff --git a/debian/xsfbs/repack.sh b/debian/xsfbs/repack.sh
new file mode 100644
index 000..5935cc9
--- /dev/null
+++ b/debian/xsfbs/repack.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+set -e
+
+if ! [ -d debian/prune ]; then
+   exit 0
+fi
+
+if [ x$1 != x--upstream-version ]; then
+   exit 1
+fi
+
+version=$2
+filename=$3
+
+if [ -z $version ] || ! [ -f $filename ]; then
+   exit 1
+fi
+
+dir=$(pwd)
+tempdir=$(mktemp -d)
+
+cd $tempdir
+tar xf $dir/$filename
+cat $dir/debian/prune/* | while read file; do rm -f */$file; done
+
+tar czf $dir/$filename *
+cd $dir
+rm -rf $tempdir
+echo Done pruning upstream tarball
+
+exit 0

commit b78d8f5b8efccc04a8d3def7f26a6e9902df50e6
Author: Julien Cristau jcris...@debian.org

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

2008-06-02 Thread Julien Cristau
 .cvsignore   |   19 
 .gitignore   |   20 
 ChangeLog|  268 +-
 Makefile.in  |   31 -
 aclocal.m4   |  265 ++
 config.guess |   60 +-
 config.sub   |   66 ++
 configure|  979 +++
 configure.ac |   15 
 debian/changelog |   13 
 debian/control   |   10 
 debian/rules |2 
 debian/xsfbs/xsfbs-autoreconf.mk |  150 -
 debian/xsfbs/xsfbs.mk|  102 
 debian/xsfbs/xsfbs.sh|  387 ---
 depcomp  |   93 +++
 install-sh   |  514 ++--
 ltmain.sh|  277 +++
 missing  |   61 +-
 mkinstalldirs|5 
 src/.cvsignore   |6 
 src/.gitignore   |6 
 src/Makefile.in  |   31 -
 src/ark.h|   13 
 src/ark_accel.c  |1 
 src/ark_driver.c |   39 +
 src/ark_reg.h|1 
 27 files changed, 2301 insertions(+), 1133 deletions(-)

New commits:
commit 9c725ada6c463002c70c84e1e027d96f3602f2b5
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Mon Jun 2 21:05:08 2008 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index f986576..283702f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-ark (1:0.7.0-1) UNRELEASED; urgency=low
+xserver-xorg-video-ark (1:0.7.0-1) unstable; urgency=low
 
   * New upstream release.
   * Bump Standards-Version to 3.7.3.
@@ -9,7 +9,7 @@ xserver-xorg-video-ark (1:0.7.0-1) UNRELEASED; urgency=low
 dpkg-shlibdeps to shut up about symbols it can't find.  Build-depend on
 dpkg-dev = 1.14.17.
 
- -- Julien Cristau [EMAIL PROTECTED]  Wed, 19 Mar 2008 20:12:11 +0100
+ -- Julien Cristau [EMAIL PROTECTED]  Mon, 02 Jun 2008 21:05:06 +0200
 
 xserver-xorg-video-ark (1:0.6.0-9) unstable; urgency=low
 

commit ae37584a040d3103efbe07260597d5999de94ea6
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Mon Jun 2 21:00:13 2008 +0200

Run dpkg-shlibdeps with --warnings=6.

Drivers reference symbols from /usr/bin/Xorg and other modules,
and that's not a bug, so we want dpkg-shlibdeps to shut up about
symbols it can't find.  Build-depend on dpkg-dev = 1.14.17.

diff --git a/debian/changelog b/debian/changelog
index f455f3f..f986576 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ xserver-xorg-video-ark (1:0.7.0-1) UNRELEASED; urgency=low
   * Bump Standards-Version to 3.7.3.
   * Drop the XS- prefix from Vcs-* control fields.
   * Add myself to Uploaders.
+  * Run dpkg-shlibdeps with --warnings=6.  Drivers reference symbols from
+/usr/bin/Xorg and other modules, and that's not a bug, so we want
+dpkg-shlibdeps to shut up about symbols it can't find.  Build-depend on
+dpkg-dev = 1.14.17.
 
  -- Julien Cristau [EMAIL PROTECTED]  Wed, 19 Mar 2008 20:12:11 +0100
 
diff --git a/debian/control b/debian/control
index 86fd9d3..9278dc9 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], Brice Goglin [EMAIL 
PROTECTED], Julien Cristau [EMAIL PROTECTED]
-Build-Depends: debhelper (= 5), pkg-config, quilt, xserver-xorg-dev (= 
2:1.4), x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, 
x11proto-render-dev, x11proto-xext-dev
+Build-Depends: debhelper (= 5), pkg-config, quilt, xserver-xorg-dev (= 
2:1.4), x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, 
x11proto-render-dev, x11proto-xext-dev, dpkg-dev (= 1.14.17)
 Standards-Version: 3.7.3
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-ark
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-ark.git
diff --git a/debian/rules b/debian/rules
index 9c1786e..bb62f99 100755
--- a/debian/rules
+++ b/debian/rules
@@ -78,7 +78,7 @@ binary-arch: build install serverabi
dh_compress
dh_fixperms
dh_installdeb
-   dh_shlibdeps
+   dh_shlibdeps -- --warnings=6
dh_gencontrol
dh_md5sums
dh_builddeb

commit 8326f93a9cd2f7177c825cde94c5a2fd4b3ef7ab
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Mon Jun 2 20:56:52 2008 +0200

Add myself to Uploaders.

diff --git a/debian/changelog b/debian/changelog
index 8c7f1da..f455f3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-video-ark (1:0.7.0-1) UNRELEASED; urgency=low
   * New upstream release.
   * Bump Standards-Version to 3.7.3.
   * Drop the XS- prefix from Vcs-* control fields.
+  * Add myself to Uploaders.
 
  -- Julien 

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

2007-09-16 Thread David Nusinow
 Makefile.in   |  125 ++-
 aclocal.m4|  676 +---
 configure | 1119 +-
 debian/changelog  |   23 
 debian/control|4 
 debian/copyright  |3 
 debian/patches/01_gen_pci_ids.diff|   19 
 debian/patches/series |1 
 debian/rules  |4 
 debian/xserver-xorg-video-ark.install |1 
 debian/xsfbs/xsfbs.mk |   27 
 debian/xsfbs/xsfbs.sh |7 
 src/Makefile.in   |  152 ++--
 13 files changed, 1381 insertions(+), 780 deletions(-)

New commits:
commit f7e5ef153e07bb7eb36584793a659a9333ed97b2
Author: David Nusinow [EMAIL PROTECTED]
Date:   Sun Sep 16 16:18:35 2007 -0400

* Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 2b5d2af..25312a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-ark (1:0.6.0-9) unstable; urgency=low
+
+  * Upload to unstable
+
+ -- David Nusinow [EMAIL PROTECTED]  Sun, 16 Sep 2007 15:43:42 -0400
+
 xserver-xorg-video-ark (1:0.6.0-8) experimental; urgency=low
 
   * Add 01_gen_pci_ids.diff

commit 35cbaf601e88bd9838a866c0d5933412d9b2b2f8
Author: David Nusinow [EMAIL PROTECTED]
Date:   Fri Sep 14 00:47:47 2007 -0400

* Add 01_gen_pci_ids.diff
  This patch provides a set of PCI ID's that are supported by this driver so
  that it can be autoloaded by the X server
  + Enable our patch system and add quilt as a build-dep

diff --git a/Makefile.in b/Makefile.in
index 384ed3a..0589230 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -33,15 +33,11 @@
 #  ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
 #  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
 am__cd = CDPATH=$${ZSH_VERSION+.}$(PATH_SEPARATOR)  cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -55,17 +51,17 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+subdir = .
 DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure COPYING ChangeLog config.guess \
config.sub depcomp install-sh ltmain.sh missing mkinstalldirs
-subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
+ configure.lineno config.status.lineno
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
@@ -73,10 +69,13 @@ SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
-   install-exec-recursive install-info-recursive \
-   install-recursive installcheck-recursive installdirs-recursive \
-   pdf-recursive ps-recursive uninstall-info-recursive \
-   uninstall-recursive
+   install-dvi-recursive install-exec-recursive \
+   install-html-recursive install-info-recursive \
+   install-pdf-recursive install-ps-recursive install-recursive \
+   installcheck-recursive installdirs-recursive pdf-recursive \
+   ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -94,8 +93,6 @@ distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
 ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 APP_MAN_DIR = @APP_MAN_DIR@
 APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
@@ -131,6 +128,7 @@ FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 

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

2007-05-02 Thread Julien Cristau
 debian/changelog |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

New commits:
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
 


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



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

2007-04-27 Thread Brice Goglin
 debian/changelog |3 +++
 debian/control   |2 +-
 debian/rules |2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

New commits:
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


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



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

2007-04-24 Thread Timo Aaltonen
 debian/changelog |5 -
 debian/control   |3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
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.


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



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

2007-04-23 Thread Brice Goglin
 debian/changelog |7 ++-
 debian/control   |3 +++
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
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.


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



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

2007-04-22 Thread Julien Cristau
 .cvsignore|   19 
 Makefile.in   |   16 
 aclocal.m4|  379 +-
 autogen.sh|   12 
 config.guess  |  667 ++--
 config.h.in   |9 
 config.sub|  230 +
 configure | 7840 ++
 debian/changelog  |   14 
 debian/control|   13 
 debian/rules  |2 
 debian/xsfbs/xsfbs.mk |   28 
 ltmain.sh |   12 
 mkinstalldirs |   89 
 src/.cvsignore|6 
 src/Makefile.in   |   14 
 src/ark_reg.h |2 
 17 files changed, 5134 insertions(+), 4218 deletions(-)

New commits:
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

commit 4a943db2564c4f573ce2f5f676a841267e961f16
Author: David Nusinow [EMAIL PROTECTED]
Date:   Thu Mar 1 22:06:04 2007 -0500

Fix one missed bit from the serverabiver - serverminver rename

diff --git a/debian/xsfbs/xsfbs.mk 

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

2007-02-01 Thread David Nusinow
New branch 'debian-unstable' available with the following commits:
commit 120fd67451b73060250dfa1a8785d298b716a57c
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Tue Nov 7 06:46:29 2006 +

For each driver, add a symlink to xserver-xorg-core's bug script, so that 
each
new bugreport contains the user's config and log files.  Bump dependencies 
on
xserver-xorg-core to = 2:1.1.1-11, to make sure that the bug script is
present.

commit e154bcb887be41be54f587d203e1e434fe654586
Author: Thierry Reding [EMAIL PROTECTED]
Date:   Tue Sep 26 10:26:34 2006 +

Add some more watch files.

commit b68e957eb00c71943b40ad13d0afca3a09574c42
Author: David Nusinow [EMAIL PROTECTED]
Date:   Tue Sep 19 00:37:10 2006 +

Prepare changelog for upload to unstable

commit cf344313d6960fac3e83230380135904b446b6bd
Author: Drew Parsons [EMAIL PROTECTED]
Date:   Mon Sep 18 13:49:03 2006 +

  * Standards version 3.7.2.
  * Use debhelper 5.
  * Exclude ark_drv.la from dh_install.

commit 56a651e716b4f2869208f24fa4b464b6831bcb58
Author: Steve Langasek [EMAIL PROTECTED]
Date:   Mon Sep 18 09:41:39 2006 +

merge ark 7.1 to trunk for upload to unstable

commit 278b098eb95dc200937ce82fdf27e3b6283365a5
Author: Steve Langasek [EMAIL PROTECTED]
Date:   Mon Sep 18 06:33:05 2006 +

more fixes for unversioned directory names

commit ad2330e815965906d2e4ad499184a241977af324
Author: David Nusinow [EMAIL PROTECTED]
Date:   Wed Apr 5 00:10:22 2006 +

Prepare changelogs for upload to unstable

commit e29166c11e8f256fe8565d74dccf52295f56a5a6
Author: David Nusinow [EMAIL PROTECTED]
Date:   Mon Feb 13 03:46:16 2006 +

Fix Branden's email address

commit c68b4fc08e3c51a4561bf6924a67ca09f3470d24
Author: David Nusinow [EMAIL PROTECTED]
Date:   Sun Feb 12 16:24:02 2006 +

Move all install files for renaming scheme and delete v4l driver which 
doesn't currently have packaging

commit 45c930451e0702c8d0c2e5c2c2be03e8fa3090c9
Author: David Nusinow [EMAIL PROTECTED]
Date:   Fri Feb 10 03:40:14 2006 +

Change driver package names to new scheme

commit d79048474c6166ba9b7428deab0b5f79c4d490a5
Author: David Nusinow [EMAIL PROTECTED]
Date:   Mon Jan 30 02:24:55 2006 +

Move .install files to new naming scheme for drivers

commit 90926a170cf45cc19eb94db5bb18a4d96b9c0730
Author: David Nusinow [EMAIL PROTECTED]
Date:   Sun Jan 29 21:21:32 2006 +

Pull in and use xsfbs

commit 900a0cb38cb128f29bd83c28ed305c0ead6467da
Author: David Nusinow [EMAIL PROTECTED]
Date:   Sun Jan 29 20:36:06 2006 +

* Rename driver packages to be more consistent and intuitive
  + Video drivers are now named xorg-video-driver-foo and input drivers are
now named xorg-input-driver-foo
  + Video drivers provide xorg-video-driver and input drivers provide
xorg-input-driver
  + xorg-server-core depends on xorg-video-drivers-all | xorg-video-driver
and also xorg-input-drivers-all | xorg-input-drivers

commit 352cd0a659058fb57066e944180ccce0f0a29330
Author: David Nusinow [EMAIL PROTECTED]
Date:   Fri Jan 20 04:31:26 2006 +

Fix maintainer and uploader fields. God, I love sed.

commit 752d5b91c33c5efcd90c206615a552d0352f4d36
Author: David Nusinow [EMAIL PROTECTED]
Date:   Fri Jan 13 05:48:42 2006 +

Add packaging for various drivers

commit eb09b4fd540ca4c413ca98a9c773a0dd8ec5408d
Author: David Nusinow [EMAIL PROTECTED]
Date:   Fri Jan 13 04:05:21 2006 +

Update drivers in modular branch. We'll re-pull the ubuntu packaging 
properly

commit 6abbfdee6ada718e0471162eff6bd791d10202a0
Author: David Nusinow [EMAIL PROTECTED]
Date:   Fri Dec 30 18:14:25 2005 +

Vendor drop of the rest of 7.0


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