Re: Fixes for build failures on sparc

2006-07-02 Thread Frans Pop
On Sunday 02 July 2006 06:40, Jurij Smakov wrote:
 xorg-xserver 1.0.2-8.1 failed to build on sparc buildd because neither
 the new kernel, nor the updated version of linux-kernel-headers does
 not include the asm/kbio.h header file anymore. This file is included
 in a couple of places on sparc only, and it looks like it's not really
 neccessary. I've tried rebuilding the packages without including this
 header in two locations (see attached patch), and it built fine and
 works without any noticeable effects. The code in question is only
 relevant for sparc (protected by ifdefs), please apply.

Hmm. Did you test it on a 2.4 kernel as well?

/me also wonders why this patch is not filed as a bug report


pgpu6PGGoeYrv.pgp
Description: PGP signature


Bug#374775: kdeinit symbol lookup error for libSM6 - no current solution

2006-07-02 Thread Dirk Werner

There seems to be no solution at the moment for this. I suspect that this
phenomenon might be based on my systems settings and thus not
reproducable on other systems, there was only one more user facing
the same weird behaviour. Menawhile I have totally erased any kde
specific package and installed gnome. This runs fine and it could be
said that it's still a kde related bug. I think it should be closed by now.

Many thanks for the provided help
dirk


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



Bug#372077: Scary message on new installations

2006-07-02 Thread H t H
On Sat, Jul 01, 2006 at 04:53:56PM -0400, David Nusinow wrote:
 On Sat, Jul 01, 2006 at 12:06:16AM -0700, Steve Langasek wrote:
  
  It is still valid for aptitude to remove xserver-xfree86, even as a
  transitional package, if the old version is conflicted with.  There's
  nothing in our packaging system that lets you mark a particular package as
  not to be removed on upgrade.  A dummy xserver-xfree86 package may fix
  this for most users, though.
 
 Right, but it might be a sufficient hint so that aptitude, and maybe apt,
 will do the right thing. Ok... I'll lower the priority of the note to
 medium and add the xserver-xfree86 dummy package. Hopefully that'll be
 sufficient. As discussed elsewhere, I'd prefer to use NEWS.Debian, but it
 won't be shown to the user in this case, so a medium priority debconf
 abusing note should suffice.
 
  - 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: r2401 - branches/7.1/debian/xorg/debian/po

2006-07-02 Thread X Strike Force SVN Repository Admin
Author: dnusinow
Date: 2006-07-02 11:11:45 -0400 (Sun, 02 Jul 2006)
New Revision: 2401

Added:
   branches/7.1/debian/xorg/debian/po/dz.po
Log:
Merge translation updates from revision 2400 in trunk

Copied: branches/7.1/debian/xorg/debian/po/dz.po (from rev 2400, 
trunk/debian/xorg/debian/po/dz.po)


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



Bug#351948: marked as done (bug report for libxpm-dev)

2006-07-02 Thread Debian Bug Tracking System
Your message dated Sun, 02 Jul 2006 11:32:32 -0400
with message-id [EMAIL PROTECTED]
and subject line Closing, not a bug
has caused the attached Bug report to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere.  Please contact me immediately.)

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

---BeginMessage---
Title: bug report for libxpm-dev






Package: libxpm-dev

Version: 4.3.0.dfsg.1-14sarge1

I have been using Xpm routines to read pixmap data from a file. The example given here focuses on the XpmReadFiletoPixmap, but every function that involved reading a pixmap file triggered the bug.

This code works:

#include X11/Xlib.h

#include X11/Xutil.h

#include stdio.h

#include sys/time.h

#include string.h

main()

{

 Display *display;

 int depth, screen;

 int width, height, w, h;

 Window window, rootwindow;

 Pixmap *pixmap, *shape;

 char xpmfile[BUFSIZ];

 struct timespec t;

 struct timeval td1, td2, td3;

 and some other declarations

 display = XOpenDisplay (NULL);

 screen = DefaultScreen (display);

 width = DisplayWidth (display, screen);

 height = DisplayHeight (display, screen);

 rootwindow = RootWindow (display, screen);

 window = XCreateSimpleWindow (display, rootwindow, 0, 0, width, height, 0, 0, 0);

 strcpy (xpmfile, filename.xpm);

 XpmReadFileToPixmap (display, window, xpmfile, pixmap, shape /* or NULL */, NULL);

}

compiled with:

gcc -L/usr/X11R6/lib -Xlib -Xpm

If, however, you declare the timespec and timeval variables before display, this produces a segmentation fault.

Of note, the pixfile in question is large - it is the size of the screen (1600x1200) and I suspect that there are hidden limits

to pixmap sizes in Xpm that are triggering this bug.

Pixmaps are generated from a jpeg file using mogrify:

mogrify -resize 1600x1200 -scale 1600x1200 -depth 24 -format xpm file.jpg

Thanks!

Cathy


 

 


---End Message---
---BeginMessage---
Hello,
   I'm closing this as it's not a bug, as Bernhard pointed out. Thanks for
your report.

 - David Nusinow
---End Message---


Bug#376391: xdm: xdm manpage refers to non-existent section 'Typical Usage'

2006-07-02 Thread Luca Capello
Package: xdm
Version: 1:1.0.4-2
Severity: minor
Tags: patch

Hello,

in section 'Session Program', 3rd paragraph, the xdm manpage states:

  At most installations, Xsession should look in $HOME for a file
  .xsession, which contains commands that each user would like to use
  as a ses‐ sion.  Xsession should also implement a system default
  session if no user-specified session exists.  See the section
  Typical Usage.

However, the section 'Typical Usage' isn't present in the manpage.
The attached patch removes the last sentence.

Thx, bye,
Gismo / Luca

-- System Information:
Debian Release: testing/unstable
  APT prefers unstable
  APT policy: (990, 'unstable'), (500, 'testing'), (500, 'stable'), (1, 
'experimental')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.17
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)

Versions of packages xdm depends on:
ii  cpp 4:4.1.1-1The GNU C preprocessor (cpp)
ii  debconf [debconf-2.0]   1.5.2Debian configuration management sy
ii  libc6   2.3.6-15 GNU C Library: Shared libraries
ii  libice6 1:1.0.0-3X11 Inter-Client Exchange library
ii  libpam0g0.79-3.1 Pluggable Authentication Modules l
ii  libselinux1 1.30-1   SELinux shared libraries
ii  libsm6  1:1.0.0-4X11 Session Management library
ii  libx11-62:1.0.0-6X11 client-side library
ii  libxau6 1:1.0.0-3X11 authorisation library
ii  libxaw7 1:1.0.1-5X11 Athena Widget library
ii  libxdmcp6   1:1.0.0-4X11 Display Manager Control Protoc
ii  libxext61:1.0.0-4X11 miscellaneous extension librar
ii  libxinerama11:1.0.1-4X11 Xinerama extension library
ii  libxmu6 1:1.0.1-3X11 miscellaneous utility library
ii  libxpm4 1:3.5.4.2-3  X11 pixmap library
ii  libxt6  1:1.0.0-5X11 toolkit intrinsics library
ii  x11-common  1:7.0.22 X Window System (X.Org) infrastruc
ii  xbase-clients   1:7.1.ds-1.1 miscellaneous X clients

xdm recommends no packages.

-- debconf information:
* shared/default-x-display-manager: xdm
  xdm/stop_running_server_with_children: false
  xdm/daemon_name: /usr/bin/X11/xdm

--- -	2006-07-02 18:55:46.99958 +0200
+++ /tmp/xdm1x.gz.10758	2006-07-02 18:55:46.0 +0200
@@ -1141,7 +1141,6 @@
 which contains commands that each user would like to use as a session.
 \fIXsession\fP should also
 implement a system default session if no user-specified session exists.
