Re: X Strike Force X.Org X11 SVN commit: r413 - in trunk/debian: . patches patches/general

[Eugene Konev]

> Author: dnusinow
> Date: 2005-07-26 00:15:38 -0500 (Tue, 26 Jul 2005)
> New Revision: 413

> Added:
>trunk/debian/patches/general/022_disable_xmh.diff
> Removed:
>trunk/debian/xmh.install
>trunk/debian/xmh.menu
> Modified:
>trunk/debian/TODO
>trunk/debian/changelog
>trunk/debian/control
>trunk/debian/patches/series
> Log:
> - Drop xmh
>   - Add general/022_disable_xmh.diff to not build it

Remains are still left in MANIFEST.* and xlibs-data.install. Fixing
patch attached.

diff -Nru debian.orig/MANIFEST.alpha.in debian/MANIFEST.alpha.in
--- debian.orig/MANIFEST.alpha.in   2005-07-13 12:31:02.0 +0800
+++ debian/MANIFEST.alpha.in2005-07-26 15:45:45.0 +0800
@@ -43,7 +43,6 @@
 etc/X11/app-defaults/Xman
 etc/X11/app-defaults/Xmessage
 etc/X11/app-defaults/Xmessage-color
-etc/X11/app-defaults/Xmh
 etc/X11/app-defaults/Xvidtune
 etc/X11/cursors/core.theme
 etc/X11/cursors/handhelds.theme
@@ -568,7 +567,6 @@
 usr/X11R6/bin/xmag
 usr/X11R6/bin/xman
 usr/X11R6/bin/xmessage
-usr/X11R6/bin/xmh
 usr/X11R6/bin/xmkmf
 usr/X11R6/bin/xmodmap
 usr/X11R6/bin/xmore
@@ -815,8 +813,6 @@
 usr/X11R6/include/X11/bitmaps/Term
 usr/X11R6/include/X11/bitmaps/Up
 usr/X11R6/include/X11/bitmaps/black
-usr/X11R6/include/X11/bitmaps/black6
-usr/X11R6/include/X11/bitmaps/box6
 usr/X11R6/include/X11/bitmaps/boxes
 usr/X11R6/include/X11/bitmaps/calculator
 usr/X11R6/include/X11/bitmaps/card.xbm
@@ -1791,7 +1787,6 @@
 usr/X11R6/man/man1/xmag.1x
 usr/X11R6/man/man1/xman.1x
 usr/X11R6/man/man1/xmessage.1x
-usr/X11R6/man/man1/xmh.1x
 usr/X11R6/man/man1/xmkmf.1x
 usr/X11R6/man/man1/xmodmap.1x
 usr/X11R6/man/man1/xmore.1x
diff -Nru debian.orig/MANIFEST.amd64.in debian/MANIFEST.amd64.in
--- debian.orig/MANIFEST.amd64.in   2005-07-11 02:26:56.0 +0800
+++ debian/MANIFEST.amd64.in2005-07-26 15:45:45.0 +0800
@@ -43,7 +43,6 @@
 etc/X11/app-defaults/Xman
 etc/X11/app-defaults/Xmessage
 etc/X11/app-defaults/Xmessage-color
-etc/X11/app-defaults/Xmh
 etc/X11/app-defaults/Xvidtune
 etc/X11/cursors/core.theme
 etc/X11/cursors/handhelds.theme
@@ -568,7 +567,6 @@
 usr/X11R6/bin/xmag
 usr/X11R6/bin/xman
 usr/X11R6/bin/xmessage
-usr/X11R6/bin/xmh
 usr/X11R6/bin/xmkmf
 usr/X11R6/bin/xmodmap
 usr/X11R6/bin/xmore
@@ -815,8 +813,6 @@
 usr/X11R6/include/X11/bitmaps/Term
 usr/X11R6/include/X11/bitmaps/Up
 usr/X11R6/include/X11/bitmaps/black
-usr/X11R6/include/X11/bitmaps/black6
-usr/X11R6/include/X11/bitmaps/box6
 usr/X11R6/include/X11/bitmaps/boxes
 usr/X11R6/include/X11/bitmaps/calculator
 usr/X11R6/include/X11/bitmaps/card.xbm
@@ -1806,7 +1802,6 @@
 usr/X11R6/man/man1/xmag.1x
 usr/X11R6/man/man1/xman.1x
 usr/X11R6/man/man1/xmessage.1x
-usr/X11R6/man/man1/xmh.1x
 usr/X11R6/man/man1/xmkmf.1x
 usr/X11R6/man/man1/xmodmap.1x
 usr/X11R6/man/man1/xmore.1x
diff -Nru debian.orig/MANIFEST.arm.in debian/MANIFEST.arm.in
--- debian.orig/MANIFEST.arm.in 2005-07-17 09:45:16.0 +0800
+++ debian/MANIFEST.arm.in  2005-07-26 15:45:45.0 +0800
@@ -43,7 +43,6 @@
 etc/X11/app-defaults/Xman
 etc/X11/app-defaults/Xmessage
 etc/X11/app-defaults/Xmessage-color
-etc/X11/app-defaults/Xmh
 etc/X11/app-defaults/Xvidtune
 etc/X11/cursors/core.theme
 etc/X11/cursors/handhelds.theme
@@ -567,7 +566,6 @@
 usr/X11R6/bin/xmag
 usr/X11R6/bin/xman
 usr/X11R6/bin/xmessage
-usr/X11R6/bin/xmh
 usr/X11R6/bin/xmkmf
 usr/X11R6/bin/xmodmap
 usr/X11R6/bin/xmore
@@ -814,8 +812,6 @@
 usr/X11R6/include/X11/bitmaps/Term
 usr/X11R6/include/X11/bitmaps/Up
 usr/X11R6/include/X11/bitmaps/black
-usr/X11R6/include/X11/bitmaps/black6
-usr/X11R6/include/X11/bitmaps/box6
 usr/X11R6/include/X11/bitmaps/boxes
 usr/X11R6/include/X11/bitmaps/calculator
 usr/X11R6/include/X11/bitmaps/card.xbm
@@ -1777,7 +1773,6 @@
 usr/X11R6/man/man1/xmag.1x
 usr/X11R6/man/man1/xman.1x
 usr/X11R6/man/man1/xmessage.1x
-usr/X11R6/man/man1/xmh.1x
 usr/X11R6/man/man1/xmkmf.1x
 usr/X11R6/man/man1/xmodmap.1x
 usr/X11R6/man/man1/xmore.1x
diff -Nru debian.orig/MANIFEST.hppa.in debian/MANIFEST.hppa.in
--- debian.orig/MANIFEST.hppa.in2005-07-11 02:26:56.0 +0800
+++ debian/MANIFEST.hppa.in 2005-07-26 15:45:45.0 +0800
@@ -43,7 +43,6 @@
 etc/X11/app-defaults/Xman
 etc/X11/app-defaults/Xmessage
 etc/X11/app-defaults/Xmessage-color
-etc/X11/app-defaults/Xmh
 etc/X11/app-defaults/Xvidtune
 etc/X11/cursors/core.theme
 etc/X11/cursors/handhelds.theme
@@ -567,7 +566,6 @@
 usr/X11R6/bin/xmag
 usr/X11R6/bin/xman
 usr/X11R6/bin/xmessage
-usr/X11R6/bin/xmh
 usr/X11R6/bin/xmkmf
 usr/X11R6/bin/xmodmap
 usr/X11R6/bin/xmore
