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

2011-02-05 Thread Cyril Brulebois
 debian/README.source   |   24 -
 debian/changelog   |   23 +
 debian/compat  |2 
 debian/control |   27 +-
 debian/patches/series  |1 
 debian/rules   |  105 
 debian/xsfbs/repack.sh |   32 --
 debian/xsfbs/xsfbs.mk  |  285 --
 debian/xsfbs/xsfbs.sh  |  622 -
 9 files changed, 53 insertions(+), 1068 deletions(-)

New commits:
commit 577e79f20871daac31ec5743a3fdeef12643c5b1
Author: Cyril Brulebois 
Date:   Sat Feb 5 14:58:00 2011 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 165d5b3..02297d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-sunleo (1:1.2.0-5) UNRELEASED; urgency=low
+xserver-xorg-video-sunleo (1:1.2.0-5) unstable; urgency=low
 
   * Switch to dh:
 - Use debhelper 8.
@@ -12,7 +12,7 @@ xserver-xorg-video-sunleo (1:1.2.0-5) UNRELEASED; urgency=low
   * Remove XS prefix from Vcs fields.
   * Bump Standards-Version to 3.9.1 (no changes needed).
 
- -- Cyril Brulebois   Fri, 04 Feb 2011 06:56:27 +0100
+ -- Cyril Brulebois   Sat, 05 Feb 2011 14:57:59 +0100
 
 xserver-xorg-video-sunleo (1:1.2.0-4) experimental; urgency=low
 

commit 5a48859207a6c7fabf8a5b6f61caff8304084732
Author: Cyril Brulebois 
Date:   Sat Feb 5 09:32:28 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 c62845639277d62429825822f0ab4065aef37d16
Author: Cyril Brulebois 
Date:   Fri Feb 4 06:59:21 2011 +0100

Bump Standards-Version to 3.9.1 (no changes needed).

diff --git a/debian/changelog b/debian/changelog
index c1fb955..165d5b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ xserver-xorg-video-sunleo (1:1.2.0-5) UNRELEASED; urgency=low
   * Remove long obsolete Replaces/Conflicts.
   * Wrap Depends/Provides.
   * Remove XS prefix from Vcs fields.
+  * Bump Standards-Version to 3.9.1 (no changes needed).
 
  -- Cyril Brulebois   Fri, 04 Feb 2011 06:56:27 +0100
 
diff --git a/debian/control b/debian/control
index 77e96af..2e4cf6a 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends:
  libtool,
  xutils-dev,
  quilt
-Standards-Version: 3.8.3
+Standards-Version: 3.9.1
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-sunleo
 Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-sunleo.git
 

commit 40252fd325036f106db59cfd70e889c073de36cb
Author: Cyril Brulebois 
Date:   Fri Feb 4 06:59:01 2011 +0100

Remove XS prefix from Vcs fields.

diff --git a/debian/changelog b/debian/changelog
index 0d7fda2..c1fb955 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ xserver-xorg-video-sunleo (1:1.2.0-5) UNRELEASED; urgency=low
   * Update Uploaders list. Thanks, David!
   * Remove long obsolete Replaces/Conflicts.
   * Wrap Depends/Provides.
+  * Remove XS prefix from Vcs fields.
 
  -- Cyril Brulebois   Fri, 04 Feb 2011 06:56:27 +0100
 
diff --git a/debian/control b/debian/control
index f0c7cbc..77e96af 100644
--- a/debian/control
+++ b/debian/control
@@ -17,8 +17,8 @@ Build-Depends:
  xutils-dev,
  quilt
 Standards-Version: 3.8.3
-XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-sunleo
-XS-Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-sunleo.git
+Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-sunleo
+Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-sunleo.git
 
 Package: xserver-xorg-video-sunleo
 Architecture: sparc

commit 19680f62ddb621bd3f203a9a05671e1821450919
Author: Cyril Brulebois 
Date:   Fri Feb 4 06:58:47 2011 +0100

Wrap Depends/Provides.

diff --git a/debian/changelog b/debian/changelog
index 6605976..0d7fda2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ xserver-xorg-video-sunleo (1:1.2.0-5) UNRELEASED; urgency=low
   * Remove xsfbs accordingly.
   * Update Uploaders list. Thanks, David!
   * Remove long obsolete Replaces/Conflicts.
+  * Wrap Depends/Provides.
 
  -- Cyril Brulebois   Fri, 04 Feb 2011 06:56:27 +0100
 
diff --git a/debian/control b/debian/control
index 24f8d22..f0c7cbc 100644
--- a/debian/control
+++ b/debian/control
@@ -22,8 +22,12 @@ XS-Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-sunl
 
 Package: xserver-xorg-video-sunleo
 Architecture: sparc
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xviddriver:Depends}
-Provides: ${xviddriver:Provides}
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+ ${xviddriver:Depends},
+Provides:
+ ${xviddriver:Provides}
 Description: X.Org X server -- Sun Leo display driver
  This package provides the driver for Sun Leo (ZX) video devices.
  .