-See the section \fBTypical Usage\fP.
 .PP
 An argument may be passed to this program from the authentication widget
 using the `set-session-argument' action.  This can be used to select


pgpD0BxqRukPJ.pgp
Description: PGP signature


Bug#362853: I had the same problem

2006-07-02 Thread Miriam Ruiz
I had the same problem. I have a AlpsPS/2 ALPS DualPoint TouchPad ( cat
/proc/bus/input/devices )

According to: http://gentoo-wiki.com/HARDWARE_Synaptics_Touchpad , the
InoutDevice section should be very different for Synaptic users as opposed
to ALPS users.

I solved it by replacing, in /etc/X11/xorg.conf :

Section InputDevice
Identifier  Synaptics Touchpad
Driver  synaptics
Option  SendCoreEventstrue
Option  Device/dev/psaux
Option  Protocol  auto-dev
Option  HorizScrollDelta  0
EndSection

by:

Section InputDevice
Identifier  Synaptics Touchpad
Driver  synaptics
Option  SendCoreEventstrue
Option  Device/dev/psaux
Option  Protocol  auto-dev
Option  HorizScrollDelta  0

# LeftEdge (Integer) - X coordinate for left edge.
Option LeftEdge 130
# RightEdge (Integer) - X coordinate for right edge.
Option RightEdge 840
# TopEdge (Integer) - Y coordinate for top edge.
Option TopEdge 130
# BottomEdge (Integer) - Y coordinate for bottom edge.
Option BottomEdge 640
# FingerLow (Integer) - When finger pressure drops below this value,
# the driver counts it as a release.
Option FingerLow 7
# FingerHigh (Integer) - When finger pressure goes above this value,
# the driver counts it as a touch.
Option FingerHigh 8
# MaxTapTime (Integer) - Maximum time (in milliseconds) for detecting
# a tap.
Option MaxTapTime 180
# MaxTapMove (Integer) - Maximum movement of the finger for detecting
# a tap.
Option MaxTapMove 110
# EmulateMidButtonTime (Integer) - Maximum time (in milliseconds) for
# middle button emulation.
Option EmulateMidButtonTime 75
# VertScrollDelta (Integer) - Move distance of the finger for a
# scroll event.
Option VertScrollDelta 20
# HorizScrollDelta (Integer) - Move distance of the finger for a
#  scroll event.
Option HorizScrollDelta 20
# MinSpeed (Float) - Minimum speed factor.
Option MinSpeed 0.60
# MaxSpeed (Float) - Maximum speed factor.
Option MaxSpeed 1.10
# AccelFactor (Float) - Acceleration factor.
Option AccelFactor 0.030
# EdgeMotionMinSpeed (Integer) - Slowest setting for edge motion
# speed.
Option EdgeMotionMinSpeed 200
# EdgeMotionMaxSpeed (Integer) - Fastest setting for edge motion
# speed.
Option EdgeMotionMaxSpeed 200
# UpDownScrolling (Boolean) - If on, the up/down buttons generate
# button 4/5 events. If off, the up button generates a double click
# and the down button generates a button 2 event. 
Option UpDownScrolling 1
# CircularScrolling (Bool) - If on, circular scrolling is used.
Option CircularScrolling 1
# CircScrollDelta (Float) - Move angle (radians) of finger to
# generate a scroll event.
Option CircScrollDelta 0.1
# CircScrollTrigger (Integer) - Trigger region on the touchpad
# to start circular scrolling.
#   0   All Edges
#   1   Top Edge
#   2   Top Right Corner
#   3   Right Edge
#   4   Bottom Right Corner
#   5   Bottom Edge
#   6   Bottom Left Corner
#   7   Left Edge
#   8   Top Left Corner
Option CircScrollTrigger 2
# SHMConfig (Boolean) - Switch on/off shared memory for
# configuration. (allows parameters to be changed with synclient
# program).
Option SHMConfig on

Option Emulate3Buttons on
EndSection

The activation of SHMConfig makes it possible to use the synclient command:
synclient -l


Miry




__ 
LLama Gratis a cualquier PC del Mundo. 
Llamadas a fijos y móviles desde 1 céntimo por minuto. 
http://es.voice.yahoo.com


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



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

2006-07-02 Thread X Strike Force SVN Repository Admin
Author: bubulle
Date: 2006-07-02 13:26:50 -0400 (Sun, 02 Jul 2006)
New Revision: 2402

Modified:
   trunk/debian/xorg/debian/changelog
   trunk/debian/xorg/debian/po/ru.po
Log:
Russian translation update

Modified: trunk/debian/xorg/debian/changelog
===
--- trunk/debian/xorg/debian/changelog  2006-07-02 15:11:45 UTC (rev 2401)
+++ trunk/debian/xorg/debian/changelog  2006-07-02 17:26:50 UTC (rev 2402)
@@ -14,6 +14,7 @@
 - Romanian (Eddy Petrisor). Closes: #374082
 - Vietnamese (Clytie Siddall). Closes: #375087
 - Swedish (Daniel Nylander). Closes: #375970
+- Russian (Yuri Kozlov). Closes: #376343
   * New debconf translations:
 - Nepali (Mahesh subedi). Closes: #374803
 - Khmer (auk piseth). Closes: #375063

Modified: trunk/debian/xorg/debian/po/ru.po
===
--- trunk/debian/xorg/debian/po/ru.po   2006-07-02 15:11:45 UTC (rev 2401)
+++ trunk/debian/xorg/debian/po/ru.po   2006-07-02 17:26:50 UTC (rev 2402)
@@ -30,7 +30,7 @@
 Project-Id-Version: xserver-xorg_debian_po_ru\n
 Report-Msgid-Bugs-To: [EMAIL PROTECTED]
 POT-Creation-Date: 2006-06-14 21:41+0200\n
-PO-Revision-Date: 2006-05-19 22:12+0300\n
+PO-Revision-Date: 2006-07-02 12:31+0300\n
 Last-Translator: Yuri Kozlov [EMAIL PROTECTED]\n
 Language-Team: Russian debian-l10n-russian@lists.debian.org\n
 MIME-Version: 1.0\n
@@ -147,7 +147,7 @@
 #. Description
 #: ../x11-common.templates:50
 msgid Cannot remove /usr/X11R6/bin directory
-msgstr 
+msgstr Не удалось удалить каталог /usr/X11R6/bin
 
 #. Type: note
 #. Description
@@ -159,6 +159,12 @@
 are currently in the directory out of the way so that the installation can 
 complete. If you like, you may move them back after the symlink is in place.
 msgstr 
+Для данного обновления требуется удаление каталога /usr/X11R6/bin 
+и замена на символическую ссылку. Попытка сделать это не удалась, скорее 
+всего из-за того, что этот каталог всё ещё не пустой. Вы должны переместить 
+файлы из этого каталога для завершения установки. Если нужно, вы 
+можете переместить их обратно, после того как будет создана символическая 
+ссылка.
 
 #. Type: note
 #. Description
@@ -168,6 +174,8 @@
 Please re-run your upgrade procedure after you have cleaned out the 
 directory.
 msgstr 
+Пока установка считается неудачной и прерывается, чтобы вы могли сделать это. 

+После очистки каталога запустите процедуру обновления ещё раз.
 
 #. Type: boolean
 #. Description
@@ -788,8 +796,7 @@
 #. Type: string
 #. Description
 #: ../xserver-xorg.templates:235
-msgid 
-Users of U.S. English keyboards should generally leave this entry blank.
+msgid Users of U.S. English keyboards should generally leave this entry 
blank.
 msgstr 
 Пользователям американских клавиатур (США) обычно следует оставить это поле 
 пустым.
@@ -1023,10 +1030,8 @@
 #. Type: boolean
 #. Description
 #: ../xserver-xorg.templates:334
-msgid 
-If autodetection fails, you will be asked for information about the monitor.
-msgstr 
-Если автоопределение не сработает, вам будут заданы вопросы о вашем мониторе.
+msgid If autodetection fails, you will be asked for information about the 
monitor.
+msgstr Если автоопределение не сработает, вам будут заданы вопросы о вашем 
мониторе.
 
 #. Type: select
 #. Description
@@ -1336,3 +1341,4 @@
 msgstr 
 Ответьте положительно, если хотите повторно определить раскладку клавиатуры. 
 Ответьте отрицательно, если хотите сохранить имеющуюся раскладку.
+


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



Processed: Re: Bug#376343: xserver-xorg: [INTL:ru] Updated Russian debconf templates translation

2006-07-02 Thread Debian Bug Tracking System
Processing commands for [EMAIL PROTECTED]:

 tags 376343 pending
Bug#376343: xserver-xorg: [INTL:ru] Updated Russian debconf templates 
translation
Tags were: l10n patch
Tags added: pending

 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#362853: I had the same problem

2006-07-02 Thread Mattia Dongili
reassign 362853 xfree86-driver-synaptics
forwarded 362853 petero2ATteliaDOTcom
merge 362853 351621
thanks

On Sun, Jul 02, 2006 at 06:53:43PM +0200, Miriam Ruiz wrote:
 I had the same problem. I have a AlpsPS/2 ALPS DualPoint TouchPad ( cat
 /proc/bus/input/devices )
 
 According to: http://gentoo-wiki.com/HARDWARE_Synaptics_Touchpad , the
 InoutDevice section should be very different for Synaptic users as opposed
 to ALPS users.

this is an xserver-xorg-input-synaptcs (from xfree86-driver-synaptics
source) known problem: it should use decent defaults for ALPS.
I will deal with it soon.

thanks
-- 
mattia
:wq!


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



Bug#376203: Acknowledgement (xserver-xorg won't configure and won't run with ATI Radeon)

2006-07-02 Thread Gary Dale

Debian Bug Tracking System wrote:

Thank you for the problem report you have sent regarding Debian.
This is an automatically generated reply, to let you know your message has
been received.  It is being forwarded to the package maintainers and other
interested parties for their attention; they will reply in due course.

Your message has been sent to the package maintainer(s):
 Debian X Strike Force debian-x@lists.debian.org

If you wish to submit further information on your problem, please send
it to [EMAIL PROTECTED] (and *not* to
[EMAIL PROTECTED]).

Please do not reply to the address at the top of this message,
unless you wish to report a problem with the Bug-tracking system.

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

  
Further to my report, I have subsequently replaced my Radeon 
All-in-Wonder 9700/Pro with an NVidia board swapped from another 
computer. When I replaced the vesa driver with the nv driver in 
xorg.conf, and restarted X, X came back up normally and at the higher 
resolution. Therefore, the problem of X not restarting is peculiar to 
the ati driver.


On the other hand, I still can't get dpkg-reconfigure xserver-xorg to 
run. It still quits at the same point without updating xorg.conf.



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



Processed: Re: Bug#362853: I had the same problem

2006-07-02 Thread Debian Bug Tracking System
Processing commands for [EMAIL PROTECTED]:

 reassign 362853 xfree86-driver-synaptics
Bug#362853: xorg: Touchpad on Laptop very slow
Bug reassigned from package `xorg' to `xfree86-driver-synaptics'.

 forwarded 362853 petero2ATteliaDOTcom