@@ -814,8 +812,6 @@
 usr/X11R6/include/X11/bitmaps/Term
 usr/X11R6/include/X11/bitmaps/Up
 usr/X11R6/include/X11/bitmaps/black
-usr/X11R6/include/X11/bitmaps/black6
-usr/X11R6/include/X11/bitmaps/box6
 usr/X11R6/include/X11/bitmaps/boxes
 usr/X11R6/include/X11/bitmaps/calculator
 usr/X11R6/include/X11/bitmaps/card.xbm
@@ -1698,7 +1694,6 @@
 usr/X11R6/man/man1/xmag.1x
 usr/X11R6/man/man1/xman.1x
 usr/X11R6/man/man1/xmessage.1x
-usr

Minor fix to debian/rules

[Eugene Konev]

$(STAMP_DIR)/build target in debian/rules should depend on
$(STAMP_DIR)/setup, not phony setup. One line fix attached.

diff -Nru debian.orig/rules debian/rules
--- debian.orig/rules   2005-07-22 11:41:05.0 +0800
+++ debian/rules2005-07-26 15:34:38.0 +0800
@@ -285,7 +285,7 @@
 
 # DO NOT CHANGE THIS RULE WITHOUT CHECKING FOR SYNCHRONICITY WITH THE 
build-server RULE BELOW
 real-build: $(STAMP_DIR)/build
-$(STAMP_DIR)/build: setup $(STAMP_DIR)/genscripts
+$(STAMP_DIR)/build: $(STAMP_DIR)/setup $(STAMP_DIR)/genscripts
# build Debian's X server wrapper
$(CC) -Wall -g -O2 -o debian/local/xserver-wrapper 
debian/local/xserver-wrapper.c
# Generate plain text documents from (X)HTML.

Re: X Strike Force X.Org X11 SVN commit: r410 - trunk/debian

[Thomas Dickey]

X Strike Force SVN Repository Admin <[EMAIL PROTECTED]> wrote:
> Author: dnusinow
> Date: 2005-07-25 23:33:23 -0500 (Mon, 25 Jul 2005)
> New Revision: 410

> Modified:
>trunk/debian/TODO
> Log:
> - Update TODO. 
>   - Splitting out xterm is *really* appealing, but not a priority. Let's
>   just push ahead to the modular tree and get it for free there.

Splitting out xterm is independent of the modular tree, since xterm already
builds by itself, and has no relationship to the modular tree development.

-- 
Thomas E. Dickey
http://invisible-island.net
ftp://invisible-island.net


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

Bug#319237: xterm should be built with IUTF8 support (for correct tty cooked mode)

[Vincent Lefevre]

On 2005-07-20 18:30:39 +0200, Vincent Lefevre wrote:
> The xterm source knows about IUTF8, but for some reasons xterm is not
> built with IUTF8 support.

I managed to compile xterm from upstream and IUTF8 support with
the attached patch. Not sure about side effects or portability
or missing features or whatever, though.

-- 
Vincent Lefèvre <[EMAIL PROTECTED]> - Web: 
100% accessible validated (X)HTML - Blog: 
Work: CR INRIA - computer arithmetic / SPACES project at LORIA
diff -ru xterm-203/main.c xterm-new/main.c
--- xterm-203/main.c2005-07-07 02:46:14.0 +0200
+++ xterm-new/main.c2005-07-26 14:45:21.0 +0200
@@ -162,11 +162,6 @@
 #define USE_SYSV_PGRP
 #define USE_SYSV_SIGNALS
 #define WTMP
-#ifdef __GLIBC__
-#if (__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 1))
-#include 
-#endif
-#endif
 #endif
 
 #ifdef __MVS__
diff -ru xterm-203/xterm_io.h xterm-new/xterm_io.h
--- xterm-203/xterm_io.h2005-07-07 02:46:15.0 +0200
+++ xterm-new/xterm_io.h2005-07-26 14:45:07.0 +0200
@@ -128,8 +128,6 @@
  */
 #ifdef __QNX__
 #include 
-#elif !defined(__CYGWIN__)
-#include 
 #endif
 
 /*
@@ -138,7 +136,7 @@
 #if defined(USE_POSIX_TERMIOS)
 #include 
 #elif defined(USE_TERMIOS)
-#include 
+#include 
 /* this hacked termios support only works on SYSV */
 #define USE_ANY_SYSV_TERMIO
 #define termio termios

Bug#319947: Current RADEON driver in xserver-xorg is ancient.

[drac]

On Tue, 26 Jul 2005, Daniel Stone wrote:


Desktops, or AGPMode 8x, not to mention r300 drivers from DRI CVS. X.Org CVS
Snapshots, like 6.8.99.15 does. Maybe RADEON driver should be backported
from HEAD to current Debian X.Org ?


X.Org HEAD does not have the r300 DRI drivers, however.



True, but driver "radeon" in HEAD support r300 driver, so r300_dri.so
plus kernel DRM is all you need. For 6.8.2 you need to patch X.Org sources 
before compiling.


Sorry for my phrasing, and thanks.

- [EMAIL PROTECTED]


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

Re: X Strike Force X.Org X11 SVN commit: r405 - in trunk/debian: . local po scripts

[David Martínez Moreno]

El Domingo, 24 de Julio de 2005 06:46, X Strike Force SVN Repository Admin 
escribió:
[...]
> Log:
> - Edit various Debian files for XFree86 -> X.Org branding changes
[...]

AARGH...we decided to do the same thing! I was 
disconnected this weekend with only a local copy and thought it was worth the 
time to do this TODO item. :-( Duplicate work.

I will review the pending changes (if any! :-) ) I have in my local 
copy and 
I will send to you.

Best regards,


Ender.
-- 
I once farted on the set of Blue Lagoon.
-- Brooke Shields (South Park).
--
Debian developer


pgp6W2TIYPsCZ.pgp
Description: PGP signature

Re: X Strike Force X.Org X11 SVN commit: r398 - branches/6.9

[David Martínez Moreno]

El Sábado, 23 de Julio de 2005 20:21, X Strike Force SVN Repository Admin 
escribió:
> Author: dnusinow
> Date: 2005-07-23 13:21:57 -0500 (Sat, 23 Jul 2005)
> New Revision: 398
>
> Removed:
>branches/6.9/xc/
> Log:
> We don't want to keep xc around any more

Hello, David. How are you working on this? Is maybe xc/ a local CVS 
copy from 
fd.org, not suitable to stay in SVN?

Best regards,


Ender.
-- 
Vous au moins, vous ne risquez pas d'être un légume, puisque même
 un artichaud a du coeur.