commit d2b9f5b689a9e918e2bdf69f1dad34f89cc34bf4
Author: Cyril Brulebois 
Date:   Fri Feb 4 06:58:

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

2010-06-05 Thread Julien Cristau
 debian/README.source  |2 +-
 debian/changelog  |5 +++--
 debian/control|4 ++--
 debian/xsfbs/xsfbs.mk |   35 ++-
 4 files changed, 28 insertions(+), 18 deletions(-)

New commits:
commit 2cccd743d808aca87e78ec6f9813e75521026b73
Author: Julien Cristau 
Date:   Sat Jun 5 15:19:29 2010 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index ee2f7e1..a0db167 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xserver-xorg-video-sunleo (1:1.2.0-3) UNRELEASED; urgency=low
+xserver-xorg-video-sunleo (1:1.2.0-3) unstable; urgency=low
 
   * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
 good reason.  Thanks, Colin Watson!
   * Remove myself from Uploaders
   * Update xsfbs and use new ${xviddriver:Depends} substvar.
 
- -- Julien Cristau   Sat, 16 Jan 2010 16:47:26 +
+ -- Julien Cristau   Sat, 05 Jun 2010 15:19:16 +0200
 
 xserver-xorg-video-sunleo (1:1.2.0-2) unstable; urgency=low
 

commit e5d24b6949ba2b493fd74e834eb418dfa5ae5841
Author: Julien Cristau 
Date:   Sat Jun 5 15:19:14 2010 +0200

Update xsfbs and use new ${xviddriver:Depends} substvar.

diff --git a/debian/changelog b/debian/changelog
index 37302ed..ee2f7e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-video-sunleo (1:1.2.0-3) UNRELEASED; urgency=low
   * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
 good reason.  Thanks, Colin Watson!
   * Remove myself from Uploaders
+  * Update xsfbs and use new ${xviddriver:Depends} substvar.
 
  -- Julien Cristau   Sat, 16 Jan 2010 16:47:26 +
 
diff --git a/debian/control b/debian/control
index 08d8098..0e3f783 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian X Strike Force 
 Uploaders: David Nusinow , Jurij Smakov 
 Build-Depends: debhelper (>= 5),
  pkg-config,
- xserver-xorg-dev (>= 2:1.7),
+ xserver-xorg-dev (>= 2:1.7.6.901),
  x11proto-core-dev,
  x11proto-randr-dev,
  x11proto-render-dev,
@@ -19,7 +19,7 @@ XS-Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-sunl
 
 Package: xserver-xorg-video-sunleo
 Architecture: sparc
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xviddriver:Depends}
 Provides: ${xviddriver:Provides}
 Replaces: xserver-xorg (<< 6.8.2-35), xserver-xorg-driver-sunleo
 Conflicts: xserver-xorg-driver-sunleo

commit 81fc271788605b52e85c2d11635a0371fb44605e
Author: Cyril Brulebois 
Date:   Sun May 2 02:14:45 2010 +0200

Add xorg-driver-{video,input} to Provides.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 77c4a39..3c59c20 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -261,8 +261,8 @@ INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 
2>/dev/null)
 # these two can be removed post-squeeze
 VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
 INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null)
-VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
-INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI)
+VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI), xorg-driver-video
+INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI), xorg-driver-input
 
 ifeq ($(PACKAGE),)
 PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)

commit b045afbd8277ad0c44e29d7c45802053c4335ccd
Author: Julien Cristau 
Date:   Fri Apr 16 22:14:46 2010 +0200

Update serverabi rule for xserver 1.7.6.901

Add new variables ${xviddriver:Depends} and ${xinpdriver:Depends} for
drivers.  The ${xserver:Depends} variable is deprecated.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 351fea5..77c4a39 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -253,25 +253,33 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
#debian/*.prerm
>$@
 
-SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null)
+# Compute dependencies for drivers
+#
+VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null)
+INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null)
+
+# these two can be removed post-squeeze
 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-input-$(INPUTABI)
+
 ifeq ($(PACKAGE),)
 PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
 endif
 
 .PHONY: serverabi
 serverabi: install
-ifeq ($(SERVERMINVERS),)
-   @echo error: xserver-xorg-dev needs to be installed
+ifeq ($(VIDEODEP),)
+   @echo 'error: xserver-xorg-dev >= 1.7.6.901 needs to be installed'
@exit 1
 else
-   echo "xserver:Dep

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

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

