Re: X Strike Force SVN commit: rev 537 - branches/4.3.0/sid/debian

2003-09-18 Thread Daniel Stone 
On Wed, Sep 17, 2003 at 10:35:55PM -0500, Branden Robinson wrote:
> On Thu, Sep 18, 2003 at 11:19:12AM +1000, Daniel Stone wrote:
> > On Wed, Sep 17, 2003 at 09:06:52AM -0500, X Strike Force SVN Admin wrote:
> > > Author: branden
> > > Date: 2003-09-17 09:06:46 -0500 (Wed, 17 Sep 2003)
> > > New Revision: 537
> > > 
> > > Modified:
> > >branches/4.3.0/sid/debian/xlibs-data.install
> > > Log:
> > > debian/xlibs-data.install: sort this file in C collation order, instead of
> > >   en_AU or whatever DanielS had it in :-P
> > 
> > It was unsorted.
> 
> Because "svn merge" uses diff context to help it figure out what to do,
> that's probably a bad idea.
> 
> We should try to keep files that are simple lists sorted in C collation
> order.

Ya, will do. At the time, I just snarfed the relevant slabs from xlibs.install,
so they were ordered within sets. But yeah, I'll try to remember. And, BTW, my
locale is en_AU, no modifier. :P

-- 
Daniel Stone  <[EMAIL PROTECTED]>
http://www.debian.org - http://www.kde.org - http://www.freedesktop.org
"Configurability is always the best choice when it's pretty simple to implement"
  -- Havoc Pennington, gnome-list


pgphOApVYFuCb.pgp
Description: PGP signature

Re: X Strike Force SVN commit: rev 537 - branches/4.3.0/sid/debian

2003-09-17 Thread Branden Robinson 
On Thu, Sep 18, 2003 at 11:19:12AM +1000, Daniel Stone wrote:
> On Wed, Sep 17, 2003 at 09:06:52AM -0500, X Strike Force SVN Admin wrote:
> > Author: branden
> > Date: 2003-09-17 09:06:46 -0500 (Wed, 17 Sep 2003)
> > New Revision: 537
> > 
> > Modified:
> >branches/4.3.0/sid/debian/xlibs-data.install
> > Log:
> > debian/xlibs-data.install: sort this file in C collation order, instead of
> >   en_AU or whatever DanielS had it in :-P
> 
> It was unsorted.

Because "svn merge" uses diff context to help it figure out what to do,
that's probably a bad idea.

We should try to keep files that are simple lists sorted in C collation
order.

-- 
G. Branden Robinson|Computer security is like an onion:
Debian GNU/Linux   |the more you dig in, the more you
[EMAIL PROTECTED] |want to cry.
http://people.debian.org/~branden/ |-- Cory Altheide


signature.asc
Description: Digital signature

Re: X Strike Force SVN commit: rev 537 - branches/4.3.0/sid/debian

2003-09-17 Thread Daniel Stone 
On Wed, Sep 17, 2003 at 10:35:55PM -0500, Branden Robinson wrote:
> On Thu, Sep 18, 2003 at 11:19:12AM +1000, Daniel Stone wrote:
> > On Wed, Sep 17, 2003 at 09:06:52AM -0500, X Strike Force SVN Admin wrote:
> > > Author: branden
> > > Date: 2003-09-17 09:06:46 -0500 (Wed, 17 Sep 2003)
> > > New Revision: 537
> > > 
> > > Modified:
> > >branches/4.3.0/sid/debian/xlibs-data.install
> > > Log:
> > > debian/xlibs-data.install: sort this file in C collation order, instead of
> > >   en_AU or whatever DanielS had it in :-P
> > 
> > It was unsorted.
> 
> Because "svn merge" uses diff context to help it figure out what to do,
> that's probably a bad idea.
> 
> We should try to keep files that are simple lists sorted in C collation
> order.

Ya, will do. At the time, I just snarfed the relevant slabs from xlibs.install,
so they were ordered within sets. But yeah, I'll try to remember. And, BTW, my
locale is en_AU, no modifier. :P

-- 
Daniel Stone  <[EMAIL PROTECTED]>
http://www.debian.org - http://www.kde.org - http://www.freedesktop.org
"Configurability is always the best choice when it's pretty simple to implement"
  -- Havoc Pennington, gnome-list


pgp0.pgp
Description: PGP signature

Re: X Strike Force SVN commit: rev 537 - branches/4.3.0/sid/debian