-- Amélie (Le fabuleux destin d'Amélie Poulain).
--
Debian developer


pgpdEZbTHpmjf.pgp
Description: PGP signature

Re: Bug#319707: INTL:vi Vietnamese translation for xorg-x11

[David Martínez Moreno]

El Domingo, 24 de Julio de 2005 10:41, Clytie Siddall escribió:
> Does this name change mean I should delete the previous XFree86  
> debconf translation file?

Hello, Clytie. What do you mean by "delete the previous XFree86 debconf 
translation file"? Delete it from...where? Your repository?

> Also, I hope you don't mind me asking, but I've asked on the XFree86  
> list and had no response: whom should I ask about Unicode input  
> problems in X11 under Mac OSX?

If you are using XFree86, in the XFree86 list, in you  are using X.Org, 
in 
the X.Org lists.

Best regards,


Ender.
-- 
- Pirata: Arrrgh... Mi bisabuela de 98 años tiene mejores bíceps que tú.
- Guybrush Threepwood: Ugh, sí, pero tanto ella como yo tenemos mejor control 
de la vejiga que tú.
-- Duelo de insultos en Escape from Monkey Island.
--
Debian developer


pgplCEIJvkKne.pgp
Description: PGP signature

Re: X Strike Force X.Org X11 SVN commit: r398 - branches/6.9

[David Nusinow]

On Tue, Jul 26, 2005 at 04:55:35PM +0200, David Martínez Moreno wrote:
> El Sábado, 23 de Julio de 2005 20:21, X Strike Force SVN Repository Admin 
> escribió:
> > Author: dnusinow
> > Date: 2005-07-23 13:21:57 -0500 (Sat, 23 Jul 2005)
> > New Revision: 398
> >
> > Removed:
> >branches/6.9/xc/
> > Log:
> > We don't want to keep xc around any more
> 
>   Hello, David. How are you working on this? Is maybe xc/ a local CVS 
> copy from 
> fd.org, not suitable to stay in SVN?

Yeah, it's a snapshot release from a while ago, although I'll probably put
it in to the vendor directory when I start doing serious work on it. If you
or anyone else wants to start work on it, I can upload it tonight.

 - David Nusinow


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

Re: X Strike Force X.Org X11 SVN commit: r405 - in trunk/debian: . local po scripts

[David Nusinow]

On Tue, Jul 26, 2005 at 04:42:56PM +0200, David Martínez Moreno wrote:
> El Domingo, 24 de Julio de 2005 06:46, X Strike Force SVN Repository Admin 
> escribió:
> [...]
> > Log:
> > - Edit various Debian files for XFree86 -> X.Org branding changes
> [...]
> 
>   AARGH...we decided to do the same thing! I was 
> disconnected this weekend with only a local copy and thought it was worth the 
> time to do this TODO item. :-( Duplicate work.
> 
>   I will review the pending changes (if any! :-) ) I have in my local 
> copy and 
> I will send to you.

Ouch, sorry about that. For what it's worth the changes weren't too great.
Most of them were in comments for install scripts and such. If you catch
anything I missed, that'd be awesome though. I'll try and mark my name on
the TODO list for items I'm tackling to prevent this in the future, but
this was really about 10 minutes worth of work, so it probably wouldn't
have helped in this case.

 - David Nusinow


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

Re: X Strike Force X.Org X11 SVN commit: r410 - trunk/debian

[David Nusinow]

On Tue, Jul 26, 2005 at 10:13:32AM +, Thomas Dickey wrote:
> X Strike Force SVN Repository Admin <[EMAIL PROTECTED]> wrote:
> > Author: dnusinow
> > Date: 2005-07-25 23:33:23 -0500 (Mon, 25 Jul 2005)
> > New Revision: 410
> 
> > Modified:
> >trunk/debian/TODO
> > Log:
> > - Update TODO. 
> >   - Splitting out xterm is *really* appealing, but not a priority. Let's
> > just push ahead to the modular tree and get it for free there.
> 
> Splitting out xterm is independent of the modular tree, since xterm already
> builds by itself, and has no relationship to the modular tree development.

Right, but we'll be forced to do this for the modular tree anyway, so I
feel like we should just press ahead towards that, and take care of it
then. When we get there, I'd like to ship your version of xterm directly,
rather than whatever X.Org may ship in the modular tree.  If someone feels
like specifically maintaining xterm for Debian (Branden?) we can split this
out now, but I unfortunately don't have the time to handle it myself right
now.

 - David Nusinow


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

Re: X Strike Force X.Org X11 SVN commit: r410 - trunk/debian

[Michel Dänzer]

On Tue, 2005-07-26 at 11:37 -0400, David Nusinow wrote:
> On Tue, Jul 26, 2005 at 10:13:32AM +, Thomas Dickey wrote:
> > 
> > > - Update TODO. 
> > >   - Splitting out xterm is *really* appealing, but not a priority. Let's
> > >   just push ahead to the modular tree and get it for free there.
> > 
> > Splitting out xterm is independent of the modular tree, since xterm already
> > builds by itself, and has no relationship to the modular tree development.
> 
> Right, but we'll be forced to do this for the modular tree anyway, so I
> feel like we should just press ahead towards that, and take care of it
> then. When we get there, I'd like to ship your version of xterm directly,
> rather than whatever X.Org may ship in the modular tree.

X.org won't ship xterm (or any other external package, for that matter)
in the modular tree, that's one of the more important points of
modularization. IMO it would be really good if someone packaged Thomas's
xterm ASAP and we stopped building it from xorg-x11.


-- 
Earthling Michel Dänzer  | Debian (powerpc), X and DRI developer
Libre software enthusiast|   http://svcs.affero.net/rm.php?r=daenzer

X Strike Force X.Org X11 SVN commit: r414 - trunk/debian

[X Strike Force SVN Repository Admin]

Author: dnusinow
Date: 2005-07-26 10:45:49 -0500 (Tue, 26 Jul 2005)
New Revision: 414

Modified:
   trunk/debian/MANIFEST.alpha.in
   trunk/debian/MANIFEST.amd64.in
   trunk/debian/MANIFEST.arm.in
   trunk/debian/MANIFEST.hppa.in
   trunk/debian/MANIFEST.hurd-i386.in
   trunk/debian/MANIFEST.i386.in
   trunk/debian/MANIFEST.ia64.in
   trunk/debian/MANIFEST.m68k.in
   trunk/debian/MANIFEST.mips.in
   trunk/debian/MANIFEST.mipsel.in
   trunk/debian/MANIFEST.powerpc.in
   trunk/debian/MANIFEST.s390.in
   trunk/debian/MANIFEST.sparc.in
   trunk/debian/changelog
   trunk/debian/xlibs-data.install
   trunk/debian/xlibs-data.install.s390
Log:
- Continue droppping xmh
  - Apply patch from Eugene Konev to remove xmh from MANIFEST files and
xlibs-data.install


Modified: trunk/debian/MANIFEST.alpha.in
===
--- trunk/debian/MANIFEST.alpha.in  2005-07-26 05:15:38 UTC (rev 413)
+++ trunk/debian/MANIFEST.alpha.in  2005-07-26 15:45:49 UTC (rev 414)
@@ -43,7 +43,6 @@
 etc/X11/app-defaults/Xman
 etc/X11/app-defaults/Xmessage
 etc/X11/app-defaults/Xmessage-color
-etc/X11/app-defaults/Xmh
 etc/X11/app-defaults/Xvidtune
 etc/X11/cursors/core.theme
 etc/X11/cursors/handhelds.theme
@@ -568,7 +567,6 @@
 usr/X11R6/bin/xmag
 usr/X11R6/bin/xman
 usr/X11R6/bin/xmessage
-usr/X11R6/bin/xmh
 usr/X11R6/bin/xmkmf
 usr/X11R6/bin/xmodmap
 usr/X11R6/bin/xmore
@@ -815,8 +813,6 @@
 usr/X11R6/include/X11/bitmaps/Term
 usr/X11R6/include/X11/bitmaps/Up
 usr/X11R6/include/X11/bitmaps/black
-usr/X11R6/include/X11/bitmaps/black6
-usr/X11R6/include/X11/bitmaps/box6
 usr/X11R6/include/X11/bitmaps/boxes
 usr/X11R6/include/X11/bitmaps/calculator
 usr/X11R6/include/X11/bitmaps/card.xbm
@@ -1791,7 +1787,6 @@
 usr/X11R6/man/man1/xmag.1x
 usr/X11R6/man/man1/xman.1x
 usr/X11R6/man/man1/xmessage.1x
-usr/X11R6/man/man1/xmh.1x
 usr/X11R6/man/man1/xmkmf.1x
 usr/X11R6/man/man1/xmodmap.1x
 usr/X11R6/man/man1/xmore.1x

Modified: trunk/debian/MANIFEST.amd64.in
===
--- trunk/debian/MANIFEST.amd64.in  2005-07-26 05:15:38 UTC (rev 413)
+++ trunk/debian/MANIFEST.amd64.in  2005-07-26 15:45:49 UTC (rev 414)
@@ -43,7 +43,6 @@
 etc/X11/app-defaults/Xman
 etc/X11/app-defaults/Xmessage
 etc/X11/app-defaults/Xmessage-color
-etc/X11/app-defaults/Xmh
 etc/X11/app-defaults/Xvidtune
 etc/X11/cursors/core.theme
 etc/X11/cursors/handhelds.theme
@@ -568,7 +567,6 @@
 usr/X11R6/bin/xmag
 usr/X11R6/bin/xman
 usr/X11R6/bin/xmessage
-usr/X11R6/bin/xmh
 usr/X11R6/bin/xmkmf
 usr/X11R6/bin/xmodmap
 usr/X11R6/bin/xmore
@@ -815,8 +813,6 @@
 usr/X11R6/include/X11/bitmaps/Term
 usr/X11R6/include/X11/bitmaps/Up
 usr/X11R6/include/X11/bitmaps/black
-usr/X11R6/include/X11/bitmaps/black6
-usr/X11R6/include/X11/bitmaps/box6
 usr/X11R6/include/X11/bitmaps/boxes
 usr/X11R6/include/X11/bitmaps/calculator
 usr/X11R6/include/X11/bitmaps/card.xbm
@@ -1806,7 +1802,6 @@
 usr/X11R6/man/man1/xmag.1x
 usr/X11R6/man/man1/xman.1x
 usr/X11R6/man/man1/xmessage.1x
-usr/X11R6/man/man1/xmh.1x
 usr/X11R6/man/man1/xmkmf.1x
 usr/X11R6/man/man1/xmodmap.1x
 usr/X11R6/man/man1/xmore.1x

Modified: trunk/debian/MANIFEST.arm.in
===
--- trunk/debian/MANIFEST.arm.in2005-07-26 05:15:38 UTC (rev 413)
+++ trunk/debian/MANIFEST.arm.in2005-07-26 15:45:49 UTC (rev 414)
@@ -43,7 +43,6 @@
 etc/X11/app-defaults/Xman
 etc/X11/app-defaults/Xmessage
 etc/X11/app-defaults/Xmessage-color
-etc/X11/app-defaults/Xmh
 etc/X11/app-defaults/Xvidtune
 etc/X11/cursors/core.theme
 etc/X11/cursors/handhelds.theme
@@ -567,7 +566,6 @@
 usr/X11R6/bin/xmag
 usr/X11R6/bin/xman
 usr/X11R6/bin/xmessage
-usr/X11R6/bin/xmh
 usr/X11R6/bin/xmkmf
 usr/X11R6/bin/xmodmap
 usr/X11R6/bin/xmore
@@ -814,8 +812,6 @@
 usr/X11R6/include/X11/bitmaps/Term
 usr/X11R6/include/X11/bitmaps/Up
 usr/X11R6/include/X11/bitmaps/black
-usr/X11R6/include/X11/bitmaps/black6
-usr/X11R6/include/X11/bitmaps/box6
 usr/X11R6/include/X11/bitmaps/boxes
 usr/X11R6/include/X11/bitmaps/calculator
 usr/X11R6/include/X11/bitmaps/card.xbm
@@ -1777,7 +1773,6 @@
 usr/X11R6/man/man1/xmag.1x
 usr/X11R6/man/man1/xman.1x
 usr/X11R6/man/man1/xmessage.1x
-usr/X11R6/man/man1/xmh.1x
 usr/X11R6/man/man1/xmkmf.1x
 usr/X11R6/man/man1/xmodmap.1x
 usr/X11R6/man/man1/xmore.1x

Modified: trunk/debian/MANIFEST.hppa.in
===
--- trunk/debian/MANIFEST.hppa.in   2005-07-26 05:15:38 UTC (rev 413)
+++ trunk/debian/MANIFEST.hppa.in   2005-07-26 15:45:49 UTC (rev 414)
@@ -43,7 +43,6 @@
 etc/X11/app-defaults/Xman
 etc/X11/app-defaults/Xmessage
 etc/X11/app-defaults/Xmessage-color
-etc/X11/app-defaults/Xmh
 etc/X11/app-defaults/Xvidtune
 etc/X11/cursors/core.theme
 etc/X11/cursors/handhelds.theme
@@ -567,7 +566,6 @@
 usr/X11R6/bin/xmag
 usr/X11R6/bin/xman
 usr/X11R6/bin/xmessage
-usr/X11R6/bin/xmh
 usr/X11R6/bin/xmkmf
 usr/X11R6/

Re: X Strike Force X.Org X11 SVN commit: r410 - trunk/debian

[David Nusinow]

On Tue, Jul 26, 2005 at 11:42:34AM -0400, Michel Dänzer wrote:
> X.org won't ship xterm (or any other external package, for that matter)
> in the modular tree, that's one of the more important points of
> modularization. IMO it would be really good if someone packaged Thomas's
> xterm ASAP and we stopped building it from xorg-x11.

Well, this would be cool. If someone wants to do it, I'm game, I just don't
have time to do it myself right now. I'll add it back to the TODO list for
the unspecified future but if someone wants to tackle it for -5, I'll apply
the patches.

 - David Nusinow


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

X Strike Force X.Org X11 SVN commit: r415 - trunk/debian

[X Strike Force SVN Repository Admin]

Author: dnusinow
Date: 2005-07-26 10:54:27 -0500 (Tue, 26 Jul 2005)
New Revision: 415

Modified:
   trunk/debian/changelog
   trunk/debian/rules
Log:
- Clean up changelog. Eugene and I have worked on some tasks together, so
  give us a section together.
- Apply patch from Eugene to debian/rules. Fixes real-build target to not
  depend on the phony setup.


Modified: trunk/debian/changelog
===
--- trunk/debian/changelog  2005-07-26 15:45:49 UTC (rev 414)
+++ trunk/debian/changelog  2005-07-26 15:54:27 UTC (rev 415)
@@ -3,9 +3,6 @@
   Changes by David Nusinow:
  - Incorporate ELF loader patch for arm. Thanks Steve Langasek.
Closes: #319298
- - Switch from dbs to quilt based on Eugene Konev's work
-   - Document how to use the system in debian/README
-   - Re-organize patches in to subdirectories
  - Re-enable failure on manifest check fail
  - Deal with Speedo fonts removal
- Document in NEWS.Debian
@@ -13,10 +10,6 @@
  translators!
  - Edit various Debian files for XFree86 -> X.Org branding changes
  - Remove general/033_no_html.diff
- - Drop xmh
-   - Add general/022_disable_xmh.diff to not build it
-   - Remove xmh from MANIFEST files and xlibs-data.installs (Thanks Eugene
- Konev)
 
   Changes by Eugene Konev:
  - Do not impose selinux on the whole world out there: move selinux 
@@ -29,6 +22,14 @@
   Changes by Julien Cristau:
  - Clean up FAQ to refer to X.Org instead of XFree86. Closes: #319407
 
+  Changes by Eugene Konev and David Nusinow
+ - Switch from dbs to quilt
+   - Document how to use the system in debian/README
+   - Re-organize patches in to subdirectories
+ - Drop xmh
+   - Add general/022_disable_xmh.diff to not build it
+   - Remove xmh from MANIFEST files and xlibs-data.installs
+
  -- David Nusinow <[EMAIL PROTECTED]>  Wed, 20 Jul 2005 14:38:43 -0400
 
 xorg-x11 (6.8.2.dfsg.1-4) unstable; urgency=low

Modified: trunk/debian/rules
===
--- trunk/debian/rules  2005-07-26 15:45:49 UTC (rev 414)
+++ trunk/debian/rules  2005-07-26 15:54:27 UTC (rev 415)
@@ -285,7 +285,7 @@
 
 # DO NOT CHANGE THIS RULE WITHOUT CHECKING FOR SYNCHRONICITY WITH THE 
build-server RULE BELOW
 real-build: $(STAMP_DIR)/build
-$(STAMP_DIR)/build: setup $(STAMP_DIR)/genscripts
+$(STAMP_DIR)/build: $(STAMP_DIR)/setup $(STAMP_DIR)/genscripts
# build Debian's X server wrapper
$(CC) -Wall -g -O2 -o debian/local/xserver-wrapper 
debian/local/xserver-wrapper.c
# Generate plain text documents from (X)HTML.


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

X Strike Force X.Org X11 SVN commit: r416 - trunk/debian

[X Strike Force SVN Repository Admin]

Author: dnusinow
Date: 2005-07-26 11:03:09 -0500 (Tue, 26 Jul 2005)
New Revision: 416

Modified:
   trunk/debian/TODO
Log:
TODO update

Modified: trunk/debian/TODO
===
--- trunk/debian/TODO   2005-07-26 15:54:27 UTC (rev 415)
+++ trunk/debian/TODO   2005-07-26 16:03:09 UTC (rev 416)
@@ -59,6 +59,8 @@
 
 unspecified future
 --
+* Split out xterm and ship Thomas Dickey's version as upstream
+
 * Grab fix for xfree86 extension library manpage generation from 
freedesktop.org
   xorg CVS HEAD (2005-05-14):
   1.3   +4 -16 xc/programs/Xserver/hw/xfree86/doc/man/Imakefile


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

Re: X Strike Force X.Org X11 SVN commit: r410 - trunk/debian

[David Martínez Moreno]

El Martes, 26 de Julio de 2005 17:50, David Nusinow escribió:
> On Tue, Jul 26, 2005 at 11:42:34AM -0400, Michel Dänzer wrote:
> > X.org won't ship xterm (or any other external package, for that matter)
> > in the modular tree, that's one of the more important points of
> > modularization. IMO it would be really good if someone packaged Thomas's
> > xterm ASAP and we stopped building it from xorg-x11.
>
> Well, this would be cool. If someone wants to do it, I'm game, I just don't
> have time to do it myself right now. I'll add it back to the TODO list for
> the unspecified future but if someone wants to tackle it for -5, I'll apply
> the patches.

I feel that given that at least now there are several people working in 
the 
name of XSF (I consider myself one of them), I am all for splitting xterm 
just now and maintain on a XSF basis, that is, I can package it and upload, 
and (at least by now) maintain all the sources in the XSF SVN. And have at 
least another uploader, you. :-)