New commits:
commit cd9468475b60f9848bddc358ba0f3938c69d9a2f
Author: Mikhail Gusarov 
Date:   Fri May 7 18:58:59 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 86b99dc..08d8098 100644
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,5 @@ Description: X.Org X server -- Sun Leo display driver
  .
  More information about X.Org can be found at:
  http://www.X.org>
- http://xorg.freedesktop.org>
- http://lists.freedesktop.org/mailman/listinfo/xorg>
  .
  This package is built from the X.org xf86-video-sunleo 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/e1oamqi-0002wi...@alioth.debian.org



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

2010-01-22 Thread Julien Cristau
 debian/changelog |1 +
 debian/control   |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 14189a29936d6ca3ad85cd7ffb0b43046531a93d
Author: Julien Cristau 
Date:   Sat Jan 23 01:46:33 2010 +0100

Remove myself from Uploaders

diff --git a/debian/changelog b/debian/changelog
index 38bb153..37302ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-video-sunleo (1:1.2.0-3) UNRELEASED; urgency=low
 
   * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
 good reason.  Thanks, Colin Watson!
+  * Remove myself from Uploaders
 
  -- Julien Cristau   Sat, 16 Jan 2010 16:47:26 +
 
diff --git a/debian/control b/debian/control
index 55da6a3..86b99dc 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-video-sunleo
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force 
-Uploaders: David Nusinow , Jurij Smakov 
, Julien Cristau 
+Uploaders: David Nusinow , Jurij Smakov 
 Build-Depends: debhelper (>= 5),
  pkg-config,
  xserver-xorg-dev (>= 2:1.7),


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



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

2010-01-16 Thread Julien Cristau
 debian/changelog |7 +++
 debian/rules |   14 +++---
 2 files changed, 14 insertions(+), 7 deletions(-)

New commits:
commit 28951192211317b12cb8c6c80d29281b00f9e2de
Author: Julien Cristau 
Date:   Sat Jan 16 16:48:46 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 9c465af..38bb153 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-sunleo (1:1.2.0-3) UNRELEASED; urgency=low
+
+  * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
+good reason.  Thanks, Colin Watson!
+
+ -- Julien Cristau   Sat, 16 Jan 2010 16:47:26 +
+
 xserver-xorg-video-sunleo (1:1.2.0-2) unstable; urgency=low
 
   [ Timo Aaltonen ]
diff --git a/debian/rules b/debian/rules
index ab81676..55057be 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,17 +35,17 @@ confflags += --disable-static
 configure: $(STAMP_DIR)/patch
autoreconf -vfi
 
-obj-$(DEB_BUILD_GNU_TYPE)/config.status: configure
-   mkdir -p obj-$(DEB_BUILD_GNU_TYPE)
-   cd obj-$(DEB_BUILD_GNU_TYPE) && \
+build/config.status: configure
+   mkdir -p build
+   cd build && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
 --infodir=\$${prefix}/share/info $(confflags) \
 CFLAGS="$(CFLAGS)" 
 
 build: build-stamp
-build-stamp: obj-$(DEB_BUILD_GNU_TYPE)/config.status
+build-stamp: build/config.status
dh_testdir
-   cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
+   cd build && $(MAKE)
>$@
 
 clean: xsfclean
@@ -57,7 +57,7 @@ clean: xsfclean
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 $$(find -name Makefile.in)
rm -f compile config.guess config.sub configure depcomp install-sh
rm -f ltmain.sh missing INSTALL aclocal.m4 ylwrap mkinstalldirs 
config.h.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-sunleo: Changes to 'debian-unstable'

2010-01-15 Thread Julien Cristau
 debian/changelog |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit e961642063b598fcbc9934b3c330f92e35df0773
Author: Julien Cristau 
Date:   Fri Jan 15 16:47:18 2010 +

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 43a8e39..9c465af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-xserver-xorg-video-sunleo (1:1.2.0-2) UNRELEASED; urgency=low
+xserver-xorg-video-sunleo (1:1.2.0-2) unstable; urgency=low
 
+  [ Timo Aaltonen ]
   * Bump Standards-Version to 3.8.3.
   * Build against Xserver 1.7.
 
