[Ubuntu-x-swat] [Bug 615479] Re: Sync xserver-xorg-video-geode 2.11.8-11 (main) from Debian unstable (main)

2011-08-11 Thread Bug Watch Updater
** Changed in: xserver-xorg-video-geode (Debian)
   Status: New = Fix Released

-- 
You received this bug notification because you are a member of Ubuntu-X,
which is subscribed to xserver-xorg-video-geode in Ubuntu.
https://bugs.launchpad.net/bugs/615479

Title:
  Sync xserver-xorg-video-geode 2.11.8-11 (main) from Debian unstable
  (main)

To manage notifications about this bug go to:
https://bugs.launchpad.net/ubuntu/+source/xserver-xorg-video-geode/+bug/615479/+subscriptions

___
Mailing list: https://launchpad.net/~ubuntu-x-swat
Post to : ubuntu-x-swat@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-x-swat
More help   : https://help.launchpad.net/ListHelp


[Ubuntu-x-swat] [Bug 615479] Re: Sync xserver-xorg-video-geode 2.11.8-11 (main) from Debian unstable (main)

2010-08-13 Thread Martin-Éric Racine
Manual sync done.

** Changed in: xserver-xorg-video-geode (Ubuntu)
   Status: Confirmed = Fix Released

-- 
Sync xserver-xorg-video-geode 2.11.8-11 (main) from Debian unstable (main)
https://bugs.launchpad.net/bugs/615479
You received this bug notification because you are a member of Ubuntu-X,
which is subscribed to xserver-xorg-video-geode in ubuntu.

___
Mailing list: https://launchpad.net/~ubuntu-x-swat
Post to : ubuntu-x-swat@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-x-swat
More help   : https://help.launchpad.net/ListHelp


[Ubuntu-x-swat] [Bug 615479] Re: Sync xserver-xorg-video-geode 2.11.8-11 (main) from Debian unstable (main)

2010-08-12 Thread Martin-Éric Racine
This has now been uploaded to Debian.  Waiting for the manual sync to
Maverick.

-- 
Sync xserver-xorg-video-geode 2.11.8-11 (main) from Debian unstable (main)
https://bugs.launchpad.net/bugs/615479
You received this bug notification because you are a member of Ubuntu-X,
which is subscribed to xserver-xorg-video-geode in ubuntu.

___
Mailing list: https://launchpad.net/~ubuntu-x-swat
Post to : ubuntu-x-swat@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-x-swat
More help   : https://help.launchpad.net/ListHelp


[Ubuntu-x-swat] [Bug 615479] Re: Sync xserver-xorg-video-geode 2.11.8-11 (main) from Debian unstable (main)

2010-08-11 Thread Martin-Éric Racine
** Bug watch added: Debian Bug tracker #585437
   http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=585437

** Also affects: xserver-xorg-video-geode (Debian) via
   http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=585437
   Importance: Unknown
   Status: Unknown

-- 
Sync xserver-xorg-video-geode 2.11.8-11 (main) from Debian unstable (main)
https://bugs.launchpad.net/bugs/615479
You received this bug notification because you are a member of Ubuntu-X,
which is subscribed to xserver-xorg-video-geode in ubuntu.

___
Mailing list: https://launchpad.net/~ubuntu-x-swat
Post to : ubuntu-x-swat@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-x-swat
More help   : https://help.launchpad.net/ListHelp


[Ubuntu-x-swat] [Bug 615479] Re: Sync xserver-xorg-video-geode 2.11.8-11 (main) from Debian unstable (main)

2010-08-11 Thread Martin-Éric Racine
Robert, many thanks for your help in solving this in a backward-
compatible way.  I have a 2.11.8-12 waiting to enter Debian/unstable
that implements a similar solution. Once it has entered Debian, we can
import it here as well. (see Also Affects, above)