Best regards,


Ender.

PS: I will try to pursue today Branden and choke him until he open me an 
account.
-- 
We accidentally replaced your heart with a baked potato. You have
 about three seconds to live.
-- Dr. Doctor to Kenny (South Park).
--
Debian developer


pgpUj9JBF6zAP.pgp
Description: PGP signature

[PATCH] Include main X.Org changelog.

[David Martínez Moreno]

Hello. In the attached patch I have added the main X.Org changelog into 
x11-common documents.

Best regards,


Ender.
-- 
Non. Je suis la belette de personne.
-- Amélie (Le fabuleux destin d'Amélie Poulain).
--
Debian developer
Index: debian/x11-common.docs
===
--- debian/x11-common.docs	(revisión: 413)
+++ debian/x11-common.docs	(copia de trabajo)
@@ -1,3 +1,4 @@
+build-tree/xc/ChangeLog
 build-tree/xc/programs/Xserver/hw/xfree86/CHANGELOG
 build-tree/xc/programs/Xserver/hw/xfree86/CHANGELOG.ND
 build-tree/xc/programs/Xserver/hw/xfree86/CHANGELOG.R5


pgp0X413k1BXD.pgp
Description: PGP signature

Re: X Strike Force X.Org X11 SVN commit: r410 - trunk/debian

[David Nusinow]

On Tue, Jul 26, 2005 at 06:58:01PM +0200, David Martínez Moreno wrote:
> El Martes, 26 de Julio de 2005 17:50, David Nusinow escribió:
> > On Tue, Jul 26, 2005 at 11:42:34AM -0400, Michel Dänzer wrote:
> > > X.org won't ship xterm (or any other external package, for that matter)
> > > in the modular tree, that's one of the more important points of
> > > modularization. IMO it would be really good if someone packaged Thomas's
> > > xterm ASAP and we stopped building it from xorg-x11.
> >
> > Well, this would be cool. If someone wants to do it, I'm game, I just don't
> > have time to do it myself right now. I'll add it back to the TODO list for
> > the unspecified future but if someone wants to tackle it for -5, I'll apply
> > the patches.
> 
>   I feel that given that at least now there are several people working in 
> the 
> name of XSF (I consider myself one of them), I am all for splitting xterm 
> just now and maintain on a XSF basis, that is, I can package it and upload, 
> and (at least by now) maintain all the sources in the XSF SVN. And have at 
> least another uploader, you. :-)