Bug#362853: xorg: Touchpad on Laptop very slow
Noted your statement that Bug has been forwarded to petero2ATteliaDOTcom.

 merge 362853 351621
Bug#351621: xfree86-driver-synaptics: Default configuration inadequate, mouse 
move way to slowly ...
Bug#362853: xorg: Touchpad on Laptop very slow
Merged 351621 362853.

 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]



Re: Fixes for build failures on sparc

2006-07-02 Thread Jurij Smakov

On Sun, 2 Jul 2006, Frans Pop wrote:


On Sunday 02 July 2006 06:40, Jurij Smakov wrote:

xorg-xserver 1.0.2-8.1 failed to build on sparc buildd because neither
the new kernel, nor the updated version of linux-kernel-headers does
not include the asm/kbio.h header file anymore. This file is included
in a couple of places on sparc only, and it looks like it's not really
neccessary. I've tried rebuilding the packages without including this
header in two locations (see attached patch), and it built fine and
works without any noticeable effects. The code in question is only
relevant for sparc (protected by ifdefs), please apply.


Hmm. Did you test it on a 2.4 kernel as well?

/me also wonders why this patch is not filed as a bug report


It was discovered only yesterday, and after discussing it with David on 
IRC, we agreed that I'll just post the patch to the list.


I've further checked today that removing this include file shouldn't 
affect anything. There are only some sparc-specific ioctl definitions in 
there and all the cases where these ioctls are used are protected by 
ifdefs. So it does not really matter which kernel it is running under.


Best regards,

Jurij Smakov[EMAIL PROTECTED]
Key: http://www.wooyd.org/pgpkey/   KeyID: C99E03CC


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



X Strike Force X.Org X11 SVN commit: r2403 - in trunk/data/xkb-data: debian debian/patches docs po rules symbols

2006-07-02 Thread X Strike Force SVN Repository Admin
Author: barbier
Date: 2006-07-02 16:30:59 -0400 (Sun, 02 Jul 2006)
New Revision: 2403

Added:
   trunk/data/xkb-data/debian/patches/
   trunk/data/xkb-data/debian/patches/docs.diff
   trunk/data/xkb-data/debian/patches/fr.po.diff
   trunk/data/xkb-data/debian/patches/quiltrc
   trunk/data/xkb-data/debian/patches/sclk_toggle.diff
   trunk/data/xkb-data/debian/patches/series
Modified:
   trunk/data/xkb-data/debian/changelog
   trunk/data/xkb-data/debian/control
   trunk/data/xkb-data/debian/rules
   trunk/data/xkb-data/docs/README.config
   trunk/data/xkb-data/po/fr.po
   trunk/data/xkb-data/rules/base
   trunk/data/xkb-data/rules/base.o_s.part
   trunk/data/xkb-data/rules/base.xml.in
   trunk/data/xkb-data/symbols/group
Log:
  * debian/control: Use quilt to manage changes.


Modified: trunk/data/xkb-data/debian/changelog
===
--- trunk/data/xkb-data/debian/changelog2006-07-02 17:26:50 UTC (rev 
2402)
+++ trunk/data/xkb-data/debian/changelog2006-07-02 20:30:59 UTC (rev 
2403)
@@ -4,8 +4,10 @@
 
   * debian/control: Bump Standards-Version to 3.7.2, no changes needed.
 
- -- Denis Barbier [EMAIL PROTECTED]  Fri, 16 Jun 2006 11:49:31 +0200
+  * debian/control: Use quilt to manage changes.
 
+ -- Denis Barbier [EMAIL PROTECTED]  Sun,  2 Jul 2006 22:11:44 +0200
+
 xkeyboard-config (0.8-5) unstable; urgency=low
 
   * Add a symlink rules/xfree86 - rules/base.  Thanks Daniel Stone.