-- 
Sync xserver-xorg-video-geode 2.11.8-11 (main) from Debian unstable (main)
https://bugs.launchpad.net/bugs/615479
You received this bug notification because you are a member of Ubuntu-X,
which is subscribed to xserver-xorg-video-geode in ubuntu.

___
Mailing list: https://launchpad.net/~ubuntu-x-swat
Post to : ubuntu-x-swat@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-x-swat
More help   : https://help.launchpad.net/ListHelp


[Ubuntu-x-swat] [Bug 615479] Re: Sync xserver-xorg-video-geode 2.11.8-11 (main) from Debian unstable (main)

2010-08-11 Thread Bug Watch Updater
** Changed in: xserver-xorg-video-geode (Debian)
   Status: Unknown = New

-- 
Sync xserver-xorg-video-geode 2.11.8-11 (main) from Debian unstable (main)
https://bugs.launchpad.net/bugs/615479
You received this bug notification because you are a member of Ubuntu-X,
which is subscribed to xserver-xorg-video-geode in ubuntu.

___
Mailing list: https://launchpad.net/~ubuntu-x-swat
Post to : ubuntu-x-swat@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-x-swat
More help   : https://help.launchpad.net/ListHelp


[Ubuntu-x-swat] [Bug 615479] Re: Sync xserver-xorg-video-geode 2.11.8-11 (main) from Debian unstable (main)

2010-08-10 Thread Robert Hooker
Martin-Éric Racine: The rules need an update to build against xserver
1.9 because /usr/share/xserver-xorg/serverminver was dropped from
xserver post squeeze.

http://git.debian.org/?p=pkg-
xorg/xsfbs.git;a=blobdiff;f=debian/xsfbs/xsfbs.mk;h=77c4a399a0d23898de6c0895a9cfa7ffe919d4be;hp=351fea5499f2b0775e3b8b468ec3c7ffc8e55582;hb=b045afbd8277ad0c44e29d7c45802053c4335ccd;hpb=8bd2e9b523da35493db1bd781d4ef6bfbbeb2eff

-- 
Sync xserver-xorg-video-geode 2.11.8-11 (main) from Debian unstable (main)
https://bugs.launchpad.net/bugs/615479
You received this bug notification because you are a member of Ubuntu-X,
which is subscribed to xserver-xorg-video-geode in ubuntu.

___
Mailing list: https://launchpad.net/~ubuntu-x-swat
Post to : ubuntu-x-swat@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-x-swat
More help   : https://help.launchpad.net/ListHelp


Re: [Ubuntu-x-swat] [Bug 615479] Re: Sync xserver-xorg-video-geode 2.11.8-11 (main) from Debian unstable (main)

2010-08-10 Thread Martin-Éric Racine
On Tue, Aug 10, 2010 at 2:33 PM, Robert Hooker wrote:
 Martin-Éric Racine: The rules need an update to build against xserver
 1.9 because /usr/share/xserver-xorg/serverminver was dropped from
 xserver post squeeze.

That is correct, except that Squeeze is not released yet.

-- 
Sync xserver-xorg-video-geode 2.11.8-11 (main) from Debian unstable (main)
https://bugs.launchpad.net/bugs/615479
You received this bug notification because you are a member of Ubuntu-X,
which is subscribed to xserver-xorg-video-geode in ubuntu.

___
Mailing list: https://launchpad.net/~ubuntu-x-swat
Post to : ubuntu-x-swat@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-x-swat
More help   : https://help.launchpad.net/ListHelp


[Ubuntu-x-swat] [Bug 615479] Re: Sync xserver-xorg-video-geode 2.11.8-11 (main) from Debian unstable (main)

2010-08-10 Thread Robert Hooker
Yes but our xserver is from a post-squeeze release, as you can see by
the FTBS it doesn't build.

Here's how I patched nvidia-current which was in the same situation
hardcoding the xsfbs variables in debian/rules for example