It's all yours. Go for it!

 - David Nusinow


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

X Strike Force X.Org X11 SVN commit: r417 - trunk/debian

[X Strike Force SVN Repository Admin]

Author: dnusinow
Date: 2005-07-26 13:11:22 -0500 (Tue, 26 Jul 2005)
New Revision: 417

Modified:
   trunk/debian/changelog
   trunk/debian/x11-common.docs
Log:
Changes by David Mart?\195?\173nez Moreno
   - Include upstream X.Org changelog in x11-common documents


Modified: trunk/debian/changelog
===
--- trunk/debian/changelog  2005-07-26 16:03:09 UTC (rev 416)
+++ trunk/debian/changelog  2005-07-26 18:11:22 UTC (rev 417)
@@ -22,6 +22,9 @@
   Changes by Julien Cristau:
  - Clean up FAQ to refer to X.Org instead of XFree86. Closes: #319407
 
+  Changes by David Martínez Moreno
+ - Include upstream X.Org changelog in x11-common documents
+
   Changes by Eugene Konev and David Nusinow
  - Switch from dbs to quilt
- Document how to use the system in debian/README

Modified: trunk/debian/x11-common.docs
===
--- trunk/debian/x11-common.docs2005-07-26 16:03:09 UTC (rev 416)
+++ trunk/debian/x11-common.docs2005-07-26 18:11:22 UTC (rev 417)
@@ -1,3 +1,4 @@
+build-tree/xc/ChangeLog
 build-tree/xc/programs/Xserver/hw/xfree86/CHANGELOG
 build-tree/xc/programs/Xserver/hw/xfree86/CHANGELOG.ND
 build-tree/xc/programs/Xserver/hw/xfree86/CHANGELOG.R5


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

Bug#319947: Current RADEON driver in xserver-xorg is ancient.