- -- Timo Aaltonen   Sat, 05 Dec 2009 01:49:12 +0200
+ -- Julien Cristau   Fri, 15 Jan 2010 16:47:15 
+
 
 xserver-xorg-video-sunleo (1:1.2.0-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-sunleo: 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 3722e20ab153aecc4490ab566992630be478ba55
Author: Timo Aaltonen 
Date:   Sat Dec 5 02:09:31 2009 +0200

Build against Xserver 1.7.

diff --git a/debian/changelog b/debian/changelog
index 54fba32..43a8e39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 xserver-xorg-video-sunleo (1:1.2.0-2) UNRELEASED; urgency=low
 
   * Bump Standards-Version to 3.8.3.
+  * Build against Xserver 1.7.
 
- -- Timo Aaltonen   Wed, 02 Dec 2009 10:26:44 +0200
+ -- Timo Aaltonen   Sat, 05 Dec 2009 01:49:12 +0200
 
 xserver-xorg-video-sunleo (1:1.2.0-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index cbd939f..55da6a3 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian X Strike Force 
 Uploaders: David Nusinow , Jurij Smakov 
, Julien Cristau 
 Build-Depends: debhelper (>= 5),
  pkg-config,
- xserver-xorg-dev (>= 2:1.2.99.902),
+ xserver-xorg-dev (>= 2:1.7),
  x11proto-core-dev,
  x11proto-randr-dev,
  x11proto-render-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-sunleo: Changes to 'debian-unstable'

2009-12-02 Thread Timo Aaltonen
 debian/README.source  |   73 ++
 debian/changelog  |6 +
 debian/control|2 
 debian/xsfbs/xsfbs.mk |   21 
 debian/xsfbs/xsfbs.sh |  245 --
 5 files changed, 83 insertions(+), 264 deletions(-)

New commits:
commit b63ee2fd4ca9923a5cbcf523ed2548acfcee9c03
Author: Timo Aaltonen 
Date:   Wed Dec 2 10:27:32 2009 +0200

Bump Standards-Version to 3.8.3.

diff --git a/debian/changelog b/debian/changelog
index 3ac0372..54fba32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-sunleo (1:1.2.0-2) UNRELEASED; urgency=low
+
+  * Bump Standards-Version to 3.8.3.
+
+ -- Timo Aaltonen   Wed, 02 Dec 2009 10:26:44 +0200
+
 xserver-xorg-video-sunleo (1:1.2.0-1) unstable; urgency=low
 
   [ Timo Aaltonen ]
diff --git a/debian/control b/debian/control
index 2baeb9e..cbd939f 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 5),
  automake,
  libtool,
  xutils-dev
-Standards-Version: 3.7.2.0
+Standards-Version: 3.8.3
 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-sunleo
 XS-Vcs-Browser: 
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-sunleo.git
 

commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau 
Date:   Fri Sep 25 16:39:23 2009 +0200

xsfbs.mk: remove more obsolete code

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

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

commit 9a4314c976e0d22e8d47f5d86163791e407a6ecc
Author: Julien Cristau 
Date:   Fri Sep 25 15:43:28 2009 +0200

xsfbs.mk: kill obsolete DEFAULT_DCRESOLUTIONS and SOURCE_DIR usage

These variables aren't set anywhere.

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 1f86848..82eb45f 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -176,7 +176,7 @@ cleanscripts:
 xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
-   rm -rf $(STAMP_DIR) $(SOURCE_DIR)
+   rm -rf $(STAMP_DIR)
rm -rf imports
dh_clean debian/shlibs.local \
 debian/po/pothead
@@ -252,7 +252,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
  | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \
sed -e 's/@SOURCE_VERSION@/$(SOURCE_VERSION)/' \
-e 's/@OFFICIAL_BUILD@/$(OFFICIAL_BUILD)/' \
-   -e 's/@DEFAULT_DCRESOLUTIONS@/$(DEFAULT_DCRESOLUTIONS)/' \
  <$$MAINTSCRIPT.tmp >$$MAINTSCRIPT; \
rm $$MAINTSCRIPT.tmp; \
  fi; \

commit bda208ec00d0b7b3632f57fb27e014684cdf73ba
Author: Julien Cristau 
Date:   Fri Sep 25 15:33:39 2009 +0200

xsfbs.sh: fix typo and remove svn keyword

diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 45acd59..813fd8d 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -1,5 +1,3 @@
-# $Id$
-
 # This is the X Strike Force shell library for X Window System package
 # maintainer scripts.  It serves to define shell functions commonly used by
 # such packages, and performs some error checking necessary for proper 
operation
@@ -8,7 +6,7 @@
 # removal tasks.
 
 # If you are reading this within a Debian package maintainer script (e.g.,
-# /var/lib/dpkg)info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can
+# /var/lib/dpkg/info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can
 # skip past this library by scanning forward in this file to the string
 # "GOBSTOPPER".
 

commit 5693792171d885769e58d053c08b11acd12a
Author: Julien Cristau 
Date:   Wed Aug 26 18:53:36 2009 +0200

xsfbs.mk: no need for shlibs.local

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index f0f8953..1f86848 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -265,10 +265,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
#debian/*.prerm
>$@
 
-# Generate the shlibs.local file.
-debian/shlibs.local:
-   cat debian/*.shlibs >$@
-
 SERVERMINVERS = $(shell cat /usr/share/xserver-xo

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

2009-05-04 Thread Julien Cristau
 .cvsignore   |   19 
 .gitignore   |   20 
 ChangeLog|   65 
 Makefile.in  |  653 -
 aclocal.m4   | 7951 --
 config.guess | 1516 --
 config.h.in  |   66 
 config.sub   | 1622 --
 configure|22031 ---
 configure.ac |2 
 debian/changelog |   12 
 debian/control   |   11 
 debian/rules |   27 
 debian/xsfbs/repack.sh   |   32 
 debian/xsfbs/xsfbs-autoreconf.mk |  150 
 debian/xsfbs/xsfbs.mk|  104 
 debian/xsfbs/xsfbs.sh|  405 
 depcomp  |  530 
 install-sh   |  323 
 ltmain.sh| 6871 
 man/Makefile.am  |1 
 man/Makefile.in  |  419 
 missing  |  360 
 src/Makefile.in  |  524 
 src/leo.h|   21 
 src/leo_accel.c  |   27 
 src/leo_checks.c |4 
 src/leo_driver.c |8 
 src/leo_frect.c  |8 
 src/leo_frectsp.c|4 
 src/leo_fspans.c |   16 
 src/leo_fspanssp.c   |   16 
 src/leo_glyph.c  |8 
 33 files changed, 416 insertions(+), 43410 deletions(-)

New commits:
commit 4c440df61daf8596f6fa91b41a964de7d363d96f
Author: Julien Cristau 
Date:   Mon May 4 17:53:39 2009 +0200

Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 2de1e75..3ac0372 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-sunleo (1:1.2.0-1) UNRELEASED; urgency=low
+xserver-xorg-video-sunleo (1:1.2.0-1) unstable; urgency=low
 
   [ Timo Aaltonen ]
   * New upstream release.
@@ -8,7 +8,7 @@ xserver-xorg-video-sunleo (1:1.2.0-1) UNRELEASED; urgency=low
   [ Julien Cristau ]
   * Allow parallel builds.
 
- -- Timo Aaltonen   Mon, 29 Dec 2008 11:06:15 +0200
+ -- Julien Cristau   Mon, 04 May 2009 17:53:35 +0200
 
 xserver-xorg-video-sunleo (1:1.1.0-3) unstable; urgency=low
 

commit 6adb5d56a8581b729de60a1fdbc7dff654afcd9b
Author: Julien Cristau 
Date:   Mon May 4 17:53:33 2009 +0200

Allow parallel builds.

diff --git a/debian/changelog b/debian/changelog
index a179eda..2de1e75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
 xserver-xorg-video-sunleo (1:1.2.0-1) UNRELEASED; urgency=low
 
+  [ Timo Aaltonen ]
   * New upstream release.
   * Run autoreconf at build time; build-depend on automake, libtool and
 xutils-dev.
 
+  [ Julien Cristau ]
+  * Allow parallel builds.
+
  -- Timo Aaltonen   Mon, 29 Dec 2008 11:06:15 +0200
 
 xserver-xorg-video-sunleo (1:1.1.0-3) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index fac7b73..ab81676 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,13 +10,14 @@
 include debian/xsfbs/xsfbs.mk
 
 CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
 else
CFLAGS += -O2
 endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-   INSTALL_PROGRAM += -s
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+   NUMJOBS = $(patsubst parallel=%,%,$(filter 
parallel=%,$(DEB_BUILD_OPTIONS)))
+   MAKEFLAGS += -j$(NUMJOBS)
 endif
 
 DEB_HOST_ARCH  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)

commit 3190a847290c5687be15381c82ab54174dbcc957
Author: Julien Cristau 
Date:   Mon May 4 17:52:45 2009 +0200

Update upstream changelog

diff --git a/ChangeLog b/ChangeLog
index be9e7bc..9bdd0b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,68 @@
+commit 5a3a1ddbc32d24f67d4f7bf7742115bc97baa087
+Author: Adam Jackson 
+Date:   Wed Sep 3 17:56:28 2008 -0400
+
+sunleo 1.2.0
+
+commit 1802e3bb1478de88592594d67121489b7a8db193
+Author: Eamon Walsh 
+Date:   Tue Aug 26 22:43:04 2008 -0400
+
+Change GC private key back to an integer variable.
+
+Prepares for a devPrivates system that will store an index.
+
+commit 832e0cd293f1f1572d70774d4b4254dcc7a3dcd4
+Author: Adam Jackson 
+Date:   Tue Aug 19 10:26:04 2008 -0400
+
+Uninclude xf86Version.h
+
+commit 2a9e73bc6cf37aea24fa590596aba47063613bd0
+Author: Dennis Gilmore 
+Date:   Tue May 27 19:54:15 2008 +0300
+
+Remove usage of ALLOCATE_LOCAL
+
+Replace with xalloc, as {,DE}ALLOCATE_LOCAL were removed in 1.5.
+
+commit 53022f9dfd9bd01d5fc1d1ce27165f89fc96cc98
+Author: Matthieu Herrb 
+Date:   Sat Mar 8 23:58:26 2008 +0100
+
+Makefile.am: nuke RCS Id
+
+commit 84f95546ccbf9cc3ef6b06288dd415eef534c40c
+Author: Eamon Walsh 
+Date:   Wed Jan 23 21:21:55 2008 -0500
+
+Support old and new devPrivates API in this driver.
+
+commit 970867a0ec6c0f28165ae0246b52f34062013107
+Author: David 

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

2007-09-25 Thread Julien Cristau
 debian/changelog  |6 --
 debian/control|2 +-
 debian/xsfbs/xsfbs.mk |   50 ++
 debian/xsfbs/xsfbs.sh |7 ---
 4 files changed, 23 insertions(+), 42 deletions(-)

New commits:
commit 5668f2226e31b0b7162ffe9e7ab7fc9a6c1fd8a1
Author: Julien Cristau <[EMAIL PROTECTED]>
Date:   Tue Sep 25 10:38:07 2007 +0200

Uploaders update, rebuild against xserver 1.4.

Add myself to Uploaders, and remove Branden with his permission.

diff --git a/debian/changelog b/debian/changelog
index ea25d6d..0fb60fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-sunleo (1:1.1.0-3) UNRELEASED; urgency=low
+xserver-xorg-video-sunleo (1:1.1.0-3) unstable; urgency=low
 
   [ David Nusinow ]
   * Generate server dependencies automatically from the ABI
@@ -6,6 +6,8 @@ xserver-xorg-video-sunleo (1:1.1.0-3) UNRELEASED; urgency=low
   [ Julien Cristau ]
   * Add link to xserver-xorg-core bug script, so that bugreports contain
 the user's config and log files.
+  * Add myself to Uploaders, and remove Branden with his permission.
+  * Rebuild against xserver 1.4.
 
   [ Brice Goglin ]
   * Pull upstream manpage fix fe5af18d4bc8fc095e3b12d1030b6e5765c7e3a4
@@ -21,7 +23,7 @@ xserver-xorg-video-sunleo (1:1.1.0-3) UNRELEASED; urgency=low
   [ Timo Aaltonen ]
   * Replaces/Conflicts: xserver-xorg-driver-sunleo.
 
- -- Brice Goglin <[EMAIL PROTECTED]>  Wed, 19 Sep 2007 00:31:32 +0200
+ -- Julien Cristau <[EMAIL PROTECTED]>  Tue, 25 Sep 2007 10:37:29 +0200
 
 xserver-xorg-video-sunleo (1:1.1.0-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 2bb0485..34a54c7 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-video-sunleo
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force 
-Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL 
PROTECTED]>, Jurij Smakov <[EMAIL PROTECTED]>
+Uploaders: David Nusinow <[EMAIL PROTECTED]>, Jurij Smakov <[EMAIL 
PROTECTED]>, Julien Cristau <[EMAIL PROTECTED]>
 Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 
2:1.2.99.902), x11proto-core-dev, x11proto-randr-dev, x11proto-render-dev, 
x11proto-fonts-dev
 Standards-Version: 3.7.2.0
 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-sunleo

commit 331c032528ba1faebef1d8eaa56db47f533f0426
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Sat Sep 22 23:49:11 2007 -0400

Remove make-orig-tar-gz target

This target wasn't kept up to date and was totally broken for the git
world. The way we use git has made this target pretty well impossible to
use in any form, so it's been supersceded by a script that is currently
located at
http://people.debian.org/~dnusinow/xsf_scripts/git-make-orig-tar-gz

diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index bfca7bb..b8f7afd 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -272,29 +272,6 @@ prune-upstream-tree:
dh_testdir
grep -rvh '^#' debian/prune/ | xargs --no-run-if-empty rm -rf
 
-# Change to what should be the correct directory, ensure it is, and if
-# so, create the .orig.tar.gz file.  Exclude the debian directory and its
-# contents, and any .svn directories and their contents (so that we can safely
-# build an .orig.tar.gz from SVN checkout, not just an export).
-#
-# Note: This rule is for Debian package maintainers' convenience, and is not
-# needed for conventional build scenarios.
-#
-# This rule *IS* the recommended method for creating a new .orig.tar.gz file,
-# for the rare situations when one is needed.
-.PHONY: make-orig-tar-gz
-make-orig-tar-gz: clean prune-upstream-tree
-   ( cd .. \
- && if [ $(shell basename $(CURDIR)) != $(SOURCE_NAME)-$(NO_EPOCH_VER) 
]; then \
-   echo "Our current working directory has the wrong name. 
Renaming..." >&2; \
-   mv $(CURDIR) $(SOURCE_NAME)-$(NO_EPOCH_VER); \
- fi; \
-   tar --exclude=debian --exclude=debian/* \
-   --exclude=.svn --exclude=.svn/* \
-   -cf - $(SOURCE_NAME)-$(NO_EPOCH_VER) \
-   | gzip -9 >$(SOURCE_NAME)_$(NO_EPOCH_VER).orig.tar.gz; \
-  )
-
 # Verify that there are no offsets or fuzz in the patches we apply.
 #
 # Note: This rule is for Debian package maintainers' convenience, and is not

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" = "re

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

2007-09-18 Thread Brice Goglin
 debian/changelog |3 ++-
 debian/copyright |7 ---
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit ab2a9f26e27669a8ef559b7856b76fb8821b91af
Author: Brice Goglin <[EMAIL PROTECTED]>
Date:   Wed Sep 19 00:31:47 2007 +0200

Add upstream URL to debian/copyright

diff --git a/debian/changelog b/debian/changelog
index 6b932fc..ea25d6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,11 +16,12 @@ xserver-xorg-video-sunleo (1:1.1.0-3) UNRELEASED; 
urgency=low
   * Add a link to www.X.org and a reference to the xf86-video-sunleo
 module in the long description.
   * Remove Fabio from uploaders with his permission. He's always welcome back.
+  * Add upstream URL to debian/copyright.
 
   [ Timo Aaltonen ]
   * Replaces/Conflicts: xserver-xorg-driver-sunleo.
 
- -- Timo Aaltonen <[EMAIL PROTECTED]>  Fri,  4 May 2007 18:19:37 +0300
+ -- Brice Goglin <[EMAIL PROTECTED]>  Wed, 19 Sep 2007 00:31:32 +0200
 
 xserver-xorg-video-sunleo (1:1.1.0-2) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 824ed83..4539c68 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,9 @@
+his package was downloaded from
+http://xorg.freedesktop.org/releases/individual/driver/
+
 This package has been created for Debian by David Nusinow 
 <[EMAIL PROTECTED]> in March 2006, and has been maintained
-by Jurij Smakov <[EMAIL PROTECTED]> since June 2006.. Original
-upstream source has been downloaded from 
-ftp://ftp.x.org/pub/X11R7.1/src/driver 
+by Jurij Smakov <[EMAIL PROTECTED]> since June 2006.
 
 The files in this package are
 


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



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

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

New commits:
commit 3ec910b8f55f26f418c9485b02c64f31d9e41ed1
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date:   Fri May 4 18:20:50 2007 +0300

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

diff --git a/debian/changelog b/debian/changelog
index 87f54ab..6b932fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,7 +17,10 @@ xserver-xorg-video-sunleo (1:1.1.0-3) UNRELEASED; urgency=low
 module in the long description.
   * Remove Fabio from uploaders with his permission. He's always welcome back.
 
- -- Brice Goglin <[EMAIL PROTECTED]>  Tue, 01 May 2007 15:19:23 +0200
+  [ Timo Aaltonen ]
+  * Replaces/Conflicts: xserver-xorg-driver-sunleo.
+
+ -- Timo Aaltonen <[EMAIL PROTECTED]>  Fri,  4 May 2007 18:19:37 +0300
 
 xserver-xorg-video-sunleo (1:1.1.0-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index e67cb35..2bb0485 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,8 @@ Package: xserver-xorg-video-sunleo
 Architecture: sparc
 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-sunleo
+Conflicts: xserver-xorg-driver-sunleo
 Description: X.Org X server -- Sun Leo display driver
  This package provides the driver for Sun Leo (ZX) video devices.
  .


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



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

2007-05-01 Thread Brice Goglin
 .cvsignore|   19 
 ChangeLog |  235 +
 Makefile.in   |   12 
 aclocal.m4|  379 +-
 autogen.sh|   12 
 config.guess  |  685 ++--
 config.h.in   |9 
 config.sub|  240 +
 configure | 7799 ++
 debian/changelog  |   18 
 debian/control|   14 
 debian/rules  |4 
 debian/xsfbs/xsfbs.mk |   28 
 ltmain.sh |   12 
 man/.cvsignore|2 
 man/Makefile.am   |2 
 man/Makefile.in   |   14 
 man/sunleo.man|4 
 src/.cvsignore|6 
 src/Makefile.in   |   12 
 src/leo_regs.h|2 
 21 files changed, 5293 insertions(+), 4215 deletions(-)

New commits:
commit 5cf4ff598e175b33787b99b4620ee32e8947d803
Author: Brice Goglin <[EMAIL PROTECTED]>
Date:   Tue May 1 15:21:19 2007 +0200

autoreconf

diff --git a/Makefile.in b/Makefile.in
index 549e9f1..bd3d980 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -129,6 +129,7 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+GREP = @GREP@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -163,13 +164,9 @@ STRIP = @STRIP@
 VERSION = @VERSION@
 XORG_CFLAGS = @XORG_CFLAGS@
 XORG_LIBS = @XORG_LIBS@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -186,24 +183,31 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 moduledir = @moduledir@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
diff --git a/aclocal.m4 b/aclocal.m4
index aaed1b9..aaae5ad 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -13,7 +13,7 @@
 
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 
-# serial 48 AC_PROG_LIBTOOL
+# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -1397,18 +1397,6 @@ freebsd1*)
   dynamic_linker=no
   ;;
 
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix 
${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -1564,7 +1552,7 @@ linux*oldld* | linux*aout* | linux*coff*)
   ;;
 
 # This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -1578,27 +1566,10 @@ linux*)
   # before this can be enabled.
   hardcode_into_libs=yes
 
-  # find out which ABI we are using
-  libsuff=
-  case "$host_cpu" in
-  x86_64*|s390x*|powerpc64*)
-echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-if AC_TRY_EVAL(ac_compile); then
-  case `/usr/bin/file conftest.$ac_objext` in
-  *64-bit*)
-libsuff=64
-sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} 
/usr/local/lib${libsuff}"
-;;
-  esac
-fi
-rm -rf conftest*
-;;
-  esac
-
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
 lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); 
skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 
's/#.*//;s/[:,   ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -1610,7 +1581,7 @@ linux*)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-knetbsd*-gnu)
+netbsdelf*-gnu)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -1619,7 +1590,7 @@ knetbsd*-gnu)
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_ru

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