2003-09-17 Thread Branden Robinson 
On Thu, Sep 18, 2003 at 11:19:12AM +1000, Daniel Stone wrote:
> On Wed, Sep 17, 2003 at 09:06:52AM -0500, X Strike Force SVN Admin wrote:
> > Author: branden
> > Date: 2003-09-17 09:06:46 -0500 (Wed, 17 Sep 2003)
> > New Revision: 537
> > 
> > Modified:
> >branches/4.3.0/sid/debian/xlibs-data.install
> > Log:
> > debian/xlibs-data.install: sort this file in C collation order, instead of
> >   en_AU or whatever DanielS had it in :-P
> 
> It was unsorted.

Because "svn merge" uses diff context to help it figure out what to do,
that's probably a bad idea.

We should try to keep files that are simple lists sorted in C collation
order.

-- 
G. Branden Robinson|Computer security is like an onion:
Debian GNU/Linux   |the more you dig in, the more you
[EMAIL PROTECTED] |want to cry.
http://people.debian.org/~branden/ |-- Cory Altheide


signature.asc
Description: Digital signature

Re: X Strike Force SVN commit: rev 537 - branches/4.3.0/sid/debian

2003-09-17 Thread Daniel Stone 
On Wed, Sep 17, 2003 at 09:06:52AM -0500, X Strike Force SVN Admin wrote:
> Author: branden
> Date: 2003-09-17 09:06:46 -0500 (Wed, 17 Sep 2003)
> New Revision: 537
> 
> Modified:
>branches/4.3.0/sid/debian/xlibs-data.install
> Log:
> debian/xlibs-data.install: sort this file in C collation order, instead of
>   en_AU or whatever DanielS had it in :-P

It was unsorted.

-- 
Daniel Stone  <[EMAIL PROTECTED]>
http://www.debian.org - http://www.kde.org - http://www.freedesktop.org
"Configurability is always the best choice when it's pretty simple to implement"
  -- Havoc Pennington, gnome-list


pgpb7UVp2wwPJ.pgp
Description: PGP signature

Re: X Strike Force SVN commit: rev 537 - branches/4.3.0/sid/debian

2003-09-17 Thread Daniel Stone 
On Wed, Sep 17, 2003 at 09:06:52AM -0500, X Strike Force SVN Admin wrote:
> Author: branden
> Date: 2003-09-17 09:06:46 -0500 (Wed, 17 Sep 2003)
> New Revision: 537
> 
> Modified:
>branches/4.3.0/sid/debian/xlibs-data.install
> Log:
> debian/xlibs-data.install: sort this file in C collation order, instead of
>   en_AU or whatever DanielS had it in :-P

It was unsorted.

-- 
Daniel Stone  <[EMAIL PROTECTED]>
http://www.debian.org - http://www.kde.org - http://www.freedesktop.org
"Configurability is always the best choice when it's pretty simple to implement"
  -- Havoc Pennington, gnome-list


pgp0.pgp
Description: PGP signature

X Strike Force SVN commit: rev 537 - branches/4.3.0/sid/debian

2003-09-17 Thread X Strike Force SVN Admin 
Author: branden
Date: 2003-09-17 09:06:46 -0500 (Wed, 17 Sep 2003)
New Revision: 537

Modified:
   branches/4.3.0/sid/debian/xlibs-data.install
Log:
debian/xlibs-data.install: sort this file in C collation order, instead of
  en_AU or whatever DanielS had it in :-P