Modified: trunk/data/xkb-data/debian/control
===
--- trunk/data/xkb-data/debian/control  2006-07-02 17:26:50 UTC (rev 2402)
+++ trunk/data/xkb-data/debian/control  2006-07-02 20:30:59 UTC (rev 2403)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: Denis Barbier [EMAIL PROTECTED]
-Build-Depends: debhelper (= 4.0.0)
+Build-Depends: debhelper (= 4.0.0), quilt
 Build-Depends-Indep: libxml-parser-perl
 Standards-Version: 3.7.2
 

Added: trunk/data/xkb-data/debian/patches/docs.diff
===
--- trunk/data/xkb-data/debian/patches/docs.diff2006-07-02 17:26:50 UTC 
(rev 2402)
+++ trunk/data/xkb-data/debian/patches/docs.diff2006-07-02 20:30:59 UTC 
(rev 2403)
@@ -0,0 +1,11 @@
+--- xkeyboard-config-0.8.orig/docs/README.config
 xkeyboard-config-0.8/docs/README.config
+@@ -41,7 +41,7 @@
+ The proper rules file depends on your vendor. In reality, the commonest file
+ of rules is xfree86. For each rules file there is a description file named
+ vendor-rules.lst, for instance xfree86.lst which is located in xkb configu-
+-ration subdirectory rules (for example /etc/X11/xkb/rules).
++ration subdirectory rules (for example /usr/share/X11/xkb/rules).
+ 
+ 2.1  Basic Configuration
+ 

Added: trunk/data/xkb-data/debian/patches/fr.po.diff
===
--- trunk/data/xkb-data/debian/patches/fr.po.diff   2006-07-02 17:26:50 UTC 
(rev 2402)
+++ trunk/data/xkb-data/debian/patches/fr.po.diff   2006-07-02 20:30:59 UTC 
(rev 2403)
@@ -0,0 +1,552 @@
+--- xkeyboard-config-0.8.orig/po/fr.po
 xkeyboard-config-0.8/po/fr.po
+@@ -6,10 +6,10 @@
+ #
+ msgid 
+ msgstr 
+-Project-Id-Version: xkeyboard-config 0.6\n
++Project-Id-Version: xkeyboard-config 0.8\n
+ Report-Msgid-Bugs-To: \n
+ POT-Creation-Date: 2006-03-04 17:41+\n
+-PO-Revision-Date: 2005-10-10 23:35+0200\n
++PO-Revision-Date: 2006-03-08 22:28+0100\n
+ Last-Translator: Denis Barbier [EMAIL PROTECTED]\n
+ Language-Team: French [EMAIL PROTECTED]\n
+ MIME-Version: 1.0\n
+@@ -131,16 +131,15 @@
+ 
+ #: ../rules/base.xml.in.h:29
+ msgid Afg
+-msgstr 
++msgstr Afg
+ 
+ #: ../rules/base.xml.in.h:30
+-#, fuzzy
+ msgid Afghanistan
+-msgstr Pakistan
++msgstr Afghanistan
+ 
+ #: ../rules/base.xml.in.h:31
+ msgid Akan
+-msgstr 
++msgstr Akan
+ 
+ #: ../rules/base.xml.in.h:32
+ msgid Alb
+@@ -159,7 +158,6 @@
+ msgstr Alt est obtenu avec la touche Logo de droite, et Super avec Menu.
+ 
+ #: ../rules/base.xml.in.h:36
+-#, fuzzy
+ msgid Alt+Ctrl changes group.
+ msgstr Alt+Ctrl change de groupe.
+ 
+@@ -192,13 +190,12 @@
+ msgstr Autre, sans touches mortes
+ 
+ #: ../rules/base.xml.in.h:44
+-#, fuzzy
+ msgid And
+-msgstr Ind
++msgstr And
+ 
+ #: ../rules/base.xml.in.h:45
+ msgid Andorra
+-msgstr 
++msgstr Andorre
+ 
+ #: ../rules/base.xml.in.h:46
+ msgid Apostrophe (') variant
+@@ -346,7 +343,7 @@
+ 
+ #: ../rules/base.xml.in.h:82
+ msgid Cambodia
+-msgstr 
++msgstr Cambodge
+ 
+ #: ../rules/base.xml.in.h:83
+ msgid Can
+@@ -357,9 +354,8 @@
+ msgstr Canada
+ 
+ #: ../rules/base.xml.in.h:85
+-#, fuzzy
+ msgid Caps Lock is Compose.
+-msgstr Menu est Compose.
++msgstr Verr. maj. est Compose.
+ 
+ #: ../rules/base.xml.in.h:86
+ msgid CapsLock LED shows alternative group.
+@@ -406,7 +402,7 @@
+ 
+ #: ../rules/base.xml.in.h:96
+ msgid Catalan variant with middle-dot L
+-msgstr 
++msgstr Catalan 

X Strike Force X.Org X11 SVN commit: r2404 - in trunk/data/xkb-data/debian: . patches

2006-07-02 Thread X Strike Force SVN Repository Admin
Author: barbier
Date: 2006-07-02 17:56:33 -0400 (Sun, 02 Jul 2006)
New Revision: 2404

Added:
   trunk/data/xkb-data/debian/patches/cvs.diff
Removed:
   trunk/data/xkb-data/debian/patches/fr.po.diff
Modified:
   trunk/data/xkb-data/debian/changelog
   trunk/data/xkb-data/debian/patches/sclk_toggle.diff
   trunk/data/xkb-data/debian/patches/series
Log:
  * Sync with CVS 2006-06-30.
The following bugs have been fixed upstream:
+ XF86AudioRaiseVolume is defined twice for Logitech keyboards.
  Closes: #363925
+ hr(us) layout apparently broken.  Closes: #373833

  * Drop fr.po.diff, included upstream.


Including diff would make mail exceed size limit of 10 bytes.
Use svn diff -r 2403:2404 http://necrotic.deadbeast.net/svn/xorg-x11/;
to view diff.


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



Processed: Re: Bug#368885: xkb-data: symbols/inet and rules/base.* do not match

2006-07-02 Thread Debian Bug Tracking System
Processing commands for [EMAIL PROTECTED]:

 forwarded 368885 https://bugs.freedesktop.org/show_bug.cgi?id=7398
Bug#368885: xkb-data: symbols/inet and rules/base.* do not match
Noted your statement that Bug has been forwarded to 
https://bugs.freedesktop.org/show_bug.cgi?id=7398.


End of message, 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]



X Strike Force X.Org X11 SVN commit: r2405 - trunk/data/xkb-data/debian

2006-07-02 Thread X Strike Force SVN Repository Admin
Author: barbier
Date: 2006-07-02 18:35:29 -0400 (Sun, 02 Jul 2006)
New Revision: 2405

Modified:
   trunk/data/xkb-data/debian/rules
Log:
Make sure that 'clean' never fails


Modified: trunk/data/xkb-data/debian/rules
===
--- trunk/data/xkb-data/debian/rules2006-07-02 21:56:33 UTC (rev 2404)
+++ trunk/data/xkb-data/debian/rules2006-07-02 22:35:29 UTC (rev 2405)
@@ -70,7 +70,7 @@
$(MAKE)
touch $@
 
-clean: unpatch
+clean: $(stamp) unpatch
dh_testdir
dh_testroot
rm -rf $(stamp)


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



X Strike Force X.Org X11 SVN commit: r2406 - in trunk/data/xkb-data/debian: . patches

2006-07-02 Thread X Strike Force SVN Repository Admin
Author: barbier
Date: 2006-07-02 18:36:26 -0400 (Sun, 02 Jul 2006)
New Revision: 2406

Modified:
   trunk/data/xkb-data/debian/changelog
   trunk/data/xkb-data/debian/patches/cvs.diff