2007-02-03 Thread David Nusinow
New branch 'debian-unstable' available with the following commits:
commit ed6d3487408b4fa0068fe206825fafb06f590e0a
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 925295cf00af572786908694e7cdf8db93ce6599
Author: Jurij Smakov <[EMAIL PROTECTED]>
Date:   Fri Oct 6 03:54:54 2006 +

Fix the version of the dependency on xserver-xorg-core.

commit 177aa28871839335dce9bd5345a567039a02e479
Author: Thierry Reding <[EMAIL PROTECTED]>
Date:   Tue Sep 26 10:26:34 2006 +

Add some more watch files.

commit bb7383b13be0e693d5cbaefaf2c890fb10adf0d0
Author: Jurij Smakov <[EMAIL PROTECTED]>
Date:   Wed Sep 20 06:43:07 2006 +

New upstream release, updates for the 7.1 transition.

commit ed46dfbe0dd9a0ddb8f6136c41f97b6a55b03bc3
Author: Steve Langasek <[EMAIL PROTECTED]>
Date:   Mon Sep 18 06:33:05 2006 +

more fixes for unversioned directory names

commit 900028a6a636f00276436f448d5e48ca79c45924
Author: Frans Pop <[EMAIL PROTECTED]>
Date:   Sun Jun 25 23:34:36 2006 +