Modified: branches/4.3.0/sid/debian/xlibs-data.install
===
--- branches/4.3.0/sid/debian/xlibs-data.install2003-09-16 20:20:52 UTC 
(rev 536)
+++ branches/4.3.0/sid/debian/xlibs-data.install2003-09-17 14:06:46 UTC 
(rev 537)
@@ -1,132 +1,7 @@
-usr/X11R6/lib/X11/icons/handhelds/cursors/X_cursor
-usr/X11R6/lib/X11/icons/handhelds/cursors/based_arrow_down
-usr/X11R6/lib/X11/icons/handhelds/cursors/based_arrow_up
-usr/X11R6/lib/X11/icons/handhelds/cursors/bottom_left_corner
-usr/X11R6/lib/X11/icons/handhelds/cursors/bottom_right_corner
-usr/X11R6/lib/X11/icons/handhelds/cursors/bottom_side
-usr/X11R6/lib/X11/icons/handhelds/cursors/bottom_tee
-usr/X11R6/lib/X11/icons/handhelds/cursors/center_ptr
-usr/X11R6/lib/X11/icons/handhelds/cursors/circle
-usr/X11R6/lib/X11/icons/handhelds/cursors/cross
-usr/X11R6/lib/X11/icons/handhelds/cursors/dot
-usr/X11R6/lib/X11/icons/handhelds/cursors/dotbox
-usr/X11R6/lib/X11/icons/handhelds/cursors/double_arrow
-usr/X11R6/lib/X11/icons/handhelds/cursors/draped_box
-usr/X11R6/lib/X11/icons/handhelds/cursors/fleur
-usr/X11R6/lib/X11/icons/handhelds/cursors/gumby
-usr/X11R6/lib/X11/icons/handhelds/cursors/hand2
-usr/X11R6/lib/X11/icons/handhelds/cursors/left_ptr
-usr/X11R6/lib/X11/icons/handhelds/cursors/left_ptr_watch
-usr/X11R6/lib/X11/icons/handhelds/cursors/left_side
-usr/X11R6/lib/X11/icons/handhelds/cursors/left_tee
-usr/X11R6/lib/X11/icons/handhelds/cursors/ll_angle
-usr/X11R6/lib/X11/icons/handhelds/cursors/pencil
-usr/X11R6/lib/X11/icons/handhelds/cursors/right_ptr
-usr/X11R6/lib/X11/icons/handhelds/cursors/right_side
-usr/X11R6/lib/X11/icons/handhelds/cursors/right_tee
-usr/X11R6/lib/X11/icons/handhelds/cursors/sb_h_double_arrow
-usr/X11R6/lib/X11/icons/handhelds/cursors/sb_right_arrow
-usr/X11R6/lib/X11/icons/handhelds/cursors/sb_up_arrow
-usr/X11R6/lib/X11/icons/handhelds/cursors/sb_v_double_arrow
-usr/X11R6/lib/X11/icons/handhelds/cursors/shuttle
-usr/X11R6/lib/X11/icons/handhelds/cursors/top_left_corner
-usr/X11R6/lib/X11/icons/handhelds/cursors/top_right_corner
-usr/X11R6/lib/X11/icons/handhelds/cursors/top_side
-usr/X11R6/lib/X11/icons/handhelds/cursors/top_tee
-usr/X11R6/lib/X11/icons/handhelds/cursors/watch
-usr/X11R6/lib/X11/icons/handhelds/cursors/xterm
-usr/X11R6/lib/X11/icons/redglass/cursors/X_cursor
-usr/X11R6/lib/X11/icons/redglass/cursors/based_arrow_down
-usr/X11R6/lib/X11/icons/redglass/cursors/based_arrow_up
-usr/X11R6/lib/X11/icons/redglass/cursors/bottom_left_corner
-usr/X11R6/lib/X11/icons/redglass/cursors/bottom_right_corner
-usr/X11R6/lib/X11/icons/redglass/cursors/bottom_side
-usr/X11R6/lib/X11/icons/redglass/cursors/bottom_tee
-usr/X11R6/lib/X11/icons/redglass/cursors/center_ptr
-usr/X11R6/lib/X11/icons/redglass/cursors/circle
-usr/X11R6/lib/X11/icons/redglass/cursors/cross
-usr/X11R6/lib/X11/icons/redglass/cursors/dot
-usr/X11R6/lib/X11/icons/redglass/cursors/dotbox
-usr/X11R6/lib/X11/icons/redglass/cursors/double_arrow
-usr/X11R6/lib/X11/icons/redglass/cursors/draped_box
-usr/X11R6/lib/X11/icons/redglass/cursors/fleur
-usr/X11R6/lib/X11/icons/redglass/cursors/gumby
-usr/X11R6/lib/X11/icons/redglass/cursors/hand2
-usr/X11R6/lib/X11/icons/redglass/cursors/left_ptr
-usr/X11R6/lib/X11/icons/redglass/cursors/left_ptr_watch
-usr/X11R6/lib/X11/icons/redglass/cursors/left_side
-usr/X11R6/lib/X11/icons/redglass/cursors/left_tee
-usr/X11R6/lib/X11/icons/redglass/cursors/ll_angle
-usr/X11R6/lib/X11/icons/redglass/cursors/pencil
-usr/X11R6/lib/X11/icons/redglass/cursors/right_ptr
-usr/X11R6/lib/X11/icons/redglass/cursors/right_side
-usr/X11R6/lib/X11/icons/redglass/cursors/right_tee
-usr/X11R6/lib/X11/icons/redglass/cursors/sb_h_double_arrow
-usr/X11R6/lib/X11/icons/redglass/cursors/sb_right_arrow
-usr/X11R6/lib/X11/icons/redglass/cursors/sb_up_arrow
-usr/X11R6/lib/X11/icons/redglass/cursors/sb_v_double_arrow
-usr/X11R6/lib/X11/icons/redglass/cursors/shuttle
-usr/X11R6/lib/X11/icons/redglass/cursors/top_left_corner
-usr/X11R6/lib/X11/icons/redglass/cursors/top_right_corner
-usr/X11R6/lib/X11/icons/redglass/cursors/top_side
-usr/X11R6/lib/X11/icons/redglass/cursors/top_tee
-usr/X11R6/lib/X11/icons/redglass/cursors/watch
-usr/X11R6/lib/X11/icons/redglass/cursors/xterm
-usr/X11R6/lib/X11/icons/whiteglass/cursors/X_cursor
-usr/X11R6/lib/X11/icons/whiteglass/cursors/base_arrow_down
-usr/X11R6/lib/X11/icons/whiteglass/cursors/base_arrow_up
-usr/X11R6/lib/X11/icons/whiteglass/cursors/boat
-usr/X11R6/lib/X11/icons/whiteglass/cursors/bottom_left_corner
-usr/X11R6/lib/X11/icons/whiteglass/cursors/bottom_right_corner
-usr/X11R6/lib/X11/icons/whiteglass/cursors/bottom_side
-usr/X11R6/lib/X11/icons/whiteglass/cursors/bottom_tee