[David Nusinow]

Hello,

On Tue, Jul 26, 2005 at 12:42:29AM +0300, Samuli Suominen wrote:
> Package: xserver-xorg
> Version: 6.8.2.dfsg.1-4
> Severity: wishlist
> 
> 
> Current RADEON driver in X.Org 6.8.2 doesn't support Non-Rectangular MergedFB
> Desktops, or AGPMode 8x, not to mention r300 drivers from DRI CVS. X.Org CVS
> Snapshots, like 6.8.99.15 does. Maybe RADEON driver should be backported
> from HEAD to current Debian X.Org ? Would be lovely to use Debian again,
> with Fast, Accellerated, Open Source Dualhead.

Since we are just barely caught up with upstream, and the 6.9/7.0 release
is imminent, I'd rather spend time getting packages for 6.9 in to shape so
that they can hit experimental as soon as possible. While backporting
drivers is tempting, I feel that our time is better spent on 6.9, and then
moving on to 7.0. That will get us all the drivers, rather than having to
backport them one at a time (and then maintain those backports in the
future), as well as whatever fixes in good time.

 - David Nusinow


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

Bug#287876: File $HOME/.xsession-errors grows very large

[Harri Suutari]

Hi!

This problem just should be fixed. A running Debian system just
kills itself by filling the hard disk with .xsession-errors
files. Unless, of course, the administrator or all users
know how to prevent it.

I fixed it by editing my /etc/X11/Xsession:

Changed this:
exec >>"$ERRFILE" 2>&1

to be like this:
exec >"$ERRFILE" 2>&1

Now the .xsession-errors file is initialized everytime when
a user logs in.

Best regards,
-- 

-- Harri --


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

Bug#319707: INTL:vi Vietnamese translation for xorg-x11

[David Nusinow]

Hi Clytie!

On Sun, Jul 24, 2005 at 06:11:29PM +0930, Clytie Siddall wrote:
> Package: xorg-x11
> Version: 6.8.2.dfsg.1-3
> Severity: wishlist
> Tags: l10n, patch
> 
> Please find attached the Vietnamese translation for debconf template:  
> xorg-x11

I'm not going to apply this because I've recently broken the translations
yet again by cleaning up the XFree86 branding. The current version is in
the svn repo, and I'm going to send a mail to the translation list so that
everyone is aware of what's going on.

Another thing to note is that Branden has plans to rewrite the xserver-xorg
debconf scripts from scratch, which will require all new templates.
Whenever he gets moving on this, we'll let everyone know via the
translation list.
 
> Does this name change mean I should delete the previous XFree86  
> debconf translation file?

You might want to keep it around, since we'll be supporting xfree86 as long
as we support sarge. After sarge is past its support phase though, feel
free to get rid of it.
 
> Also, I hope you don't mind me asking, but I've asked on the XFree86  
> list and had no response: whom should I ask about Unicode input  
> problems in X11 under Mac OSX?

I honestly don't know the answer to this. Probably a Mac-specific forum.
Thanks for the translation!

 - David Nusinow


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

Bug#320059: xvfb: SEGV in XCopyPlane() triggered by VSW4 test suite (part of LSB 3.0 certification suite)

[Branden Robinson]

Package: xvfb
Version: 4.3.0.dfsg.1-14
Severity: important
Tags: upstream fixed-upstream

Xvfb has a bug in it that is tickled by the VSW4 test suite.  One of the
tests in that suite (/tset/CH06/cpypln/cpypln 3), now enabled as part of
the LSB 3.0 conformance checks, causes xvfb to SEGV in XCopyPlane().

Jeff Licquia tells me that the Xvfb from X.Org X11 6.8.1 fixed this
problem; it should therefore be possible to borrow a patch from
freedesktop.org CVS or the X.Org X11 6.8.2 packages to fix this.

We may want to try to push this fix into a stable-update release for sarge;
while not in itself an LSB test failure, it does make using Debian Sarge
itself as a platform for testing LSB conformance significantly more painful
than it should be.  Jeff says this is actually "vital" for demonstrating
the LSB conformance of Sarge, assuming our other (relatively few)
LSB-related problems are resolved.

(This is not a problem for LSB 2.0, because that version's conformance test
suite switches this test off.)

CCing Matt Taggart so that he knows to flag this as a Sarge LSB issue.

-- System Information:
Debian Release: testing/unstable
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'stable')
Architecture: powerpc (ppc)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.9-powerpc-smp
Locale: LANG=C, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)


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

Processed: Re: Bug#320041: libgtk1.2-dev: fails to install

[Debian Bug Tracking System]

Processing commands for [EMAIL PROTECTED]:

> severity 320041 important
Bug#320041: libgtk1.2-dev: fails to install
Severity set to `important'.

> tags 320041 moreinfo unreproducible
Bug#320041: libgtk1.2-dev: fails to install
There were no tags set.
Tags added: moreinfo, unreproducible

> reassign 320041 libx11-dev
Bug#320041: libgtk1.2-dev: fails to install
Bug reassigned from package `libgtk1.2-dev' to `libx11-dev'.

> thanks
Stopping processing here.

Please contact me if you need assistance.

Debian bug tracking system administrator
(administrator, Debian Bugs database)


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

Bug#319822: Crashes running vim in uxterm

[Andrew Moise]

On Mon, 2005-07-25 at 05:20 -0400, Thomas Dickey wrote:
> Is this for "any" file, or for only particular ones?
> (There was a similar report last year that was apparently in the X libraries).

  Er, sorry, my report was a little incoherent I guess.  Running vim on
no file (just 'vim') crashed the xterm for me.  Opening every file I
tried (only 2-3) crashed as soon as I entered insert mode.  Now, though,
it doesn't ever crash, and I haven't done any upgrading or reconfiguring
in the interim.  Huh.  It happened that I had rebooted between
installing xserver-xorg and noticing this problem, but maybe there were
some lingering upgrade issues...
  If the problem reappears, I'll try to track it down in more detail.
It's very noticeable. :-)

> Also - is this for the bitmap fonts, or for some TrueType font?

  I'm not sure what fonts xterm is using; is there an easy way to check?

-- 
Andrew Moise <[EMAIL PROTECTED]>



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

Bug#319822: Crashes running vim in uxterm

[Andrew Moise]