Actually bump standards-version

commit 7e6e84f90c30b6d71824d1e6be7aeed86404f633
Author: Frans Pop <[EMAIL PROTECTED]>
Date:   Sun Jun 25 19:32:10 2006 +

Commit on behalf of Jurij Smakov to allow upload of Sparc video driver 
packages
- First upload to unstable
- Add myself to uploaders
- Bump policy version to 3.7.2.0, no changes neccessary
- Update the copyright file

commit d52967fc4512dbc03380e489e2f658a7031a9aa6
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Sun Jun 18 21:17:41 2006 +

Fix package name. Patch from Jurij Smakov

commit 294fffcf5ba0724ba62cc33716dcaddd179fb292
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Wed Apr 5 00:10:22 2006 +

Prepare changelogs for upload to unstable

commit 994c9093e06feff4e2bb4fd2bc7bf04ed9f2c706
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Mon Feb 13 03:46:16 2006 +

Fix Branden's email address

commit ae3bc3a949109233d3e863dc91528303db77d213
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 4c660ec3fc6bb8f21c95aa0133d2c31a8d836b02
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Fri Feb 10 03:40:14 2006 +

Change driver package names to new scheme

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

Move .install files to new naming scheme for drivers

commit 5022c6d5be8acbc5cd61e30d1ec7e272349e553c
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Sun Jan 29 21:21:32 2006 +

Pull in and use xsfbs

commit 9d8d7384d19cdd2cb8c2d611a539443946a28edc
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 10adef6af6abe7591f363499c48d1ee0f9885c16
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Fri Jan 20 04:31:26 2006 +

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

commit 0660c64aa70a969904c49ec55342ee979e7548be
Author: David Nusinow <[EMAIL PROTECTED]>
Date:   Fri Jan 13 05:48:42 2006 +

Add packaging for various drivers

commit 8bdbe0ef831f774b260480e35c85d55ad87cd11e
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 e31ef8fc4dfd8b03061e21716da0a2710d6f7e1b
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]