Log:
  * Sync with CVS 2006-07-02.
+ symbols/inet and rules/base.* do not match.  Closes: #368885


Modified: trunk/data/xkb-data/debian/changelog
===
--- trunk/data/xkb-data/debian/changelog2006-07-02 22:35:29 UTC (rev 
2405)
+++ trunk/data/xkb-data/debian/changelog2006-07-02 22:36:26 UTC (rev 
2406)
@@ -6,11 +6,12 @@
 
   * debian/control: Use quilt to manage changes.
 
-  * Sync with CVS 2006-06-30.
+  * Sync with CVS 2006-07-02.
 The following bugs have been fixed upstream:
 + XF86AudioRaiseVolume is defined twice for Logitech keyboards.
   Closes: #363925
 + hr(us) layout apparently broken.  Closes: #373833
++ symbols/inet and rules/base.* do not match.  Closes: #368885
 
   * Drop fr.po.diff, included upstream.
 

Modified: trunk/data/xkb-data/debian/patches/cvs.diff
===
--- trunk/data/xkb-data/debian/patches/cvs.diff 2006-07-02 22:35:29 UTC (rev 
2405)
+++ trunk/data/xkb-data/debian/patches/cvs.diff 2006-07-02 22:36:26 UTC (rev 
2406)
@@ -2,7 +2,18 @@
 ===
 --- xkb-data.orig/ChangeLog
 +++ xkb-data/ChangeLog
-@@ -1,3 +1,222 @@
+@@ -1,3 +1,233 @@
++2006-07-02  Sergey Udaltsov
++
++  rules/base.xml.in: fixed mismatch between directory and symbols/inet
++  file.
++  https://bugs.freedesktop.org/show_bug.cgi?id=7398
++  
++2006-07-02  Sergey Udaltsov
++
++  symbols/ro: fixed Romanian academic
++  https://bugs.freedesktop.org/show_bug.cgi?id=7393
++  
 +2006-06-28  Sergey Udaltsov
 +
 +  keycodes/evdev: pc105 compatiliby, closing
@@ -225,7 +236,7 @@
  2006-03-05  Sergey Udaltsov
  
configure.in, NEWS, Changelog:Preparing release 0.8
-@@ -35,7 +254,7 @@
+@@ -35,7 +265,7 @@

  2006-02-21 svu
  
@@ -234,12 +245,12 @@
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=3807

  2006-02-01 svu
-@@ -742,7 +961,7 @@
+@@ -742,7 +972,7 @@
  
  2004-09-13 22:39  svu
  
 -  * symbols/tj: new local cvs keyword seems to be ok - no more $Id: 
ChangeLog,v 1.126 2006/03/04 17:33:43 svu Exp $
-+  * symbols/tj: new local cvs keyword seems to be ok - no more $Id: 
ChangeLog,v 1.168 2006-06-28 21:15:54 svu Exp $
++  * symbols/tj: new local cvs keyword seems to be ok - no more $Id: 
ChangeLog,v 1.170 2006-07-02 21:28:19 svu Exp $
  
  2004-09-13 22:38  svu
  
@@ -65293,7 +65304,7 @@
gyrationGyration
hpi6Hewlett-Packard Internet Keyboard
hp2501  Hewlett-Packard SK-2501 Multimedia Keyboard
-@@ -68,6 +71,7 @@
+@@ -68,21 +71,21 @@
logiaccess  Logitech Access Keyboard
ltcdLogitech Cordless Desktop
logicditLogitech Cordless Desktop iTouch
@@ -65301,13 +65312,18 @@
logicdp Logitech Cordless Desktop Pro
logicdpaLogitech Cordless Desktop Pro (alternate option)
logicdpa2   Logitech Cordless Desktop Pro (alternate option2)
-@@ -80,9 +84,12 @@
-   itouch  Logitech iTouch
+   logicdo Logitech Cordless Desktop Optical
+   logicfn Logitech Cordless Freedom/Desktop Navigator
+   logicdn Logitech Cordless Desktop Navigator
+-  logidak Logitech Deluxe Access Keyboard
logiitc Logitech iTouch Cordless Keyboard (model Y-RB6)
logiik  Logitech Internet Keyboard
+   itouch  Logitech iTouch
+-  logiitc Logitech iTouch Cordless Keyboard (model Y-RB6)
+-  logiik  Logitech Internet Keyboard
 -  logiink Logitech Internet Navigator Keyboard
+-  itouchinLogitech iTouch keyboard Internet Navigator
 +  logicinkLogitech Internet Navigator Keyboard
-   itouchinLogitech iTouch keyboard Internet Navigator
 +  logiinkse   Logitech iTouch Internet Navigator Keyboard SE
 +  logiinkseusbLogitech iTouch Internet Navigator Keyboard SE (USB)
logiultrax  Logitech Ultra-X Keyboard
@@ -65315,7 +65331,7 @@
mx1998  Memorex MX1998
mx2500  Memorex MX2500 EZ-Access Keyboard
mx2750  Memorex MX2750
-@@ -113,9 +120,13 @@
+@@ -113,9 +116,13 @@
macintosh_old   Macintosh Old
powerpcps2  PowerPC PS/2
acer_tm_800 Acer TravelMate 800
@@ -65329,7 +65345,7 @@
  
  ! layout
us  U.S. English
-@@ -134,6 +145,7 @@
+@@ -134,6 +141,7 @@
bg  Bulgaria
mm  Myanmar
ca  Canada
@@ -65337,7 +65353,7 @@
hr  Croatia
cz  Czechia
dk  Denmark
-@@ -141,6 +153,7 @@
+@@ -141,6 +149,7 @@
bt  Bhutan
ee  Estonia
ir  Iran
@@ -65345,7 +65361,7 @@
fo  Faroe 

X Strike Force X.Org X11 SVN commit: r2408 - in branches/7.1: data/xkb-data/debian data/xkb-data/docs data/xkb-data/po data/xkb-data/rules data/xkb-data/symbols debian/xorg/debian debian/xorg/debian/p

2006-07-02 Thread X Strike Force SVN Repository Admin
Author: dnusinow
Date: 2006-07-02 20:49:09 -0400 (Sun, 02 Jul 2006)
New Revision: 2408

Added:
   branches/7.1/data/xkb-data/debian/patches/
Modified:
   branches/7.1/data/xkb-data/debian/changelog
   branches/7.1/data/xkb-data/debian/control
   branches/7.1/data/xkb-data/debian/rules
   branches/7.1/data/xkb-data/docs/README.config
   branches/7.1/data/xkb-data/po/fr.po
   branches/7.1/data/xkb-data/rules/base
   branches/7.1/data/xkb-data/rules/base.o_s.part
   branches/7.1/data/xkb-data/rules/base.xml.in
   branches/7.1/data/xkb-data/symbols/group
   branches/7.1/debian/xorg/debian/changelog
   branches/7.1/debian/xorg/debian/po/ru.po
Log:
Merge the latest from trunk to version 2047

Modified: branches/7.1/data/xkb-data/debian/changelog
===
--- branches/7.1/data/xkb-data/debian/changelog 2006-07-02 22:48:44 UTC (rev 
2407)
+++ branches/7.1/data/xkb-data/debian/changelog 2006-07-03 00:49:09 UTC (rev 
2408)
@@ -4,8 +4,20 @@
 
   * debian/control: Bump Standards-Version to 3.7.2, no changes needed.
 
- -- Denis Barbier [EMAIL PROTECTED]  Fri, 16 Jun 2006 11:49:31 +0200
+  * debian/control: Use quilt to manage changes.
 