X Strike Force SVN commit: rev 537 - branches/4.3.0/sid/debian

2003-09-17 Thread X Strike Force SVN Admin 
Author: branden
Date: 2003-09-17 09:06:46 -0500 (Wed, 17 Sep 2003)
New Revision: 537

Modified:
   branches/4.3.0/sid/debian/xlibs-data.install
Log:
debian/xlibs-data.install: sort this file in C collation order, instead of
  en_AU or whatever DanielS had it in :-P


Modified: branches/4.3.0/sid/debian/xlibs-data.install
===
--- branches/4.3.0/sid/debian/xlibs-data.install2003-09-16 20:20:52 UTC (rev 
536)
+++ branches/4.3.0/sid/debian/xlibs-data.install2003-09-17 14:06:46 UTC (rev 
537)
@@ -1,132 +1,7 @@
-usr/X11R6/lib/X11/icons/handhelds/cursors/X_cursor
-usr/X11R6/lib/X11/icons/handhelds/cursors/based_arrow_down
-usr/X11R6/lib/X11/icons/handhelds/cursors/based_arrow_up
-usr/X11R6/lib/X11/icons/handhelds/cursors/bottom_left_corner
-usr/X11R6/lib/X11/icons/handhelds/cursors/bottom_right_corner
-usr/X11R6/lib/X11/icons/handhelds/cursors/bottom_side
-usr/X11R6/lib/X11/icons/handhelds/cursors/bottom_tee
-usr/X11R6/lib/X11/icons/handhelds/cursors/center_ptr
-usr/X11R6/lib/X11/icons/handhelds/cursors/circle
-usr/X11R6/lib/X11/icons/handhelds/cursors/cross
-usr/X11R6/lib/X11/icons/handhelds/cursors/dot
-usr/X11R6/lib/X11/icons/handhelds/cursors/dotbox
-usr/X11R6/lib/X11/icons/handhelds/cursors/double_arrow
-usr/X11R6/lib/X11/icons/handhelds/cursors/draped_box
-usr/X11R6/lib/X11/icons/handhelds/cursors/fleur
-usr/X11R6/lib/X11/icons/handhelds/cursors/gumby
-usr/X11R6/lib/X11/icons/handhelds/cursors/hand2
-usr/X11R6/lib/X11/icons/handhelds/cursors/left_ptr
-usr/X11R6/lib/X11/icons/handhelds/cursors/left_ptr_watch
-usr/X11R6/lib/X11/icons/handhelds/cursors/left_side
-usr/X11R6/lib/X11/icons/handhelds/cursors/left_tee
-usr/X11R6/lib/X11/icons/handhelds/cursors/ll_angle
-usr/X11R6/lib/X11/icons/handhelds/cursors/pencil
-usr/X11R6/lib/X11/icons/handhelds/cursors/right_ptr
-usr/X11R6/lib/X11/icons/handhelds/cursors/right_side
-usr/X11R6/lib/X11/icons/handhelds/cursors/right_tee
-usr/X11R6/lib/X11/icons/handhelds/cursors/sb_h_double_arrow
-usr/X11R6/lib/X11/icons/handhelds/cursors/sb_right_arrow
-usr/X11R6/lib/X11/icons/handhelds/cursors/sb_up_arrow
-usr/X11R6/lib/X11/icons/handhelds/cursors/sb_v_double_arrow
-usr/X11R6/lib/X11/icons/handhelds/cursors/shuttle
-usr/X11R6/lib/X11/icons/handhelds/cursors/top_left_corner
-usr/X11R6/lib/X11/icons/handhelds/cursors/top_right_corner
-usr/X11R6/lib/X11/icons/handhelds/cursors/top_side
-usr/X11R6/lib/X11/icons/handhelds/cursors/top_tee
-usr/X11R6/lib/X11/icons/handhelds/cursors/watch
-usr/X11R6/lib/X11/icons/handhelds/cursors/xterm
-usr/X11R6/lib/X11/icons/redglass/cursors/X_cursor
-usr/X11R6/lib/X11/icons/redglass/cursors/based_arrow_down
-usr/X11R6/lib/X11/icons/redglass/cursors/based_arrow_up
-usr/X11R6/lib/X11/icons/redglass/cursors/bottom_left_corner
-usr/X11R6/lib/X11/icons/redglass/cursors/bottom_right_corner
-usr/X11R6/lib/X11/icons/redglass/cursors/bottom_side
-usr/X11R6/lib/X11/icons/redglass/cursors/bottom_tee
-usr/X11R6/lib/X11/icons/redglass/cursors/center_ptr
-usr/X11R6/lib/X11/icons/redglass/cursors/circle
-usr/X11R6/lib/X11/icons/redglass/cursors/cross
-usr/X11R6/lib/X11/icons/redglass/cursors/dot
-usr/X11R6/lib/X11/icons/redglass/cursors/dotbox
-usr/X11R6/lib/X11/icons/redglass/cursors/double_arrow
-usr/X11R6/lib/X11/icons/redglass/cursors/draped_box
-usr/X11R6/lib/X11/icons/redglass/cursors/fleur
-usr/X11R6/lib/X11/icons/redglass/cursors/gumby
-usr/X11R6/lib/X11/icons/redglass/cursors/hand2
-usr/X11R6/lib/X11/icons/redglass/cursors/left_ptr
-usr/X11R6/lib/X11/icons/redglass/cursors/left_ptr_watch
-usr/X11R6/lib/X11/icons/redglass/cursors/left_side
-usr/X11R6/lib/X11/icons/redglass/cursors/left_tee
-usr/X11R6/lib/X11/icons/redglass/cursors/ll_angle
-usr/X11R6/lib/X11/icons/redglass/cursors/pencil
-usr/X11R6/lib/X11/icons/redglass/cursors/right_ptr
-usr/X11R6/lib/X11/icons/redglass/cursors/right_side
-usr/X11R6/lib/X11/icons/redglass/cursors/right_tee
-usr/X11R6/lib/X11/icons/redglass/cursors/sb_h_double_arrow
-usr/X11R6/lib/X11/icons/redglass/cursors/sb_right_arrow
-usr/X11R6/lib/X11/icons/redglass/cursors/sb_up_arrow
-usr/X11R6/lib/X11/icons/redglass/cursors/sb_v_double_arrow
-usr/X11R6/lib/X11/icons/redglass/cursors/shuttle
-usr/X11R6/lib/X11/icons/redglass/cursors/top_left_corner
-usr/X11R6/lib/X11/icons/redglass/cursors/top_right_corner
-usr/X11R6/lib/X11/icons/redglass/cursors/top_side
-usr/X11R6/lib/X11/icons/redglass/cursors/top_tee
-usr/X11R6/lib/X11/icons/redglass/cursors/watch
-usr/X11R6/lib/X11/icons/redglass/cursors/xterm
-usr/X11R6/lib/X11/icons/whiteglass/cursors/X_cursor
-usr/X11R6/lib/X11/icons/whiteglass/cursors/base_arrow_down
-usr/X11R6/lib/X11/icons/whiteglass/cursors/base_arrow_up
-usr/X11R6/lib/X11/icons/whiteglass/cursors/boat
-usr/X11R6/lib/X11/icons/whiteglass/cursors/bottom_left_corner
-usr/X11R6/lib/X11/icons/whiteglass/cursors/bottom_right_corner
-usr/X11R6/lib/X11/icons/whiteglass/cursors/bottom_side
-usr/X11R6/lib/X11/icons/whiteglass/cursors/bottom_tee