On Tue, 2005-07-26 at 19:43 -0400, Thomas Dickey wrote:
> On Tue, Jul 26, 2005 at 07:12:04PM -0400, Andrew Moise wrote:
> > On Mon, 2005-07-25 at 05:20 -0400, Thomas Dickey wrote:
> > > Also - is this for the bitmap fonts, or for some TrueType font?
> > 
> >   I'm not sure what fonts xterm is using; is there an easy way to check?
> 
> The easy way to check is if the "TrueType Fonts" is checked in the
> right-control-mouse menu.  You could have some resource set to start
> xterm in that mode, but normally it uses the bitmap fonts.  (I was
> checking this to see if there was some odd configuration detail that
> wasn't apparent).

  Ah, okay.  That menu shows for me like so:

---

  Unicode Fonts

* Default
  Unreadable
  Tiny
  Small
  Medium
  Large
  Huge
  Escape sequence (greyed out)
  Selection
-
  Line-Drawing Characters
* Doublesized Characters
-
  TrueType Fonts (greyed out)
* UTF-8 (greyed out)

-

  Also, my xterm-related resources are like so:

-

!!!
! xterm (and friends)

XTerm*highlightSelection:  true
! Uncomment this to use color for the bold attribute
XTerm*VT100*colorBDMode:  on
XTerm*VT100*colorBD:  blue
! Uncomment this to use color for underline attribute
XTerm.VT100*colorULMode:  on
XTerm.VT100*underLine:  off
XTerm*VT100*colorUL:  magenta
! Uncomment this to display the scrollbar 
XTerm*scrollBar:  true

! This resource specifies whether or not to ignore the 'alternate screen'
! of applications such as vi.  When it is on, these applications will restore
! the contents of the screen when they are exited to what they were before
! they were started.  When it is off, the contents of vi will remain on the
! screen after the program is quit.
XTerm.VT100.titeInhibit:  true

! Uncomment this to turn off color mode in your xterms
!XTerm.VT100*colorMode:  off
XTerm.VT100*dynamicColors:  on

! Number of lines of scrollback to save
XTerm*saveLines:1500

xterm*reverseWrap:  true

*visualBell:true
*scrollTtyOutput:   False
*scrollKey: True
Scrollbar.JumpCursor:   True

! Suppr support.
*VT100.Translations: #override \
BackSpace: string(0x7F)\n\
Delete: string("\033[3~")\n\
Home: string("\033[1~")\n\
End: string("\033[4~")

-

  None of this will really come to anything if I can't reproduce the
bug, of course.

-- 
Andrew Moise <[EMAIL PROTECTED]>



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

Bug#319822: Crashes running vim in uxterm

[Thomas Dickey]

On Tue, Jul 26, 2005 at 07:12:04PM -0400, Andrew Moise wrote:
> On Mon, 2005-07-25 at 05:20 -0400, Thomas Dickey wrote:
> > Is this for "any" file, or for only particular ones?
> > (There was a similar report last year that was apparently in the X 
> > libraries).
> 
>   Er, sorry, my report was a little incoherent I guess.  Running vim on
> no file (just 'vim') crashed the xterm for me.  Opening every file I
> tried (only 2-3) crashed as soon as I entered insert mode.  Now, though,
> it doesn't ever crash, and I haven't done any upgrading or reconfiguring
> in the interim.  Huh.  It happened that I had rebooted between
> installing xserver-xorg and noticing this problem, but maybe there were
> some lingering upgrade issues...
>   If the problem reappears, I'll try to track it down in more detail.
> It's very noticeable. :-)

ok.  I made a quick check, but it didn't crash for me.
 
> > Also - is this for the bitmap fonts, or for some TrueType font?
> 
>   I'm not sure what fonts xterm is using; is there an easy way to check?

The easy way to check is if the "TrueType Fonts" is checked in the
right-control-mouse menu.  You could have some resource set to start
xterm in that mode, but normally it uses the bitmap fonts.  (I was
checking this to see if there was some odd configuration detail that
wasn't apparent).

-- 
Thomas E. Dickey
http://invisible-island.net
ftp://invisible-island.net


pgpF8dpsZswKZ.pgp
Description: PGP signature

X Strike Force X.Org X11 SVN commit: r418 - in trunk/debian: . po

[X Strike Force SVN Repository Admin]

Author: dnusinow
Date: 2005-07-26 21:01:47 -0500 (Tue, 26 Jul 2005)
New Revision: 418

Modified:
   trunk/debian/changelog
   trunk/debian/po/ca.po
   trunk/debian/po/cs.po
   trunk/debian/po/da.po
   trunk/debian/po/de.po
   trunk/debian/po/el.po
   trunk/debian/po/es.po
   trunk/debian/po/fr.po
   trunk/debian/po/gl.po
   trunk/debian/po/it.po
   trunk/debian/po/ja.po
   trunk/debian/po/nl.po
   trunk/debian/po/pl.po
   trunk/debian/po/pt_BR.po
   trunk/debian/po/ru.po
   trunk/debian/po/sv.po
   trunk/debian/po/templates.pot
   trunk/debian/po/tr.po
   trunk/debian/po/vi.po
   trunk/debian/xserver-xorg.templates
Log:
- Fix reference to XF86Config-4 in xserver-xorg.templates
  - Update po files (debian/rules updatepo)


Modified: trunk/debian/changelog
===
--- trunk/debian/changelog  2005-07-26 18:11:22 UTC (rev 417)
+++ trunk/debian/changelog  2005-07-27 02:01:47 UTC (rev 418)
@@ -10,6 +10,7 @@
  translators!
  - Edit various Debian files for XFree86 -> X.Org branding changes
  - Remove general/033_no_html.diff
+ - Fix reference to XF86Config-4 in xserver-xorg.templates
 
   Changes by Eugene Konev:
  - Do not impose selinux on the whole world out there: move selinux 

Modified: trunk/debian/po/ca.po
===
--- trunk/debian/po/ca.po   2005-07-26 18:11:22 UTC (rev 417)
+++ trunk/debian/po/ca.po   2005-07-27 02:01:47 UTC (rev 418)
@@ -26,7 +26,7 @@
 msgstr ""
 "Project-Id-Version: xfree86 4.3.0.dfsg.1-5\n"
 "Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2005-07-23 11:39:50 PM-0400\n"
+"POT-Creation-Date: 2005-07-26 10:00:50 PM-0400\n"
 "PO-Revision-Date: 2004-06-09 20:08+0200\n"
 "Last-Translator: Ivan Vilata i Balaguer <[EMAIL PROTECTED]>\n"
 "Language-Team: Catalan \n"
@@ -162,17 +162,19 @@
 #. Type: note
 #. Description
 #: ../x11-common.templates:3
-msgid "experimental version of XFree86 packages"
+#, fuzzy
+msgid "experimental version of X.Org packages"
 msgstr "Versió experimental dels paquets d'XFree86."
 
 #. Type: note
 #. Description
 #: ../x11-common.templates:3
+#, fuzzy
 msgid ""
-"You are using an experimental version of XFree86 packages for Debian.  "
-"Please do not file bugs with the Debian Bug Tracking System against this "
-"version of the packages, since they have not been released to the Debian "
-"distribution yet."
+"You are using an experimental version of X.Org packages for Debian.  Please "
+"do not file bugs with the Debian Bug Tracking System against this version of "
+"the packages, since they have not been released to the Debian distribution "
+"yet."
 msgstr ""
 "Esteu usant una versió experimental dels paquets d'XFree86 per Debian.  Per "
 "favor, no useu el Sistema de Seguiment d'Errors de Debian per a informar "
@@ -202,12 +204,12 @@
 "things:\n"
 "  1) Ensure that you do not have experimental package repositiories in\n"
 " your /etc/apt/sources.list file;\n"
-"  2) Instruct apt to downgrade XFree86 to an appropriate released version;\n"
+"  2) Instruct apt to downgrade X.Org to an appropriate released version;\n"
 " you can do this by appending a package suite name to the package name\n"
 " with \"apt-get\" -- for example:\n"
-"   apt-get install xfree86-common/unstable\n"
+"   apt-get install x11-common/unstable\n"
 "or\n"
-"   apt-get install xfree86-common/stable\n"
+"   apt-get install x11-common/stable\n"
 "You may need to specify downgrades for several packages."
 msgstr ""
 "Si no voleu usar els paquets experimentals d'X, heu de fer dues coses:\n"
@@ -732,10 +734,11 @@
 #. Type: string
 #. Description
 #: ../xserver-xorg.templates:147
+#, fuzzy
 msgid ""
 "For users of multi-head setups, this option will configure only one of the "
 "heads.  Further configuration will have to be done manually in the X server "
-"configuration file, /etc/X11/XF86Config-4."
+"configuration file, /etc/X11/xorg.conf"
 msgstr ""
 "Si disposeu d'una configuració multicap, aquesta opció només configurarà un "
 "dels caps.  Caldrà que completeu manualment la configuració en el fitxer de "

Modified: trunk/debian/po/cs.po
===
--- trunk/debian/po/cs.po   2005-07-26 18:11:22 UTC (rev 417)
+++ trunk/debian/po/cs.po   2005-07-27 02:01:47 UTC (rev 418)
@@ -26,7 +26,7 @@
 msgstr ""
 "Project-Id-Version: xorg-x11\n"
 "Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2005-07-23 11:39:50 PM-0400\n"
+"POT-Creation-Date: 2005-07-26 10:00:50 PM-0400\n"
 "PO-Revision-Date: 2005-07-14 20:26+0200\n"
 "Last-Translator: Miroslav Kure <[EMAIL PROTECTED]>\n"
 "Language-Team: Czech <[EMAIL PROTECTED]>\n"
@@ -177,17 +177,19 @@
 #. Type: note
 #. Description
 #: ../x11-common.templates:3
-msgid "experimental version of XFree86 packages"
+#, fuzzy
+msgid "experimental version of X.Org packages"
 msgstr "experimentál

X Strike Force X.Org X11 SVN commit: r419 - in branches/6.9/debian: . local patches/general po scripts

[X Strike Force SVN Repository Admin]

Author: dnusinow
Date: 2005-07-26 22:02:54 -0500 (Tue, 26 Jul 2005)
New Revision: 419

Added:
   branches/6.9/debian/patches/general/022_disable_xmh.diff
Modified:
   branches/6.9/debian/local/Xsession
   branches/6.9/debian/local/Xsession.5
   branches/6.9/debian/po/pothead.in
   branches/6.9/debian/scripts/manifest-install-reconcile
   branches/6.9/debian/scripts/mir-false-negatives
   branches/6.9/debian/twm.README.Debian
   branches/6.9/debian/xbase-clients.README.Debian
   branches/6.9/debian/xdm.README.Debian
   branches/6.9/debian/xfonts-scalable.postinst.in
   branches/6.9/debian/xfs.README.Debian
   branches/6.9/debian/xserver-common.README.Debian
   branches/6.9/debian/xserver-xorg.postrm.in
   branches/6.9/debian/xserver-xorg.preinst.in
   branches/6.9/debian/xserver-xorg.prerm.in
   branches/6.9/debian/xterm.README.Debian
   branches/6.9/debian/xutils.README.Debian
Log:
Merge changes from trunk HEAD (r418) to 6.9 branch

Modified: branches/6.9/debian/local/Xsession
===
--- branches/6.9/debian/local/Xsession  2005-07-27 02:01:47 UTC (rev 418)
+++ branches/6.9/debian/local/Xsession  2005-07-27 03:02:54 UTC (rev 419)
@@ -4,7 +4,7 @@
 #
 # global Xsession file -- used by display managers and xinit (startx)
 
-# $Id: Xsession 1507M 2004-09-13 07:36:26Z (local) $
+# $Id$
 
 set -e
 

Modified: branches/6.9/debian/local/Xsession.5
===
--- branches/6.9/debian/local/Xsession.52005-07-27 02:01:47 UTC (rev 
418)
+++ branches/6.9/debian/local/Xsession.52005-07-27 03:02:54 UTC (rev 
419)
@@ -1,4 +1,4 @@
-.\" $Id: Xsession.5 2138 2005-01-17 23:40:27Z branden $
+.\" $Id$
 .\"
 .\" Copyright 1998-2004 Branden Robinson <[EMAIL PROTECTED]>.
 .\"

Added: branches/6.9/debian/patches/general/022_disable_xmh.diff
===
--- branches/6.9/debian/patches/general/022_disable_xmh.diff2005-07-27 
02:01:47 UTC (rev 418)
+++ branches/6.9/debian/patches/general/022_disable_xmh.diff2005-07-27 
03:02:54 UTC (rev 419)
@@ -0,0 +1,13 @@
+Index: trunk/xc/programs/Imakefile
+===
+--- trunk.orig/xc/programs/Imakefile   2005-05-08 23:29:21.0 -0400
 trunk/xc/programs/Imakefile2005-07-26 01:10:55.0 -0400
+@@ -139,7 +139,7 @@
+   $(XF86DGASRCDIR) xedit xev xeyes xfd xfontsel $(XFSSRCDIR) xfsinfo \
+   $(XFINDPROXYSRCDIR) $(XFWPSRCDIR) $(XGAMMASRCDIR) xgc $(XHOSTSRCDIR) \
+   $(XINITSRCDIR) $(XKBSRCDIRS) xkill $(XLOADDIR) xlogo xlsatoms \
+-  xlsclients xlsfonts xmag xman xmessage xmh xmodmap $(XMORE) xprop \
++  xlsclients xlsfonts xmag xman xmessage xmodmap $(XMORE) xprop \
+   xrdb xrefresh $(XRXSRCDIR) xset \
+   xsetroot $(XSMSRCDIR) xstdcmap $(XINPUTCLIENTDIRS) \
+   $(XTERMSRCDIR) $(XTRAPCLIENTDIRS) $(XVIDTUNESRCDIR) xwd xwininfo xwud \

Modified: branches/6.9/debian/po/pothead.in
===
--- branches/6.9/debian/po/pothead.in   2005-07-27 02:01:47 UTC (rev 418)
+++ branches/6.9/debian/po/pothead.in   2005-07-27 03:02:54 UTC (rev 419)
@@ -1,6 +1,6 @@
 # debconf templates for xfree86 package
 #
-# $Id: pothead.in 1695 2004-07-29 07:22:25Z branden $
+# $Id$
 #
 # Copyright:
 # Branden Robinson, 2000--2004

Modified: branches/6.9/debian/scripts/manifest-install-reconcile
===
--- branches/6.9/debian/scripts/manifest-install-reconcile  2005-07-27 
02:01:47 UTC (rev 418)
+++ branches/6.9/debian/scripts/manifest-install-reconcile  2005-07-27 
03:02:54 UTC (rev 419)
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $Id: manifest-install-reconcile 1682 2004-07-21 21:01:00Z branden $
+# $Id$
 
 PROGNAME="${0##*/}"
 

Modified: branches/6.9/debian/scripts/mir-false-negatives
===
--- branches/6.9/debian/scripts/mir-false-negatives 2005-07-27 02:01:47 UTC 
(rev 418)
+++ branches/6.9/debian/scripts/mir-false-negatives 2005-07-27 03:02:54 UTC 
(rev 419)
@@ -1,4 +1,4 @@
-# $Id: mir-false-negatives 1706 2004-07-29 19:16:40Z branden $
+# $Id$
 
 # This file is used by manifest-install-reconcile.
 

Modified: branches/6.9/debian/twm.README.Debian
===
--- branches/6.9/debian/twm.README.Debian   2005-07-27 02:01:47 UTC (rev 
418)
+++ branches/6.9/debian/twm.README.Debian   2005-07-27 03:02:54 UTC (rev 
419)
@@ -17,6 +17,6 @@
 Some examples of .twmrc files from days of yore are available in
 /usr/share/doc/twm/examples.
 
-$Id: twm.README.Debian 1244 2004-04-13 22:02:31Z branden $
+$Id$
 
 vim:set ai et sts=4 sw=4 tw=80:

Modified: branches/6.9/debian/xbase-clients.README.Debian
===
--- branches/6.9/debian/