+  * Sync with CVS 2006-07-02.
+The following bugs have been fixed upstream:
++ XF86AudioRaiseVolume is defined twice for Logitech keyboards.
+  Closes: #363925
++ hr(us) layout apparently broken.  Closes: #373833
++ symbols/inet and rules/base.* do not match.  Closes: #368885
++ no korean alphabet (hangul) mapping support.  Closes: #342615
+
+  * Drop fr.po.diff, included upstream.
+
+ -- Denis Barbier [EMAIL PROTECTED]  Sun,  2 Jul 2006 22:11:44 +0200
+
 xkeyboard-config (0.8-5) unstable; urgency=low
 
   * Add a symlink rules/xfree86 - rules/base.  Thanks Daniel Stone.

Modified: branches/7.1/data/xkb-data/debian/control
===
--- branches/7.1/data/xkb-data/debian/control   2006-07-02 22:48:44 UTC (rev 
2407)
+++ branches/7.1/data/xkb-data/debian/control   2006-07-03 00:49:09 UTC (rev 
2408)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: Denis Barbier [EMAIL PROTECTED]
-Build-Depends: debhelper (= 4.0.0)
+Build-Depends: debhelper (= 4.0.0), quilt
 Build-Depends-Indep: libxml-parser-perl
 Standards-Version: 3.7.2
 

Copied: branches/7.1/data/xkb-data/debian/patches (from rev 2407, 
trunk/data/xkb-data/debian/patches)

Modified: branches/7.1/data/xkb-data/debian/rules
===
--- branches/7.1/data/xkb-data/debian/rules 2006-07-02 22:48:44 UTC (rev 
2407)
+++ branches/7.1/data/xkb-data/debian/rules 2006-07-03 00:49:09 UTC (rev 
2408)
@@ -13,31 +13,67 @@
confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 endif
 
-xkb_base = /usr/share/X11/xkb
+xkb_base := /usr/share/X11/xkb
+stamp := stamp-dir/
+QUILT := quilt --quiltrc debian/patches/quiltrc
 
-config.status: configure
+$(stamp):
+   mkdir $@
+
+patch: $(stamp)patch
+$(stamp)patch: $(stamp)
+   @if $(QUILT) next /dev/null 21; then \
+ echo -n Applying patches...; \
+ if $(QUILT) push -a -v  ${stamp}patch-log 21; then \
+   echo successful.; \
+   mv ${stamp}patch-log $@; \
+ else \
+   echo failed! (check ${stamp}patch-log for details); \
+   exit 1; \
+ fi; \
+   else \
+ echo No patches to apply; \
+   fi
+
+unpatch:
+   @echo -n Unapplying patches...
+   @if $(QUILT) top /dev/null 21; then \
+ if $(QUILT) pop -a -v  $(stamp)unpatch-log 21; then \
+   echo successful.; \
+ else \
+   echo failed! (check $(stamp)unpatch-log for details); \
+   exit 1; \
+ fi; \
+   else \
+ echo nothing to do.; \
+   fi
+   -rm -f $(stamp)patch $(stamp)patch-log $(stamp)unpatch-log
+   -rm -rf .pc
+
+config.status: $(stamp)configure
+$(stamp)configure: $(stamp)patch
dh_testdir
./configure $(confflags) \
  --prefix=/usr \
  --disable-xkbcomp-symlink --with-xkb-rules-symlink=xfree86,xorg \
  --with-xkb-base=$(xkb_base) \
  XKBCOMP=/no/thanks
+   touch $@
 
-build: build-stamp
-
-build-stamp:  config.status
+build: $(stamp)build
+$(stamp)build: $(stamp)configure
dh_testdir
 
# Files kept so that xkbcomp is not needed
for d in compat geometry keycodes keymap semantics symbols types; \
  do cp debian/$$d.dir $$d/; done
$(MAKE)
-   touch build-stamp
+   touch $@
 
-clean:
+clean: $(stamp) unpatch
dh_testdir
dh_testroot
-   rm -f build-stamp 
+   rm -rf $(stamp)
 
-$(MAKE) distclean
# Files not cleaned up
@@ -47,7 +83,7 @@
dh_clean 
 
 deb:
-   dpkg-buildpackage -rfakeroot -i'/\.git'
+   dpkg-buildpackage -rfakeroot -i'/\.git|/\.svn'
 
 

X Strike Force X.Org X11 SVN commit: r2409 - vendor/X11R7.1/lib/libxau

2006-07-02 Thread X Strike Force SVN Repository Admin
Author: dnusinow
Date: 2006-07-02 21:06:30 -0400 (Sun, 02 Jul 2006)
New Revision: 2409

Modified:
   vendor/X11R7.1/lib/libxau/ChangeLog
   vendor/X11R7.1/lib/libxau/Makefile.am
   vendor/X11R7.1/lib/libxau/Makefile.in
   vendor/X11R7.1/lib/libxau/Xau.man
   vendor/X11R7.1/lib/libxau/aclocal.m4
   vendor/X11R7.1/lib/libxau/config.sub
   vendor/X11R7.1/lib/libxau/configure
   vendor/X11R7.1/lib/libxau/configure.ac
   vendor/X11R7.1/lib/libxau/depcomp
   vendor/X11R7.1/lib/libxau/install-sh
   vendor/X11R7.1/lib/libxau/ltmain.sh
   vendor/X11R7.1/lib/libxau/missing
Log:
Vendor drop of libxau 1.0.1

Including diff would make mail exceed size limit of 10 bytes.
Use svn diff -r 2408:2409 http://necrotic.deadbeast.net/svn/xorg-x11/;
to view diff.


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



X Strike Force X.Org X11 SVN commit: r2410 - branches/7.1/lib/libxau

2006-07-02 Thread X Strike Force SVN Repository Admin
Author: dnusinow
Date: 2006-07-02 21:10:28 -0400 (Sun, 02 Jul 2006)
New Revision: 2410

Modified:
   branches/7.1/lib/libxau/ChangeLog
   branches/7.1/lib/libxau/Makefile.am
   branches/7.1/lib/libxau/Makefile.in
   branches/7.1/lib/libxau/Xau.man
   branches/7.1/lib/libxau/aclocal.m4
   branches/7.1/lib/libxau/config.sub
   branches/7.1/lib/libxau/configure
   branches/7.1/lib/libxau/configure.ac
   branches/7.1/lib/libxau/depcomp
   branches/7.1/lib/libxau/install-sh
   branches/7.1/lib/libxau/ltmain.sh
   branches/7.1/lib/libxau/missing
Log:
Merge vendor branch of libxau 1.0.1 to 7.1 working dir

Including diff would make mail exceed size limit of 10 bytes.
Use svn diff -r 2409:2410 http://necrotic.deadbeast.net/svn/xorg-x11/;
to view diff.


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



X Strike Force X.Org X11 SVN commit: r2411 - branches/7.1/xserver/xorg-server-1.0.2/debian

2006-07-02 Thread X Strike Force SVN Repository Admin
Author: dnusinow
Date: 2006-07-02 21:30:18 -0400 (Sun, 02 Jul 2006)
New Revision: 2411

Modified:
   branches/7.1/xserver/xorg-server-1.0.2/debian/changelog
   branches/7.1/xserver/xorg-server-1.0.2/debian/rules
Log:
* Move patch target call so that we don't try and build twice