diff -Nru nvidia-graphics-drivers-256.44/debian/control 
nvidia-graphics-drivers-256.44/debian/control
--- nvidia-graphics-drivers-256.44/debian/control   2010-08-10 
07:27:10.0 -0400
+++ nvidia-graphics-drivers-256.44/debian/control   2010-08-10 
10:45:39.0 -0400
@@ -11,7 +11,7 @@
 Package: nvidia-current
 Architecture: i386 amd64 lpia
 Depends: x11-common (= 1:7.0.0), make, sed ( 3.0), dkms, linux-libc-dev, 
libc6-dev,
- linux-headers-generic | linux-headers, patch, acpid, ${shlibs:Depends}
+ linux-headers-generic | linux-headers, patch, acpid, ${shlibs:Depends}, 
${xinpdriver:Depends}
 Recommends: nvidia-settings
 Provides: ${xviddriver:Provides}
 Description: NVIDIA binary Xorg driver, kernel module and VDPAU library
diff -Nru nvidia-graphics-drivers-256.44/debian/control.in 
nvidia-graphics-drivers-256.44/debian/control.in
--- nvidia-graphics-drivers-256.44/debian/control.in2010-07-31 
17:25:07.0 -0400
+++ nvidia-graphics-drivers-256.44/debian/control.in2010-08-10 
10:44:28.0 -0400
@@ -11,7 +11,7 @@
 Package: #DRIVERNAME#
 Architecture: i386 amd64 lpia
 Depends: x11-common (= 1:7.0.0), make, sed ( 3.0), dkms, linux-libc-dev, 
libc6-dev,
- linux-headers-generic | linux-headers, patch, acpid, ${shlibs:Depends}
+ linux-headers-generic | linux-headers, patch, acpid, ${shlibs:Depends}, 
${xinpdriver:Depends}
 Recommends: nvidia-settings
 Provides: ${xviddriver:Provides}
 Description: NVIDIA binary Xorg driver, kernel module and VDPAU library
diff -Nru nvidia-graphics-drivers-256.44/debian/rules 
nvidia-graphics-drivers-256.44/debian/rules
--- nvidia-graphics-drivers-256.44/debian/rules 2010-07-31 17:25:07.0 
-0400
+++ nvidia-graphics-drivers-256.44/debian/rules 2010-08-10 10:44:01.0 
-0400
@@ -19,10 +19,10 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 
-SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2/dev/null)
 VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2/dev/null)
 INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2/dev/null)
-SERVER_DEPENDS = xserver-xorg-core (= $(SERVERMINVERS))
+VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2/dev/null)
+INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2/dev/null)
 VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
 
 
@@ -107,13 +107,15 @@
 # packages are built
 .PHONY: serverabi
 serverabi:
-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:Depends=$(SERVER_DEPENDS)  
debian/$(PKG_driver).substvars
+   echo xviddriver:Depends=$(VIDEODEP)  debian/$(PKG_driver).substvars
+   echo xinpdriver:Depends=$(INPUTDEP)  debian/$(PKG_driver).substvars
echo xviddriver:Provides=$(VIDDRIVER_PROVIDES)  
debian/$(PKG_driver).substvars
echo xinpdriver:Provides=$(INPDRIVER_PROVIDES)  
debian/$(PKG_driver).substvars
+   echo xserver:Depends=$(VIDEODEP), $(INPUTDEP)  
debian/$(PACKAGE).substvars
 endif
 #   $(PKG_driver).shlibs  \

-- 
Sync xserver-xorg-video-geode 2.11.8-11 (main) from Debian unstable (main)
https://bugs.launchpad.net/bugs/615479
You received this bug notification because you are a member of Ubuntu-X,
which is subscribed to xserver-xorg-video-geode in ubuntu.

___
Mailing list: https://launchpad.net/~ubuntu-x-swat
Post to : ubuntu-x-swat@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-x-swat
More help   : https://help.launchpad.net/ListHelp