Modified: branches/7.1/xserver/xorg-server-1.0.2/debian/changelog
===
--- branches/7.1/xserver/xorg-server-1.0.2/debian/changelog 2006-07-03 
01:10:28 UTC (rev 2410)
+++ branches/7.1/xserver/xorg-server-1.0.2/debian/changelog 2006-07-03 
01:30:18 UTC (rev 2411)
@@ -1,3 +1,10 @@
+xorg-server (1:1.0.2-10) UNRELEASED; urgency=low
+
+  [ David Nusinow ]
+  * Move patch target call so that we don't try and build twice
+
+ -- David Nusinow [EMAIL PROTECTED]  Sun,  2 Jul 2006 21:29:39 -0400
+
 xorg-server (1:1.0.2-9) unstable; urgency=high
 
   [ Denis Barbier ]

Modified: branches/7.1/xserver/xorg-server-1.0.2/debian/rules
===
--- branches/7.1/xserver/xorg-server-1.0.2/debian/rules 2006-07-03 01:10:28 UTC 
(rev 2410)
+++ branches/7.1/xserver/xorg-server-1.0.2/debian/rules 2006-07-03 01:30:18 UTC 
(rev 2411)
@@ -52,8 +52,8 @@
 --with-xkb-path=/usr/share/X11/xkb \
 --with-xkb-output=/var/lib/xkb
 
-build: build-stamp
-build-stamp: patch
+build: patch build-stamp
+build-stamp: 
dh_testdir
 
mkdir -p obj-$(DEB_BUILD_GNU_TYPE)/GL


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



X Strike Force X.Org X11 SVN commit: r2412 - in branches/7.1/lib/libxau: . debian debian/patches

2006-07-02 Thread X Strike Force SVN Repository Admin
Author: dnusinow
Date: 2006-07-02 21:32:00 -0400 (Sun, 02 Jul 2006)
New Revision: 2412

Added:
   branches/7.1/lib/libxau/debian/patches/
   branches/7.1/lib/libxau/debian/patches/series
Modified:
   branches/7.1/lib/libxau/Makefile.in
   branches/7.1/lib/libxau/aclocal.m4
   branches/7.1/lib/libxau/configure
   branches/7.1/lib/libxau/debian/changelog
   branches/7.1/lib/libxau/debian/compat
   branches/7.1/lib/libxau/debian/control
   branches/7.1/lib/libxau/debian/rules
Log:
* New upstream version
* Set up package to be able to use patches even if we're not currently
  shipping any. Add quilt to build-dep to deal.
* Autoreconf to fix manpage sections (closes: #376026, #356545)
* Remove duplicate x11-common depends from libxau-dev
* Version x11-common pre-dep in libxau-dev to 1:7.0.0 to match the rest of
  Debian and shut lintian up
* Bump standards version to 3.7.2.0
* Bump debhelper compat to 5

Including diff would make mail exceed size limit of 10 bytes.
Use svn diff -r 2411:2412 http://necrotic.deadbeast.net/svn/xorg-x11/;
to view diff.


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



X Strike Force X.Org X11 SVN commit: r2413 - in vendor/X11R7.1/lib/libxdmcp: . include/X11

2006-07-02 Thread X Strike Force SVN Repository Admin
Author: dnusinow
Date: 2006-07-02 21:46:24 -0400 (Sun, 02 Jul 2006)
New Revision: 2413

Modified:
   vendor/X11R7.1/lib/libxdmcp/ChangeLog
   vendor/X11R7.1/lib/libxdmcp/Makefile.am
   vendor/X11R7.1/lib/libxdmcp/Makefile.in
   vendor/X11R7.1/lib/libxdmcp/Wrap.h
   vendor/X11R7.1/lib/libxdmcp/Wraphelp.c
   vendor/X11R7.1/lib/libxdmcp/aclocal.m4
   vendor/X11R7.1/lib/libxdmcp/config.sub
   vendor/X11R7.1/lib/libxdmcp/configure
   vendor/X11R7.1/lib/libxdmcp/configure.ac
   vendor/X11R7.1/lib/libxdmcp/depcomp
   vendor/X11R7.1/lib/libxdmcp/include/X11/Xdmcp.h
   vendor/X11R7.1/lib/libxdmcp/install-sh
   vendor/X11R7.1/lib/libxdmcp/ltmain.sh
   vendor/X11R7.1/lib/libxdmcp/missing
Log:
Vendor drop of libxdmcp 1.0.1

Including diff would make mail exceed size limit of 10 bytes.
Use svn diff -r 2412:2413 http://necrotic.deadbeast.net/svn/xorg-x11/;
to view diff.


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



X Strike Force X.Org X11 SVN commit: r2414 - in branches/7.1/lib/libxdmcp: . include/X11

2006-07-02 Thread X Strike Force SVN Repository Admin
Author: dnusinow
Date: 2006-07-02 21:55:22 -0400 (Sun, 02 Jul 2006)
New Revision: 2414

Modified:
   branches/7.1/lib/libxdmcp/ChangeLog
   branches/7.1/lib/libxdmcp/Makefile.am
   branches/7.1/lib/libxdmcp/Makefile.in
   branches/7.1/lib/libxdmcp/Wrap.h
   branches/7.1/lib/libxdmcp/Wraphelp.c
   branches/7.1/lib/libxdmcp/aclocal.m4
   branches/7.1/lib/libxdmcp/config.sub
   branches/7.1/lib/libxdmcp/configure
   branches/7.1/lib/libxdmcp/configure.ac
   branches/7.1/lib/libxdmcp/depcomp
   branches/7.1/lib/libxdmcp/include/X11/Xdmcp.h
   branches/7.1/lib/libxdmcp/install-sh
   branches/7.1/lib/libxdmcp/ltmain.sh
   branches/7.1/lib/libxdmcp/missing
Log:
Merge libxdmcp 1.0.1 vendor drop to 7.1 working dir

Including diff would make mail exceed size limit of 10 bytes.
Use svn diff -r 2413:2414 http://necrotic.deadbeast.net/svn/xorg-x11/;
to view diff.


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



X Strike Force X.Org X11 SVN commit: r2415 - branches/7.1/lib/libxau/debian

2006-07-02 Thread X Strike Force SVN Repository Admin
Author: dnusinow
Date: 2006-07-02 22:06:16 -0400 (Sun, 02 Jul 2006)
New Revision: 2415

Modified:
   branches/7.1/lib/libxau/debian/changelog
   branches/7.1/lib/libxau/debian/rules
Log:
* Run dh_install with --list-missing

Modified: branches/7.1/lib/libxau/debian/changelog
===
--- branches/7.1/lib/libxau/debian/changelog2006-07-03 01:55:22 UTC (rev 
2414)
+++ branches/7.1/lib/libxau/debian/changelog2006-07-03 02:06:16 UTC (rev 
2415)
@@ -1,3 +1,9 @@
+libxau (1:1.0.1-2) UNRELEASED; urgency=low
+
+  * Run dh_install with --list-missing
+
+ -- David Nusinow [EMAIL PROTECTED]  Sun,  2 Jul 2006 22:05:56 -0400
+
 libxau (1:1.0.1-1) experimental; urgency=low
 
   * New upstream version

Modified: branches/7.1/lib/libxau/debian/rules
===
--- branches/7.1/lib/libxau/debian/rules2006-07-03 01:55:22 UTC (rev 
2414)
+++ branches/7.1/lib/libxau/debian/rules2006-07-03 02:06:16 UTC (rev 
2415)
@@ -72,7 +72,7 @@
dh_testroot
 
dh_installdocs
-   dh_install --sourcedir=debian/tmp
+   dh_install --sourcedir=debian/tmp --list-missing
dh_installchangelogs
dh_link
dh_strip --dbg-package=$(PACKAGE)-dbg


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



Processing of libxau_1.0.1-1_i386.changes

2006-07-02 Thread Archive Administrator
libxau_1.0.1-1_i386.changes uploaded successfully to localhost
along with the files:
  libxau_1.0.1-1.dsc
  libxau_1.0.1.orig.tar.gz
  libxau_1.0.1-1.diff.gz
  libxau6_1.0.1-1_i386.deb
  libxau6-dbg_1.0.1-1_i386.deb
  libxau-dev_1.0.1-1_i386.deb

Greetings,

Your Debian queue daemon


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



X Strike Force X.Org X11 SVN commit: r2416 - branches/7.1/lib/libxdmcp/debian

2006-07-02 Thread X Strike Force SVN Repository Admin
Author: dnusinow
Date: 2006-07-02 22:22:22 -0400 (Sun, 02 Jul 2006)
New Revision: 2416

Modified:
   branches/7.1/lib/libxdmcp/debian/changelog
   branches/7.1/lib/libxdmcp/debian/compat
   branches/7.1/lib/libxdmcp/debian/control
   branches/7.1/lib/libxdmcp/debian/libxdmcp-dev.install
   branches/7.1/lib/libxdmcp/debian/rules
Log:
* New upstream release
* Version all x11-common dependencies to 1:7.0.0 to match the rest of Debian
  and shut Debian up
* Remove extra dep on x11-common in the -dev package
* Bump standards version to 3.7.2.0
* Reformat -dev description so that it's not too long on any one line
* Bump debhelper compat to 5
* Run dh_install with --list-missing
* Don't try and install manpages for the -dev package, there aren't any

Modified: branches/7.1/lib/libxdmcp/debian/changelog
===
--- branches/7.1/lib/libxdmcp/debian/changelog  2006-07-03 02:06:16 UTC (rev 
2415)
+++ branches/7.1/lib/libxdmcp/debian/changelog  2006-07-03 02:22:22 UTC (rev 
2416)
@@ -1,3 +1,17 @@
+libxdmcp (1:1.0.1-1) experimental; urgency=low
+
+  * New upstream release
+  * Version all x11-common dependencies to 1:7.0.0 to match the rest of Debian
+and shut Debian up
+  * Remove extra dep on x11-common in the -dev package
+  * Bump standards version to 3.7.2.0
+  * Reformat -dev description so that it's not too long on any one line
+  * Bump debhelper compat to 5
+  * Run dh_install with --list-missing
+  * Don't try and install manpages for the -dev package, there aren't any
+
+ -- David Nusinow [EMAIL PROTECTED]  Sun,  2 Jul 2006 22:13:38 -0400
+
 libxdmcp (1:1.0.0-4) unstable; urgency=low
 
   * Reorder makeshlib command in rules file so that ldconfig is run

Modified: branches/7.1/lib/libxdmcp/debian/compat
===
--- branches/7.1/lib/libxdmcp/debian/compat 2006-07-03 02:06:16 UTC (rev 
2415)
+++ branches/7.1/lib/libxdmcp/debian/compat 2006-07-03 02:22:22 UTC (rev 
2416)
@@ -1 +1 @@
-4
+5

Modified: branches/7.1/lib/libxdmcp/debian/control
===
--- branches/7.1/lib/libxdmcp/debian/control2006-07-03 02:06:16 UTC (rev 
2415)
+++ branches/7.1/lib/libxdmcp/debian/control2006-07-03 02:22:22 UTC (rev 
2416)
@@ -3,12 +3,12 @@
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
 Uploaders: David Nusinow [EMAIL PROTECTED], Branden Robinson [EMAIL 
PROTECTED], Fabio M. Di Nitto [EMAIL PROTECTED]
-Build-Depends: debhelper (= 4.0.0), pkg-config, x11proto-core-dev
-Standards-Version: 3.6.1.0
+Build-Depends: debhelper (= 5.0.0), pkg-config, x11proto-core-dev
+Standards-Version: 3.7.2.0
 
 Package: libxdmcp6
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common (= 1:7.0)
+Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common (= 1:7.0.0)
 Description: X11 Display Manager Control Protocol library
  This package provides the main interface to the X11 display manager control
  protocol library, which allows for remote logins to display managers.
@@ -22,7 +22,7 @@
 
 Package: libxdmcp6-dbg
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common (= 1:7.0), libxdmcp6 
(= ${Source-Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common (= 1:7.0.0), 
libxdmcp6 (= ${Source-Version})
 Description: X11 authorisation library (debug package)
  This package provides the main interface to the X11 display manager control
  protocol library, which allows for remote logins to display managers.
@@ -39,14 +39,14 @@
 
 Package: libxdmcp-dev
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, libxdmcp6 (= 
${Source-Version}), x11proto-core-dev
-Pre-Depends: x11-common (= 1:7.0)
+Depends: ${shlibs:Depends}, ${misc:Depends}, libxdmcp6 (= ${Source-Version}), 
x11proto-core-dev
+Pre-Depends: x11-common (= 1:7.0.0)
 Description: X11 authorisation library (development headers)
  This package provides the main interface to the X11 display manager control
  protocol library, which allows for remote logins to display managers.
  .
- This package contains the development headers for the library found in 
libxdmcp6.
- Non-developers likely have little use for this package.
+ This package contains the development headers for the library found in 
+ libxdmcp6. Non-developers likely have little use for this package.
  .
  More information about X.Org can be found at:
  URL:http://xorg.freedesktop.org

Modified: branches/7.1/lib/libxdmcp/debian/libxdmcp-dev.install
===
--- branches/7.1/lib/libxdmcp/debian/libxdmcp-dev.install   2006-07-03 
02:06:16 UTC (rev 2415)
+++ branches/7.1/lib/libxdmcp/debian/libxdmcp-dev.install   2006-07-03 
02:22:22 UTC (rev 2416)
@@ -1,5 +1,4 @@
 usr/include/X11/*
-usr/share/man/man3/*
 usr/lib/libXdmcp.a
 usr/lib/libXdmcp.so
 usr/lib/pkgconfig/xdmcp.pc


X Strike Force X.Org X11 SVN commit: r2417 - tags/lib/libxdmcp

2006-07-02 Thread X Strike Force SVN Repository Admin
Author: dnusinow
Date: 2006-07-02 22:24:19 -0400 (Sun, 02 Jul 2006)
New Revision: 2417

Added:
   tags/lib/libxdmcp/libxdmcp-1:1.0.1-1/
Log:
Tag upload of libxdmcp-1:1.0.1-1 to experimental


Copied: tags/lib/libxdmcp/libxdmcp-1:1.0.1-1 (from rev 2416, 
branches/7.1/lib/libxdmcp)


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



X Strike Force X.Org X11 SVN commit: r2418 - tags/lib/libxau

2006-07-02 Thread X Strike Force SVN Repository Admin
Author: dnusinow
Date: 2006-07-02 22:28:26 -0400 (Sun, 02 Jul 2006)
New Revision: 2418

Added:
   tags/lib/libxau/libxau-1:1.0.1-1/
Log:
Tag upload of libxau-1:1.0.1-1 to experimental


Copied: tags/lib/libxau/libxau-1:1.0.1-1 (from rev 2410, 
branches/7.1/lib/libxau)


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



Processing of libxdmcp_1.0.1-1_i386.changes

2006-07-02 Thread Archive Administrator
libxdmcp_1.0.1-1_i386.changes uploaded successfully to localhost
along with the files:
  libxdmcp_1.0.1-1.dsc
  libxdmcp_1.0.1.orig.tar.gz
  libxdmcp_1.0.1-1.diff.gz
  libxdmcp6_1.0.1-1_i386.deb
  libxdmcp6-dbg_1.0.1-1_i386.deb
  libxdmcp-dev_1.0.1-1_i386.deb

Greetings,

Your Debian queue daemon


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