Bug#276345: copy-paste troubles with the first line of a less

2004-10-22 Thread Thomas Dickey 
On Fri, Oct 22, 2004 at 08:20:04PM +0200, Vincent Lefevre wrote:
> On 2004-10-13 16:34:42 +0200, Lo?c Minier wrote:
> >  It's been some months now that I repeatedly get a strange problem with
> >  a less in xterm:  if I select the first line of the xterm window, being
> >  the first line of the less dump too, I am pasting some sort of buffered
> >  data too, coming from previous lines of output.
> 
> FYI, I reported this bug to Thomas on 2002-03-08.

It might only be a similar bug.  Here are two that are in the same general
area:

  Patch #183 - 2003/12/26 - XFree86 4.3.99.903

 * add a limit check to ScrnTstWrapped() (XFree86 Bugzilla #981).

 Patch #167 - 2002/8/24 - XFree86 4.2.0

 * correct limit-checking in ComputeSelect() to handle selections that
   extend  off  the visible area; rather than modify the parameters to
   TrackText(),  use  ScrollSelection()  to  update  the  highlighting
   limits. (reported by Yegappan Lakshmanan and Nelson Beebe, patch by
   Alexander V Lukyanov).


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


pgpSbaLMUSHP5.pgp
Description: PGP signature

Bug#277832: copy-paste of non-ISO-8859-1 characters between uxterm's is broken

2004-10-22 Thread Thomas Dickey 
On Fri, Oct 22, 2004 at 08:10:11PM +0200, Vincent Lefevre wrote:
> Package: xterm
> Version: 4.3.0.dfsg.1-8
> Severity: normal
> 
> I open two uxterm's. In the first one, I type from zsh:
> 
>   echo \\u20ac
> 
> to get a Euro symbol. I double-click on this Euro symbol and paste it
> (with the middle button) to the second uxterm. No problem: I get the
> Euro symbol.
> 
> Now, I click in the first uxterm; the Euro symbol no longer appears
> as selected (this is normal). I click with the middle button in the
> second uxterm. But instead of getting the Euro symbol, I get a hash
> (#).

I noticed this earlier this week, and don't recall seeing it before
except when the xterm owning the selection had lost focus (no need
to beat that dead horse).

The particular case I noticed involved a single instance of uxterm -
in one scenario the paste works properly, but in the other I get a '#'
on the second try at pasting.

I was testing some locale improvements for vile, with the screen split
into two parts.  One shows the printable characters, and the other is
a buffer into which I was inserting.  Using select/paste from the
character list shows the bug (I got one instance of the expected character
and then a '#').  Selecting from the edit-buffer shows no problem.

I don't know the cause, but have it on my to-do list to investigate.
But it does appear to be something that I can fix.

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


pgpT2BmGSBNDm.pgp
Description: PGP signature

Bug#276345: copy-paste troubles with the first line of a less

2004-10-22 Thread Vincent Lefevre 
On 2004-10-13 16:34:42 +0200, Loïc Minier wrote:
>  It's been some months now that I repeatedly get a strange problem with
>  a less in xterm:  if I select the first line of the xterm window, being
>  the first line of the less dump too, I am pasting some sort of buffered
>  data too, coming from previous lines of output.

FYI, I reported this bug to Thomas on 2002-03-08.

-- 
Vincent Lefèvre <[EMAIL PROTECTED]> - Web: 
100% accessible validated (X)HTML - Blog: 
Work: CR INRIA - computer arithmetic / SPACES project at LORIA

Bug#277832: copy-paste of non-ISO-8859-1 characters between uxterm's is broken

2004-10-22 Thread Vincent Lefevre 
Package: xterm
Version: 4.3.0.dfsg.1-8
Severity: normal

I open two uxterm's. In the first one, I type from zsh:

  echo \\u20ac

to get a Euro symbol. I double-click on this Euro symbol and paste it
(with the middle button) to the second uxterm. No problem: I get the
Euro symbol.

Now, I click in the first uxterm; the Euro symbol no longer appears
as selected (this is normal). I click with the middle button in the
second uxterm. But instead of getting the Euro symbol, I get a hash
(#).

I don't have this problem with ISO-8859-1 characters (éèê).

-- System Information:
Debian Release: 3.1
  APT prefers testing
  APT policy: (900, 'testing'), (200, 'unstable')
Architecture: powerpc (ppc)
Kernel: Linux 2.6.8
Locale: LANG=POSIX, LC_CTYPE=en_US.ISO8859-1

Versions of packages xterm depends on:
ii  libc6 2.3.2.ds1-16   GNU C Library: Shared libraries an
ii  libexpat1 1.95.6-8   XML parsing C library - runtime li
ii  libfontconfig12.2.3-1generic font configuration library
ii  libfreetype6  2.1.7-2.2  FreeType 2 font engine, shared lib
ii  libice6   4.3.0.dfsg.1-8 Inter-Client Exchange library
ii  libncurses5   5.4-4  Shared libraries for terminal hand
ii  libsm64.3.0.dfsg.1-8 X Window System Session Management
ii  libxaw7   4.3.0.dfsg.1-8 X Athena widget set library
ii  libxext6  4.3.0.dfsg.1-8 X Window System miscellaneous exte
ii  libxft2   2.1.2-6FreeType-based font drawing librar
ii  libxmu6   4.3.0.dfsg.1-8 X Window System miscellaneous util
ii  libxpm4   4.3.0.dfsg.1-8 X pixmap library
ii  libxrender1   0.8.3-7X Rendering Extension client libra
ii  libxt64.3.0.dfsg.1-8 X Toolkit Intrinsics
ii  xlibs 4.3.0.dfsg.1-8 X Window System client libraries m
ii  xlibs-data4.3.0.dfsg.1-8 X Window System client data

-- no debconf information

X Strike Force XOrg SVN commit: r89 - /

2004-10-22 Thread X Strike Force SVN Repository Admin 
Author: fabbione
Date: 2004-10-22 12:24:39 -0500 (Fri, 22 Oct 2004)
New Revision: 89

Modified:
   proposed-name-schema
Log:
* Update xorg-config package list.
(Cosmetic) Change package list allignment.


Modified: proposed-name-schema
===
--- proposed-name-schema2004-10-22 17:07:55 UTC (rev 88)
+++ proposed-name-schema2004-10-22 17:24:39 UTC (rev 89)
@@ -13,7 +13,9 @@
 |
 |-->  xorg-source-config-->  xorg-config
 ||
-|\-->  xutils-devel
+||-->  xutils-devel
+||
+|\-->  xorg-dev
 |
 |-->  xorg-source-doc   -->  xorg-doc
 ||
@@ -37,9 +39,9 @@
 |
 |-->  xorg-source-lib-fs-->  xorg-lib-fs
 ||
-||--> libfs6
+||-->  libfs6
 ||
-|\--> libfs-dev
+|\-->  libfs-dev
 |
 |-->  xorg-source-lib-gl-->  xorg-lib-gl
 |
@@ -59,9 +61,9 @@
 |
 |-->  xorg-source-lib-xau   -->  xorg-lib-xau
 ||
-||--> libxau6
+||-->  libxau6
 ||
-|\--> libxau-dev
+|\-->  libxau-dev
 |
 |-->  xorg-source-lib-xaw   -->  xorg-lib-xaw
 |
@@ -79,9 +81,9 @@
 |
 |-->  xorg-source-lib-xdmcp -->  xorg-lib-xdmcp
 ||
-||--> libxdmcp6
+||-->  libxdmcp6
 ||
-|\--> libxdmcp-dev
+|\-->  libxdmcp-dev
 |
 |-->  xorg-source-lib-xevie -->  xorg-lib-xevie
 |

X Strike Force XOrg SVN commit: r88 - in xorg-lib-xdmcp/trunk/debian: . patches

2004-10-22 Thread X Strike Force SVN Repository Admin 
Author: fabbione
Date: 2004-10-22 12:07:55 -0500 (Fri, 22 Oct 2004)
New Revision: 88

Removed:
   xorg-lib-xdmcp/trunk/debian/patches/008_fix_xgetpw_macro.diff
Modified:
   xorg-lib-xdmcp/trunk/debian/CHANGESETS
   xorg-lib-xdmcp/trunk/debian/control
   xorg-lib-xdmcp/trunk/debian/rules
Log:
* Sync the package with xorg-config changes:
  + Update Build-Deps:
- Add xorg-dev.
- Remove xutils-devel xorg-source-include.
  + Remove 008_fix_xgetpw_macro.diff.
  + Update debian/rules:
- Remove call to symlinks target.



Modified: xorg-lib-xdmcp/trunk/debian/CHANGESETS
===
--- xorg-lib-xdmcp/trunk/debian/CHANGESETS  2004-10-22 17:05:58 UTC (rev 87)
+++ xorg-lib-xdmcp/trunk/debian/CHANGESETS  2004-10-22 17:07:55 UTC (rev 88)
@@ -11,4 +11,13 @@
 * Import initial debian/* files
 83
 
+* Sync the package with xorg-config changes:
+  + Update Build-Deps:
+- Add xorg-dev.
+- Remove xutils-devel xorg-source-include.
+  + Remove 008_fix_xgetpw_macro.diff.
+  + Update debian/rules:
+- Remove call to symlinks target.
+88
+
 vim:set ai et sts=4 sw=4 tw=80:

Modified: xorg-lib-xdmcp/trunk/debian/control
===
--- xorg-lib-xdmcp/trunk/debian/control 2004-10-22 17:05:58 UTC (rev 87)
+++ xorg-lib-xdmcp/trunk/debian/control 2004-10-22 17:07:55 UTC (rev 88)
@@ -4,7 +4,7 @@
 Maintainer: Debian X Strike Force 
 Uploaders: Branden Robinson <[EMAIL PROTECTED]>, Fabio M. Di Nitto <[EMAIL 
PROTECTED]>
 Standards-Version: 3.6.1
-Build-Depends: dpkg (>= 1.7.0), dbs, debhelper (>= 4.1.16), xutils-devel (>= 
6.8.1-0+SVN), xorg-source-lib-xdmcp (>= 6.8.1-0+SVN), xorg-source-include (>= 
6.8.1-0+SVN)
+Build-Depends: dpkg (>= 1.7.0), dbs, debhelper (>= 4.1.16), xorg-dev (>= 
6.8.1-0+SVN), xorg-source-lib-xdmcp (>= 6.8.1-0+SVN)
 
 Package: libxdmcp6
 Architecture: any

Deleted: xorg-lib-xdmcp/trunk/debian/patches/008_fix_xgetpw_macro.diff
===
--- xorg-lib-xdmcp/trunk/debian/patches/008_fix_xgetpw_macro.diff   
2004-10-22 17:05:58 UTC (rev 87)
+++ xorg-lib-xdmcp/trunk/debian/patches/008_fix_xgetpw_macro.diff   
2004-10-22 17:07:55 UTC (rev 88)
@@ -1,90 +0,0 @@
-$Id$
-
-Fix the _XGetpwnam macro to be more consistent; this patch by Robert Millan.
-
 xc/include/Xos_r.h.old 2003-04-11 14:54:50.0 +0200
-+++ xc/include/Xos_r.h 2003-04-11 12:56:19.0 +0200
-@@ -217,8 +217,8 @@
-  *
-  * typedef ... _Xgetpwparams;
-  *
-- * struct passwd* _XGetpwnam(const char *name, _Xgetpwparams);
-- * struct passwd* _XGetpwuid(uid_t uid, _Xgetpwparams);
-+ * struct passwd* _XGetpwnam(const char *name, _Xgetpwparams, struct **dummy);
-+ * struct passwd* _XGetpwuid(uid_t uid, _Xgetpwparams, struct **dummy);
-  */
- 
- #if defined(X_INCLUDE_PWD_H) && !defined(_XOS_INCLUDED_PWD_H)
-@@ -238,8 +238,8 @@
- extern struct passwd *getpwuid(), *getpwnam();
- # endif
- typedef int _Xgetpwparams;/* dummy */
--# define _XGetpwuid(u,p)  getpwuid((u))
--# define _XGetpwnam(u,p)  getpwnam((u))
-+# define _XGetpwuid(u,p,s)getpwuid((u))
-+# define _XGetpwnam(u,p,s)getpwnam((u))
- 
- #elif !defined(XOS_USE_MTSAFE_PWDAPI) || defined(XNO_MTSAFE_PWDAPI)
- /* UnixWare 2.0, or other systems with thread support but no _r API. */
-@@ -316,12 +316,12 @@
- ((p).pwp = &(p).pws), \
- 0 )
- #endif
--# define _XGetpwuid(u,p) \
-+# define _XGetpwuid(u,p,s) \
- ( (_Xos_processLock), \
-   (((p).pwp = getpwuid((u))) ? _Xpw_copyPasswd(p), 0 : 0), \
-   (_Xos_processUnlock), \
-   (p).pwp )
--# define _XGetpwnam(u,p) \
-+# define _XGetpwnam(u,p,s) \
- ( (_Xos_processLock), \
-   (((p).pwp = getpwnam((u))) ? _Xpw_copyPasswd(p), 0 : 0), \
-   (_Xos_processUnlock), \
-@@ -336,21 +336,21 @@
- } _Xgetpwparams;
- # if defined(_POSIX_REENTRANT_FUNCTIONS) || !defined(SVR4) || defined(Lynx)
- #  ifndef Lynx
--#   define _XGetpwuid(u,p) \
--((getpwuid_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf)) == -1) ? NULL : 
&(p).pws)
--#   define _XGetpwnam(u,p) \
--((getpwnam_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf)) == -1) ? NULL : 
&(p).pws)
-+#   define _XGetpwuid(u,p,s) \
-+((getpwuid_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf),(s)) == -1) ? NULL : 
&(p).pws)
-+#   define _XGetpwnam(u,p,s) \
-+((getpwnam_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf),(s)) == -1) ? NULL : 
&(p).pws)
- #  else /* Lynx */
--#   define _XGetpwuid(u,p) \
--((getpwuid_r(&(p).pws,(u),(p).pwbuf,sizeof((p).pwbuf)) == -1) ? NULL : 
&(p).pws)
--#   define _XGetpwnam(u,p) \
--((getpwnam_r(&(p).pws,(u),(p).pwbuf,sizeof((p).pwbuf)) == -1) ? NULL : 
&(p).pws)
-+#   define _XGetpwuid(u,p,s) \
-+((getpwuid_r(&(p).pws,(u),(p).pwbuf,sizeof((p).pwbuf),(s)) == -1) ? NULL : 
&(p).pws)
-+#   define _XGetpwnam(u,p,s) \
-+((getpwnam_r(&(p).pws,(u),(p).pwbuf,sizeof((p).pwbuf),(s)) == -1) ? NULL : 
&(p).pws)
- #  endif
- # else /* SVR4 */
--#  define _XGetpwuid(u,p) \
--((getpwuid_r(

X Strike Force XOrg SVN commit: r87 - in xorg-lib-xau/trunk/debian: . patches

2004-10-22 Thread X Strike Force SVN Repository Admin 
Author: fabbione
Date: 2004-10-22 12:05:58 -0500 (Fri, 22 Oct 2004)
New Revision: 87

Removed:
   xorg-lib-xau/trunk/debian/patches/008_fix_xgetpw_macro.diff
Modified:
   xorg-lib-xau/trunk/debian/CHANGESETS
   xorg-lib-xau/trunk/debian/control
   xorg-lib-xau/trunk/debian/rules
Log:
* Sync the package with xorg-config changes:
  + Update Build-Deps:
- Add xorg-dev.
- Remove xutils-devel xorg-source-include.
  + Remove 008_fix_xgetpw_macro.diff.
  + Update debian/rules:
- Remove call to symlinks target.



Modified: xorg-lib-xau/trunk/debian/CHANGESETS
===
--- xorg-lib-xau/trunk/debian/CHANGESETS2004-10-22 17:03:09 UTC (rev 86)
+++ xorg-lib-xau/trunk/debian/CHANGESETS2004-10-22 17:05:58 UTC (rev 87)
@@ -11,4 +11,13 @@
 * Import initial debian/* files
 80
 
+* Sync the package with xorg-config changes:
+  + Update Build-Deps:
+- Add xorg-dev.
+- Remove xutils-devel xorg-source-include.
+  + Remove 008_fix_xgetpw_macro.diff.
+  + Update debian/rules:
+- Remove call to symlinks target.
+87
+
 vim:set ai et sts=4 sw=4 tw=80:

Modified: xorg-lib-xau/trunk/debian/control
===
--- xorg-lib-xau/trunk/debian/control   2004-10-22 17:03:09 UTC (rev 86)
+++ xorg-lib-xau/trunk/debian/control   2004-10-22 17:05:58 UTC (rev 87)
@@ -4,7 +4,7 @@
 Maintainer: Debian X Strike Force 
 Uploaders: Branden Robinson <[EMAIL PROTECTED]>, Fabio M. Di Nitto <[EMAIL 
PROTECTED]>
 Standards-Version: 3.6.1
-Build-Depends: dpkg (>= 1.7.0), dbs, debhelper (>= 4.1.16), xutils-devel (>= 
6.8.1-0+SVN), xorg-source-lib-xau (>= 6.8.1-0+SVN), xorg-source-include (>= 
6.8.1-0+SVN)
+Build-Depends: dpkg (>= 1.7.0), dbs, debhelper (>= 4.1.16), xorg-dev (>= 
6.8.1-0+SVN), xorg-source-lib-xau (>= 6.8.1-0+SVN)
 
 Package: libxau6
 Architecture: any

Deleted: xorg-lib-xau/trunk/debian/patches/008_fix_xgetpw_macro.diff
===
--- xorg-lib-xau/trunk/debian/patches/008_fix_xgetpw_macro.diff 2004-10-22 
17:03:09 UTC (rev 86)
+++ xorg-lib-xau/trunk/debian/patches/008_fix_xgetpw_macro.diff 2004-10-22 
17:05:58 UTC (rev 87)
@@ -1,90 +0,0 @@
-$Id$
-
-Fix the _XGetpwnam macro to be more consistent; this patch by Robert Millan.
-
 xc/include/Xos_r.h.old 2003-04-11 14:54:50.0 +0200
-+++ xc/include/Xos_r.h 2003-04-11 12:56:19.0 +0200
-@@ -217,8 +217,8 @@
-  *
-  * typedef ... _Xgetpwparams;
-  *
-- * struct passwd* _XGetpwnam(const char *name, _Xgetpwparams);
-- * struct passwd* _XGetpwuid(uid_t uid, _Xgetpwparams);
-+ * struct passwd* _XGetpwnam(const char *name, _Xgetpwparams, struct **dummy);
-+ * struct passwd* _XGetpwuid(uid_t uid, _Xgetpwparams, struct **dummy);
-  */
- 
- #if defined(X_INCLUDE_PWD_H) && !defined(_XOS_INCLUDED_PWD_H)
-@@ -238,8 +238,8 @@
- extern struct passwd *getpwuid(), *getpwnam();
- # endif
- typedef int _Xgetpwparams;/* dummy */
--# define _XGetpwuid(u,p)  getpwuid((u))
--# define _XGetpwnam(u,p)  getpwnam((u))
-+# define _XGetpwuid(u,p,s)getpwuid((u))
-+# define _XGetpwnam(u,p,s)getpwnam((u))
- 
- #elif !defined(XOS_USE_MTSAFE_PWDAPI) || defined(XNO_MTSAFE_PWDAPI)
- /* UnixWare 2.0, or other systems with thread support but no _r API. */
-@@ -316,12 +316,12 @@
- ((p).pwp = &(p).pws), \
- 0 )
- #endif
--# define _XGetpwuid(u,p) \
-+# define _XGetpwuid(u,p,s) \
- ( (_Xos_processLock), \
-   (((p).pwp = getpwuid((u))) ? _Xpw_copyPasswd(p), 0 : 0), \
-   (_Xos_processUnlock), \
-   (p).pwp )
--# define _XGetpwnam(u,p) \
-+# define _XGetpwnam(u,p,s) \
- ( (_Xos_processLock), \
-   (((p).pwp = getpwnam((u))) ? _Xpw_copyPasswd(p), 0 : 0), \
-   (_Xos_processUnlock), \
-@@ -336,21 +336,21 @@
- } _Xgetpwparams;
- # if defined(_POSIX_REENTRANT_FUNCTIONS) || !defined(SVR4) || defined(Lynx)
- #  ifndef Lynx
--#   define _XGetpwuid(u,p) \
--((getpwuid_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf)) == -1) ? NULL : 
&(p).pws)
--#   define _XGetpwnam(u,p) \
--((getpwnam_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf)) == -1) ? NULL : 
&(p).pws)
-+#   define _XGetpwuid(u,p,s) \
-+((getpwuid_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf),(s)) == -1) ? NULL : 
&(p).pws)
-+#   define _XGetpwnam(u,p,s) \
-+((getpwnam_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf),(s)) == -1) ? NULL : 
&(p).pws)
- #  else /* Lynx */
--#   define _XGetpwuid(u,p) \
--((getpwuid_r(&(p).pws,(u),(p).pwbuf,sizeof((p).pwbuf)) == -1) ? NULL : 
&(p).pws)
--#   define _XGetpwnam(u,p) \
--((getpwnam_r(&(p).pws,(u),(p).pwbuf,sizeof((p).pwbuf)) == -1) ? NULL : 
&(p).pws)
-+#   define _XGetpwuid(u,p,s) \
-+((getpwuid_r(&(p).pws,(u),(p).pwbuf,sizeof((p).pwbuf),(s)) == -1) ? NULL : 
&(p).pws)
-+#   define _XGetpwnam(u,p,s) \
-+((getpwnam_r(&(p).pws,(u),(p).pwbuf,sizeof((p).pwbuf),(s)) == -1) ? NULL : 
&(p).pws)
- #  endif
- # else /* SVR4 */
--#  define _XGetpwuid(u,p) \
--((getpwuid_r((u),&(p).pws,(p).pwbuf,sizeof((p).pw

X Strike Force XOrg SVN commit: r86 - in xorg-lib-fs/trunk/debian: . patches

2004-10-22 Thread X Strike Force SVN Repository Admin 
Author: fabbione
Date: 2004-10-22 12:03:09 -0500 (Fri, 22 Oct 2004)
New Revision: 86

Removed:
   xorg-lib-fs/trunk/debian/patches/008_fix_xgetpw_macro.diff
Modified:
   xorg-lib-fs/trunk/debian/CHANGESETS
   xorg-lib-fs/trunk/debian/control
   xorg-lib-fs/trunk/debian/rules
Log:
* Sync the package with xorg-config changes:
  + Update Build-Deps:
- Add xorg-dev.
- Remove xutils-devel xorg-source-include.
  + Remove 008_fix_xgetpw_macro.diff.
  + Update debian/rules:
- Remove call to symlinks target.
- Create required symlinks.



Modified: xorg-lib-fs/trunk/debian/CHANGESETS
===
--- xorg-lib-fs/trunk/debian/CHANGESETS 2004-10-22 16:57:24 UTC (rev 85)
+++ xorg-lib-fs/trunk/debian/CHANGESETS 2004-10-22 17:03:09 UTC (rev 86)
@@ -16,4 +16,14 @@
   proper header to the patch.
 77
 
+* Sync the package with xorg-config changes:
+  + Update Build-Deps:
+- Add xorg-dev.
+- Remove xutils-devel xorg-source-include.
+  + Remove 008_fix_xgetpw_macro.diff.
+  + Update debian/rules:
+- Remove call to symlinks target.
+- Create required symlinks.
+86
+
 vim:set ai et sts=4 sw=4 tw=80:

Modified: xorg-lib-fs/trunk/debian/control
===
--- xorg-lib-fs/trunk/debian/control2004-10-22 16:57:24 UTC (rev 85)
+++ xorg-lib-fs/trunk/debian/control2004-10-22 17:03:09 UTC (rev 86)
@@ -4,7 +4,7 @@
 Maintainer: Debian X Strike Force 
 Uploaders: Branden Robinson <[EMAIL PROTECTED]>, Fabio M. Di Nitto <[EMAIL 
PROTECTED]>
 Standards-Version: 3.6.1
-Build-Depends: dpkg (>= 1.7.0), dbs, debhelper (>= 4.1.16), xutils-devel (>= 
6.8.1-0+SVN), xorg-source-lib-fs (>= 6.8.1-0+SVN), xorg-source-lib-xtrans (>= 
6.8.1-0+SVN), xorg-source-include (>= 6.8.1-0+SVN), xorg-source-include-fonts 
(>= 6.8.1-0+SVN)
+Build-Depends: dpkg (>= 1.7.0), dbs, debhelper (>= 4.1.16), xorg-dev (>= 
6.8.1-0+SVN), xorg-source-lib-fs (>= 6.8.1-0+SVN), xorg-source-lib-xtrans (>= 
6.8.1-0+SVN), xorg-source-include-fonts (>= 6.8.1-0+SVN)
 
 Package: libfs6
 Architecture: any

Deleted: xorg-lib-fs/trunk/debian/patches/008_fix_xgetpw_macro.diff
===
--- xorg-lib-fs/trunk/debian/patches/008_fix_xgetpw_macro.diff  2004-10-22 
16:57:24 UTC (rev 85)
+++ xorg-lib-fs/trunk/debian/patches/008_fix_xgetpw_macro.diff  2004-10-22 
17:03:09 UTC (rev 86)
@@ -1,90 +0,0 @@
-$Id$
-
-Fix the _XGetpwnam macro to be more consistent; this patch by Robert Millan.
-
 xc/include/Xos_r.h.old 2003-04-11 14:54:50.0 +0200
-+++ xc/include/Xos_r.h 2003-04-11 12:56:19.0 +0200
-@@ -217,8 +217,8 @@
-  *
-  * typedef ... _Xgetpwparams;
-  *
-- * struct passwd* _XGetpwnam(const char *name, _Xgetpwparams);
-- * struct passwd* _XGetpwuid(uid_t uid, _Xgetpwparams);
-+ * struct passwd* _XGetpwnam(const char *name, _Xgetpwparams, struct **dummy);
-+ * struct passwd* _XGetpwuid(uid_t uid, _Xgetpwparams, struct **dummy);
-  */
- 
- #if defined(X_INCLUDE_PWD_H) && !defined(_XOS_INCLUDED_PWD_H)
-@@ -238,8 +238,8 @@
- extern struct passwd *getpwuid(), *getpwnam();
- # endif
- typedef int _Xgetpwparams;/* dummy */
--# define _XGetpwuid(u,p)  getpwuid((u))
--# define _XGetpwnam(u,p)  getpwnam((u))
-+# define _XGetpwuid(u,p,s)getpwuid((u))
-+# define _XGetpwnam(u,p,s)getpwnam((u))
- 
- #elif !defined(XOS_USE_MTSAFE_PWDAPI) || defined(XNO_MTSAFE_PWDAPI)
- /* UnixWare 2.0, or other systems with thread support but no _r API. */
-@@ -316,12 +316,12 @@
- ((p).pwp = &(p).pws), \
- 0 )
- #endif
--# define _XGetpwuid(u,p) \
-+# define _XGetpwuid(u,p,s) \
- ( (_Xos_processLock), \
-   (((p).pwp = getpwuid((u))) ? _Xpw_copyPasswd(p), 0 : 0), \
-   (_Xos_processUnlock), \
-   (p).pwp )
--# define _XGetpwnam(u,p) \
-+# define _XGetpwnam(u,p,s) \
- ( (_Xos_processLock), \
-   (((p).pwp = getpwnam((u))) ? _Xpw_copyPasswd(p), 0 : 0), \
-   (_Xos_processUnlock), \
-@@ -336,21 +336,21 @@
- } _Xgetpwparams;
- # if defined(_POSIX_REENTRANT_FUNCTIONS) || !defined(SVR4) || defined(Lynx)
- #  ifndef Lynx
--#   define _XGetpwuid(u,p) \
--((getpwuid_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf)) == -1) ? NULL : 
&(p).pws)
--#   define _XGetpwnam(u,p) \
--((getpwnam_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf)) == -1) ? NULL : 
&(p).pws)
-+#   define _XGetpwuid(u,p,s) \
-+((getpwuid_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf),(s)) == -1) ? NULL : 
&(p).pws)
-+#   define _XGetpwnam(u,p,s) \
-+((getpwnam_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf),(s)) == -1) ? NULL : 
&(p).pws)
- #  else /* Lynx */
--#   define _XGetpwuid(u,p) \
--((getpwuid_r(&(p).pws,(u),(p).pwbuf,sizeof((p).pwbuf)) == -1) ? NULL : 
&(p).pws)
--#   define _XGetpwnam(u,p) \
--((getpwnam_r(&(p).pws,(u),(p).pwbuf,sizeof((p).pwbuf)) == -1) ? NULL : 
&(p).pws)
-+#   define _XGetpwuid(u,p,s) \
-+((getpwuid_r(&(p).pws,(u),(p).pwbuf,sizeof((p).pwbuf),(s)) == -1) ? NULL : 
&(p).pws)
-+#   define _XGetpwnam(

X Strike Force XOrg SVN commit: r85 - xorg-doc/trunk/debian

2004-10-22 Thread X Strike Force SVN Repository Admin 
Author: fabbione
Date: 2004-10-22 11:57:24 -0500 (Fri, 22 Oct 2004)
New Revision: 85

Modified:
   xorg-doc/trunk/debian/CHANGESETS
   xorg-doc/trunk/debian/rules
Log:
* Remove call to symlinks target.



Modified: xorg-doc/trunk/debian/CHANGESETS
===
--- xorg-doc/trunk/debian/CHANGESETS2004-10-22 16:56:00 UTC (rev 84)
+++ xorg-doc/trunk/debian/CHANGESETS2004-10-22 16:57:24 UTC (rev 85)
@@ -52,4 +52,7 @@
   + Use all.mk instead of single includes.
 72
 
+* Remove call to symlinks target.
+85
+
 vim:set ai et sts=4 sw=4 tw=80:

Modified: xorg-doc/trunk/debian/rules
===
--- xorg-doc/trunk/debian/rules 2004-10-22 16:56:00 UTC (rev 84)
+++ xorg-doc/trunk/debian/rules 2004-10-22 16:57:24 UTC (rev 85)
@@ -36,7 +36,7 @@
touch $@
 
 build: $(STAMP_DIR)/build
-$(STAMP_DIR)/build: patch-audit symlinks configure
+$(STAMP_DIR)/build: patch-audit configure
dh_testdir
cd $(SOURCE_TREE)/$(PROJECT_DIR) && \
 $(MAKE)

X Strike Force XOrg SVN commit: r84 - in xorg-config/trunk/debian: . patches shared

2004-10-22 Thread X Strike Force SVN Repository Admin 
Author: fabbione
Date: 2004-10-22 11:56:00 -0500 (Fri, 22 Oct 2004)
New Revision: 84

Added:
   xorg-config/trunk/debian/xorg-dev.install
   xorg-config/trunk/debian/xorg-dev.lintian
Removed:
   xorg-config/trunk/debian/shared/symlinks.mk
Modified:
   xorg-config/trunk/debian/CHANGESETS
   xorg-config/trunk/debian/MANIFEST.any
   xorg-config/trunk/debian/control
   xorg-config/trunk/debian/patches/915_debian_fix_Imakefiles.diff
   xorg-config/trunk/debian/rules
   xorg-config/trunk/debian/shared/all.mk
   xorg-config/trunk/debian/xutils-devel.install
   xorg-config/trunk/debian/xutils-devel.lintian
Log:
* Ship X.org top header files [0] and kill symlink.mk:
  + Add xorg-dev package to debian/control.
  + Update 915_debian_fix_Imakefiles.diff to remove SUBDIRS from xc/include.
  + Update debian/rules to install xc/include/.
  + Update MANIFEST.any.
  + Remove symlinks.mk from allover the package. Each package should be
responsible to create what it needs to build.
   


Modified: xorg-config/trunk/debian/CHANGESETS
===
--- xorg-config/trunk/debian/CHANGESETS 2004-10-22 08:00:38 UTC (rev 83)
+++ xorg-config/trunk/debian/CHANGESETS 2004-10-22 16:56:00 UTC (rev 84)
@@ -135,4 +135,16 @@
 * Update symlinks.mk to perform less checks and add the Xdmcp.h
 81
 
+* Ship X.org top header files [0] and kill symlink.mk:
+  + Add xorg-dev package to debian/control.
+  + Update 915_debian_fix_Imakefiles.diff to remove SUBDIRS from xc/include.
+  + Update debian/rules to install xc/include/.
+  + Update MANIFEST.any.
+  + Remove symlinks.mk from allover the package. Each package should be
+responsible to create what it needs to build.
+84
+
+[0] Not that i didn't have this idea before.. it's just that i like to make my
+life more complicated than it should be.
+
 vim:set ai et sts=4 sw=4 tw=80:

Modified: xorg-config/trunk/debian/MANIFEST.any
===
--- xorg-config/trunk/debian/MANIFEST.any   2004-10-22 08:00:38 UTC (rev 83)
+++ xorg-config/trunk/debian/MANIFEST.any   2004-10-22 16:56:00 UTC (rev 84)
@@ -12,6 +12,29 @@
 usr/X11R6/bin/pswrap
 usr/X11R6/bin/revpath
 usr/X11R6/bin/xmkmf
+usr/X11R6/include/X11/DECkeysym.h
+usr/X11R6/include/X11/HPkeysym.h
+usr/X11R6/include/X11/Sunkeysym.h
+usr/X11R6/include/X11/X.h
+usr/X11R6/include/X11/XF86keysym.h
+usr/X11R6/include/X11/XWDFile.h
+usr/X11R6/include/X11/Xalloca.h
+usr/X11R6/include/X11/Xarch.h
+usr/X11R6/include/X11/Xatom.h
+usr/X11R6/include/X11/Xdefs.h
+usr/X11R6/include/X11/Xfuncproto.h
+usr/X11R6/include/X11/Xfuncs.h
+usr/X11R6/include/X11/Xmd.h
+usr/X11R6/include/X11/Xos.h
+usr/X11R6/include/X11/Xos_r.h
+usr/X11R6/include/X11/Xosdefs.h
+usr/X11R6/include/X11/Xpoll.h
+usr/X11R6/include/X11/Xproto.h
+usr/X11R6/include/X11/Xprotostr.h
+usr/X11R6/include/X11/Xthreads.h
+usr/X11R6/include/X11/ap_keysym.h
+usr/X11R6/include/X11/keysym.h
+usr/X11R6/include/X11/keysymdef.h
 usr/X11R6/lib/X11/config/Amoeba.cf
 usr/X11R6/lib/X11/config/DGUX.cf
 usr/X11R6/lib/X11/config/FreeBSD.cf
@@ -134,9 +157,9 @@
 usr/X11R6/man/man1/pswrap.1
 usr/X11R6/man/man1/revpath.1
 usr/X11R6/man/man1/xmkmf.1
+usr/share/lintian/overrides/xorg-dev
 usr/share/lintian/overrides/xutils-devel
 usr/share/xorg/dbuild-scripts/all.mk
 usr/share/xorg/dbuild-scripts/arch.mk
 usr/share/xorg/dbuild-scripts/check-manifest.mk
 usr/share/xorg/dbuild-scripts/patch-audit.mk
-usr/share/xorg/dbuild-scripts/symlinks.mk

Modified: xorg-config/trunk/debian/control
===
--- xorg-config/trunk/debian/control2004-10-22 08:00:38 UTC (rev 83)
+++ xorg-config/trunk/debian/control2004-10-22 16:56:00 UTC (rev 84)
@@ -33,3 +33,10 @@
   - revpath, which generates a relative path that can be used to undo a
 change-directory and
   - xmkmf, a tool that creates a Makefile from an Imakefile.
+
+Package: xorg-dev
+Depends: xutils-devel
+Architecture: all
+Description: X.org top level header files
+ xorg-dev provides all the top level header files required to build almost, if
+ not all, the libraries and applications that uses a X Window System.

Modified: xorg-config/trunk/debian/patches/915_debian_fix_Imakefiles.diff
===
--- xorg-config/trunk/debian/patches/915_debian_fix_Imakefiles.diff 
2004-10-22 08:00:38 UTC (rev 83)
+++ xorg-config/trunk/debian/patches/915_debian_fix_Imakefiles.diff 
2004-10-22 16:56:00 UTC (rev 84)
@@ -6,8 +6,8 @@
 Patch by Fabio M. Di Nitto.
 
 diff -ruN xc-old/config/pswrap/Imakefile xc/config/pswrap/Imakefile
 xc-old/config/pswrap/Imakefile 2004-04-23 20:42:00.0 +0200
-+++ xc/config/pswrap/Imakefile 2004-10-18 15:31:17.411526720 +0200
+--- xc-old/config/pswrap/Imakefile 2004-04-23 18:42:00.0 +
 xc/config/pswrap/Imakefile 2004-10-22 15:33:25.155443016 +
 @@ -6,6 +6,8 @@
   YFLAG

Bug#6682:

2004-10-22 Thread Ryan 
Want a Rolex Watch?
http://cci.beud.com/r/giggles/

Bug#6682:

2004-10-22 Thread Matt 
Do you want a Rolex Watch?
http://nil.beud.com/r/giggles/

Bug#11147:

2004-10-22 Thread Matthew 
Want a cheap Rolex Watch?
http://jzx.beud.com/r/giggles/

Bug#11147:

2004-10-22 Thread Ben 
Do you want a cheap Rolex Watch?
http://xpv.beud.com/r/giggles/

Bug#116507:

2004-10-22 Thread Jill 
Do you want a cheap Rolex Watch?
http://exn.beud.com/r/giggles/

Bug#116507:

2004-10-22 Thread Ben 
Do you want a cheap Rolex Watch?
http://eus.beud.com/r/giggles/

Bug#56179:

2004-10-22 Thread Joseph 
Do you want a Rolex Watch?
http://qya.beud.com/r/giggles/

Bug#6682:

2004-10-22 Thread Jack 
Do you want a cheap Rolex Watch?
http://lth.beud.com/r/giggles/

Bug#277760: marked as done (xfree86: Please drop Build-Depends on 'libstdc++5-dev | libstdc++')

2004-10-22 Thread Debian Bug Tracking System 
Your message dated Fri, 22 Oct 2004 04:28:22 -0500
with message-id <[EMAIL PROTECTED]>
and subject line Andreas Jochens: please don't file duplicate bug reports
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)

--
Received: (at submit) by bugs.debian.org; 22 Oct 2004 08:03:16 +
>From [EMAIL PROTECTED] Fri Oct 22 01:03:15 2004
Return-path: <[EMAIL PROTECTED]>
Received: from d082087.adsl.hansenet.de (localhost.localdomain) [80.171.82.87] 
by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
id 1CKuOJ-00027l-00; Fri, 22 Oct 2004 01:03:15 -0700
Received: from aj by localhost.localdomain with local (Exim 4.34)
id 1CKuQK-0003wj-68; Fri, 22 Oct 2004 10:05:26 +0200
To: Debian Bug Tracking System <[EMAIL PROTECTED]>
From: Andreas Jochens <[EMAIL PROTECTED]>
Subject: xfree86: Please drop Build-Depends on 'libstdc++5-dev | libstdc++'
Message-Id: <[EMAIL PROTECTED]>
Date: Fri, 22 Oct 2004 10:05:26 +0200
Delivered-To: [EMAIL PROTECTED]
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25 
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-8.0 required=4.0 tests=BAYES_00,HAS_PACKAGE 
autolearn=no version=2.60-bugs.debian.org_2004_03_25
X-Spam-Level: 

Package: xfree86
Severity: wishlist
Tags: patch

Please drop 'libstdc++5-dev | libstdc++-dev' from Build-Depends.

It is not necessary to specify this explicitly because the default
version of 'libstdc++-dev' is build-essential anyway.

Regards
Andreas Jochens

diff -urN ../tmp-orig/xfree86-4.3.0.dfsg.1/debian/control ./debian/control
--- ../tmp-orig/xfree86-4.3.0.dfsg.1/debian/control 2004-09-25 
09:41:16.528803296 +0200
+++ ./debian/control2004-09-25 09:41:03.734748288 +0200
@@ -4,7 +4,7 @@
 Maintainer: Debian X Strike Force 
 Uploaders: Branden Robinson <[EMAIL PROTECTED]>, Fabio M. Di Nitto <[EMAIL 
PROTECTED]>
 Standards-Version: 3.6.1
-Build-Depends: dpkg (>= 1.7.0), flex, bison, bsdmainutils, groff, zlib1g-dev | 
libz-dev, libncurses5-dev | libncurses-dev, libpam0g-dev | libpam-dev, 
libfreetype6-dev, libpaperg, libstdc++5-dev | libstdc++-dev, tetex-bin, 
po-debconf, debhelper (>= 4.1.16), lynx, libglide2-dev (>> 2001.01.26) [i386], 
libglide3-dev (>= 2002.04.10-7) [alpha amd64 i386 ia64], linux-kernel-headers 
[alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sh], 
linux-kernel-headers (>= 2.5.999-test7-bk-15) [sparc], libpng12-dev | 
libpng-dev, libexpat1-dev, libfontconfig1-dev, fontconfig, bzip2, libxft-dev 
(>= 2.1.2), libxrender-dev (>= 0.8.3), libxcursor-dev, dbs, m4
+Build-Depends: dpkg (>= 1.7.0), flex, bison, bsdmainutils, groff, zlib1g-dev | 
libz-dev, libncurses5-dev | libncurses-dev, libpam0g-dev | libpam-dev, 
libfreetype6-dev, libpaperg, tetex-bin, po-debconf, debhelper (>= 4.1.16), 
lynx, libglide2-dev (>> 2001.01.26) [i386], libglide3-dev (>= 2002.04.10-7) 
[alpha amd64 i386 ia64], linux-kernel-headers [alpha amd64 arm hppa i386 ia64 
m68k mips mipsel powerpc s390 sh], linux-kernel-headers (>= 
2.5.999-test7-bk-15) [sparc], libpng12-dev | libpng-dev, libexpat1-dev, 
libfontconfig1-dev, fontconfig, bzip2, libxft-dev (>= 2.1.2), libxrender-dev 
(>= 0.8.3), libxcursor-dev, dbs, m4
 Build-Conflicts: cpp-3.3 (<< 1:3.3.3-0pre1)
 
 Package: lbxproxy

---
Received: (at 277760-done) by bugs.debian.org; 22 Oct 2004 09:28:24 +
>From [EMAIL PROTECTED] Fri Oct 22 02:28:24 2004
Return-path: <[EMAIL PROTECTED]>
Received: from dhcp065-026-182-085.indy.rr.com (sisyphus.deadbeast.net) 
[65.26.182.85] 
by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
id 1CKvii-0001ez-00; Fri, 22 Oct 2004 02:28:24 -0700
Received: by sisyphus.deadbeast.net (Postfix, from userid 1000)
id A37DD68C044; Fri, 22 Oct 2004 04:28:22 -0500 (EST)
Date: Fri, 22 Oct 2004 04:28:22 -0500
From: Branden Robinson <[EMAIL PROTECTED]>
To: [EMAIL PROTECTED]
Subject: Andreas Jochens: please don't file duplicate bug reports
Message-ID: <[EMAIL PROTECTED]>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
protocol="application/pgp-signature"; boundary="31zvzas5NXT9fief"
Content-Disposition: inline
User-Agent: Mutt/1.5.6+20040907i
Delivered-To: [EMAIL PROTECTED]
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25 
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-8.0 required=4.0 tests=BAYES_00,HAS_PACKAGE 
autolearn=no version=2.60-bugs.debian.org_2004_03_25
X-Spam-Level: 


--31zvzas5

Bug#277760: xfree86: Please drop Build-Depends on 'libstdc++5-dev | libstdc++'

2004-10-22 Thread Andreas Jochens 
Package: xfree86
Severity: wishlist
Tags: patch

Please drop 'libstdc++5-dev | libstdc++-dev' from Build-Depends.

It is not necessary to specify this explicitly because the default
version of 'libstdc++-dev' is build-essential anyway.

Regards
Andreas Jochens

diff -urN ../tmp-orig/xfree86-4.3.0.dfsg.1/debian/control ./debian/control
--- ../tmp-orig/xfree86-4.3.0.dfsg.1/debian/control 2004-09-25 
09:41:16.528803296 +0200
+++ ./debian/control2004-09-25 09:41:03.734748288 +0200
@@ -4,7 +4,7 @@
 Maintainer: Debian X Strike Force 
 Uploaders: Branden Robinson <[EMAIL PROTECTED]>, Fabio M. Di Nitto <[EMAIL 
PROTECTED]>
 Standards-Version: 3.6.1
-Build-Depends: dpkg (>= 1.7.0), flex, bison, bsdmainutils, groff, zlib1g-dev | 
libz-dev, libncurses5-dev | libncurses-dev, libpam0g-dev | libpam-dev, 
libfreetype6-dev, libpaperg, libstdc++5-dev | libstdc++-dev, tetex-bin, 
po-debconf, debhelper (>= 4.1.16), lynx, libglide2-dev (>> 2001.01.26) [i386], 
libglide3-dev (>= 2002.04.10-7) [alpha amd64 i386 ia64], linux-kernel-headers 
[alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sh], 
linux-kernel-headers (>= 2.5.999-test7-bk-15) [sparc], libpng12-dev | 
libpng-dev, libexpat1-dev, libfontconfig1-dev, fontconfig, bzip2, libxft-dev 
(>= 2.1.2), libxrender-dev (>= 0.8.3), libxcursor-dev, dbs, m4
+Build-Depends: dpkg (>= 1.7.0), flex, bison, bsdmainutils, groff, zlib1g-dev | 
libz-dev, libncurses5-dev | libncurses-dev, libpam0g-dev | libpam-dev, 
libfreetype6-dev, libpaperg, tetex-bin, po-debconf, debhelper (>= 4.1.16), 
lynx, libglide2-dev (>> 2001.01.26) [i386], libglide3-dev (>= 2002.04.10-7) 
[alpha amd64 i386 ia64], linux-kernel-headers [alpha amd64 arm hppa i386 ia64 
m68k mips mipsel powerpc s390 sh], linux-kernel-headers (>= 
2.5.999-test7-bk-15) [sparc], libpng12-dev | libpng-dev, libexpat1-dev, 
libfontconfig1-dev, fontconfig, bzip2, libxft-dev (>= 2.1.2), libxrender-dev 
(>= 0.8.3), libxcursor-dev, dbs, m4
 Build-Conflicts: cpp-3.3 (<< 1:3.3.3-0pre1)
 
 Package: lbxproxy

Bug#165134: This program is a Campaign informing the card companies of their fraud

2004-10-22 Thread laurence scott 
With the average household having 14 Cards, its no wonder that Card card
balance elimination is a big concern for most families.

For the rest of the story about destroying debt, visit us here
http://kng.3.globalproductsupreme.com/e3/

Last year there were over 1.3 million bankruptcies, the majority caused by
unmanageable card debt. What these card holders didn't realize is that when
banks approved their card and established their card limit; the banks used
the applicant's name and signature to create the money to fund the card. So,
in essence, it was their own money...




address on site along with the ability to say no more

And here are your food tablets, continued the boy, placing the box upon the
table. I've only enjoyed one square meal since you gave them to me
They're all right to preserve life, of course, and answer the purpose for
which they were made; but I don't believe nature ever intended us to exist
upon such things, or we wouldn't have the sense of taste, which enables us
to enjoy natural food.

X Strike Force XOrg SVN commit: r83 - in xorg-lib-xdmcp/trunk/debian: . patches

2004-10-22 Thread X Strike Force SVN Repository Admin 
Author: fabbione
Date: 2004-10-22 03:00:38 -0500 (Fri, 22 Oct 2004)
New Revision: 83

Added:
   xorg-lib-xdmcp/trunk/debian/libxdmcp-dev.install
   xorg-lib-xdmcp/trunk/debian/libxdmcp-dev.lintian
   xorg-lib-xdmcp/trunk/debian/libxdmcp6.install
   xorg-lib-xdmcp/trunk/debian/libxdmcp6.lintian
   xorg-lib-xdmcp/trunk/debian/patches/008_fix_xgetpw_macro.diff
   xorg-lib-xdmcp/trunk/debian/patches/915_debian_fix_Imakefiles.diff
Modified:
   xorg-lib-xdmcp/trunk/debian/CHANGESETS
   xorg-lib-xdmcp/trunk/debian/MANIFEST.any
   xorg-lib-xdmcp/trunk/debian/TODO
   xorg-lib-xdmcp/trunk/debian/changelog
   xorg-lib-xdmcp/trunk/debian/control
   xorg-lib-xdmcp/trunk/debian/rules
Log:
* Import initial debian/* files



Modified: xorg-lib-xdmcp/trunk/debian/CHANGESETS
===
--- xorg-lib-xdmcp/trunk/debian/CHANGESETS  2004-10-22 07:57:22 UTC (rev 82)
+++ xorg-lib-xdmcp/trunk/debian/CHANGESETS  2004-10-22 08:00:38 UTC (rev 83)
@@ -9,6 +9,6 @@
 files anywhere.)
 
 * Import initial debian/* files
+83
 
-
 vim:set ai et sts=4 sw=4 tw=80:


Property changes on: xorg-lib-xdmcp/trunk/debian/CHANGESETS
___
Name: svn:keywords
   + Id

Modified: xorg-lib-xdmcp/trunk/debian/MANIFEST.any
===
--- xorg-lib-xdmcp/trunk/debian/MANIFEST.any2004-10-22 07:57:22 UTC (rev 82)
+++ xorg-lib-xdmcp/trunk/debian/MANIFEST.any2004-10-22 08:00:38 UTC (rev 83)
@@ -0,0 +1,5 @@
+usr/X11R6/include/X11/Xdmcp.h
+usr/X11R6/lib/libXdmcp.a
+usr/X11R6/lib/libXdmcp.so.6.0
+usr/share/lintian/overrides/libxdmcp-dev
+usr/share/lintian/overrides/libxdmcp6


Property changes on: xorg-lib-xdmcp/trunk/debian/TODO
___
Name: svn:keywords
   + Id

Modified: xorg-lib-xdmcp/trunk/debian/changelog
===
--- xorg-lib-xdmcp/trunk/debian/changelog   2004-10-22 07:57:22 UTC (rev 82)
+++ xorg-lib-xdmcp/trunk/debian/changelog   2004-10-22 08:00:38 UTC (rev 83)
@@ -1,4 +1,4 @@
[EMAIL PROTECTED]@ (6.8.1-0+SVN) unstable; urgency=low
+xorg-lib-xdmcp (6.8.1-0+SVN) unstable; urgency=low
 
   * First release.
 


Property changes on: xorg-lib-xdmcp/trunk/debian/changelog
___
Name: svn:keywords
   + Id

Modified: xorg-lib-xdmcp/trunk/debian/control
===
--- xorg-lib-xdmcp/trunk/debian/control 2004-10-22 07:57:22 UTC (rev 82)
+++ xorg-lib-xdmcp/trunk/debian/control 2004-10-22 08:00:38 UTC (rev 83)
@@ -1,12 +1,19 @@
-Source: [EMAIL PROTECTED]@
+Source: xorg-lib-xdmcp
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force 
 Uploaders: Branden Robinson <[EMAIL PROTECTED]>, Fabio M. Di Nitto <[EMAIL 
PROTECTED]>
 Standards-Version: 3.6.1
-Build-Depends-Indep: dpkg (>= 1.7.0), dbs, debhelper (>= 4.1.16), xutils-devel 
(>= 6.8.1-0+SVN)
+Build-Depends: dpkg (>= 1.7.0), dbs, debhelper (>= 4.1.16), xutils-devel (>= 
6.8.1-0+SVN), xorg-source-lib-xdmcp (>= 6.8.1-0+SVN), xorg-source-include (>= 
6.8.1-0+SVN)
 
-Package: @FOO@
-Architecture: all|any
-Description: @BAR@
- @BAZ@
+Package: libxdmcp6
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: X.org libxdmcp6 files
+ BAZ
+
+Package: libxdmcp-dev
+Architecture: any
+Depends: libxdmcp6 (= ${Source-Version})
+Description: X.org libxdmcp6 development files
+ BAZ dev

Added: xorg-lib-xdmcp/trunk/debian/libxdmcp-dev.install
===
--- xorg-lib-xdmcp/trunk/debian/libxdmcp-dev.install2004-10-22 07:57:22 UTC 
(rev 82)
+++ xorg-lib-xdmcp/trunk/debian/libxdmcp-dev.install2004-10-22 08:00:38 UTC 
(rev 83)
@@ -0,0 +1,4 @@
+usr/X11R6/include/X11/Xdmcp.h
+usr/X11R6/lib/libXdmcp.a
+usr/X11R6/lib/libXdmcp.so
+usr/share/lintian/overrides/libxdmcp-dev

Added: xorg-lib-xdmcp/trunk/debian/libxdmcp-dev.lintian
===
--- xorg-lib-xdmcp/trunk/debian/libxdmcp-dev.lintian2004-10-22 07:57:22 UTC 
(rev 82)
+++ xorg-lib-xdmcp/trunk/debian/libxdmcp-dev.lintian2004-10-22 08:00:38 UTC 
(rev 83)
@@ -0,0 +1,4 @@
+# lintian doesn't know that we ARE a X Windows System as per
+# http://www.debian.org/doc/debian-policy/ch-customized-programs.html#s11.8.7
+
+libxdmcp-dev: packages-installs-file-to-usr-x11r6

Added: xorg-lib-xdmcp/trunk/debian/libxdmcp6.install
===
--- xorg-lib-xdmcp/trunk/debian/libxdmcp6.install   2004-10-22 07:57:22 UTC 
(rev 82)
+++ xorg-lib-xdmcp/trunk/debian/libxdmcp6.install   2004-10-22 08:00:38 UTC 
(rev 83)
@@ -0,0 +1,3 @@
+usr/X11R6/lib/libXdmcp.so.6.0
+usr/X11R6/lib/libXdmcp.so.6
+usr/share/lintian/overrides/libxdmcp6

Added: xorg-lib-xdmcp/trunk/debian/libxdmcp

X Strike Force XOrg SVN commit: r82 - /

2004-10-22 Thread X Strike Force SVN Repository Admin 
Author: fabbione
Date: 2004-10-22 02:57:22 -0500 (Fri, 22 Oct 2004)
New Revision: 82

Added:
   xorg-lib-xdmcp/
Modified:
   proposed-name-schema
Log:
Add xorg-lib-xdmcp project.


Modified: proposed-name-schema
===
--- proposed-name-schema2004-10-22 07:39:22 UTC (rev 81)
+++ proposed-name-schema2004-10-22 07:57:22 UTC (rev 82)
@@ -78,6 +78,10 @@
 |-->  xorg-source-lib-xdamage   -->  xorg-lib-xdamage
 |
 |-->  xorg-source-lib-xdmcp -->  xorg-lib-xdmcp
+||
+||--> libxdmcp6
+||
+|\--> libxdmcp-dev
 |
 |-->  xorg-source-lib-xevie -->  xorg-lib-xevie
 |

Copied: xorg-lib-xdmcp (from rev 74, xorg-template)

X Strike Force XOrg SVN commit: r81 - in xorg-config/trunk/debian: . shared

2004-10-22 Thread X Strike Force SVN Repository Admin 
Author: fabbione
Date: 2004-10-22 02:39:22 -0500 (Fri, 22 Oct 2004)
New Revision: 81

Modified:
   xorg-config/trunk/debian/CHANGESETS
   xorg-config/trunk/debian/shared/symlinks.mk
Log:
* Update symlinks.mk to perform less checks and add the Xdmcp.h



Modified: xorg-config/trunk/debian/CHANGESETS
===
--- xorg-config/trunk/debian/CHANGESETS 2004-10-22 06:29:02 UTC (rev 80)
+++ xorg-config/trunk/debian/CHANGESETS 2004-10-22 07:39:22 UTC (rev 81)
@@ -132,4 +132,7 @@
   + Update MANIFEST.any, xutils-devel.install and .lintian.
 78
 
+* Update symlinks.mk to perform less checks and add the Xdmcp.h
+81
+
 vim:set ai et sts=4 sw=4 tw=80:

Modified: xorg-config/trunk/debian/shared/symlinks.mk
===
--- xorg-config/trunk/debian/shared/symlinks.mk 2004-10-22 06:29:02 UTC (rev 80)
+++ xorg-config/trunk/debian/shared/symlinks.mk 2004-10-22 07:39:22 UTC (rev 81)
@@ -11,18 +11,17 @@
# create symlink to not depend on X11
if [ -d $(SOURCE_TREE)/include ]; then \
  cd $(SOURCE_TREE)/include && \
- ln -sf . X11; \
+ ln -sf . X11 && \
+ if [ -e ../lib/xtrans/Xtrans.c ]; then \
+   ln -sf ../lib/xtrans/Xtrans.h Xtrans.h; \
+ fi && \
+ if [ -e ../lib/Xau/Xauth.h ]; then \
+   ln -sf ../lib/Xau/Xauth.h Xauth.h; \
+ fi && \
+ if [ -e ../lib/Xdmcp/Xdmcp.h ]; then \
+   ln -sf ../lib/Xdmcp/Xdmcp.h Xdmcp.h; \
+ fi; \
fi
-   # xc/lib/xtrans
-   if [ -e $(SOURCE_TREE)/lib/xtrans/Xtrans.c ] && [ -d 
$(SOURCE_TREE)/include ]; then \
- cd $(SOURCE_TREE)/include && \
- ln -sf ../lib/xtrans/Xtrans.h Xtrans.h; \
-   fi
-   # xc/lib/Xau
-   if [ -e $(SOURCE_TREE)/lib/Xau/Xauth.h ] && [ -d $(SOURCE_TREE)/include 
]; then \
- cd $(SOURCE_TREE)/include && \
- ln -sf ../lib/Xau/Xauth.h Xauth.h; \
-   fi
touch $@
 
 # vim:set noet ai sts=8 sw=8 tw=0:

X Strike Force XOrg SVN commit: r80 - in xorg-lib-xau/trunk/debian: . patches

2004-10-22 Thread X Strike Force SVN Repository Admin 
Author: fabbione
Date: 2004-10-22 01:29:02 -0500 (Fri, 22 Oct 2004)
New Revision: 80

Added:
   xorg-lib-xau/trunk/debian/libxau-dev.install
   xorg-lib-xau/trunk/debian/libxau-dev.lintian
   xorg-lib-xau/trunk/debian/libxau6.install
   xorg-lib-xau/trunk/debian/libxau6.lintian
   xorg-lib-xau/trunk/debian/patches/008_fix_xgetpw_macro.diff
   xorg-lib-xau/trunk/debian/patches/915_debian_fix_Imakefiles.diff
Modified:
   xorg-lib-xau/trunk/debian/CHANGESETS
   xorg-lib-xau/trunk/debian/MANIFEST.any
   xorg-lib-xau/trunk/debian/changelog
   xorg-lib-xau/trunk/debian/control
   xorg-lib-xau/trunk/debian/rules
Log:
* Import initial debian/* files



Modified: xorg-lib-xau/trunk/debian/CHANGESETS
===
--- xorg-lib-xau/trunk/debian/CHANGESETS2004-10-22 06:18:02 UTC (rev 79)
+++ xorg-lib-xau/trunk/debian/CHANGESETS2004-10-22 06:29:02 UTC (rev 80)
@@ -9,6 +9,6 @@
 files anywhere.)
 
 * Import initial debian/* files
+80
 
-
 vim:set ai et sts=4 sw=4 tw=80:


Property changes on: xorg-lib-xau/trunk/debian/CHANGESETS
___
Name: svn:keywords
   + Id

Modified: xorg-lib-xau/trunk/debian/MANIFEST.any
===
--- xorg-lib-xau/trunk/debian/MANIFEST.any  2004-10-22 06:18:02 UTC (rev 79)
+++ xorg-lib-xau/trunk/debian/MANIFEST.any  2004-10-22 06:29:02 UTC (rev 80)
@@ -0,0 +1,5 @@
+usr/X11R6/include/X11/Xauth.h
+usr/X11R6/lib/libXau.a
+usr/X11R6/lib/libXau.so.6.0
+usr/share/lintian/overrides/libxau6
+usr/share/lintian/overrides/libxau-dev

Modified: xorg-lib-xau/trunk/debian/changelog
===
--- xorg-lib-xau/trunk/debian/changelog 2004-10-22 06:18:02 UTC (rev 79)
+++ xorg-lib-xau/trunk/debian/changelog 2004-10-22 06:29:02 UTC (rev 80)
@@ -1,4 +1,4 @@
[EMAIL PROTECTED]@ (6.8.1-0+SVN) unstable; urgency=low
+xorg-lib-xau (6.8.1-0+SVN) unstable; urgency=low
 
   * First release.
 


Property changes on: xorg-lib-xau/trunk/debian/changelog
___
Name: svn:keywords
   + Id

Modified: xorg-lib-xau/trunk/debian/control
===
--- xorg-lib-xau/trunk/debian/control   2004-10-22 06:18:02 UTC (rev 79)
+++ xorg-lib-xau/trunk/debian/control   2004-10-22 06:29:02 UTC (rev 80)
@@ -1,12 +1,19 @@
-Source: [EMAIL PROTECTED]@
+Source: xorg-lib-xau
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force 
 Uploaders: Branden Robinson <[EMAIL PROTECTED]>, Fabio M. Di Nitto <[EMAIL 
PROTECTED]>
 Standards-Version: 3.6.1
-Build-Depends-Indep: dpkg (>= 1.7.0), dbs, debhelper (>= 4.1.16), xutils-devel 
(>= 6.8.1-0+SVN)
+Build-Depends: dpkg (>= 1.7.0), dbs, debhelper (>= 4.1.16), xutils-devel (>= 
6.8.1-0+SVN), xorg-source-lib-xau (>= 6.8.1-0+SVN), xorg-source-include (>= 
6.8.1-0+SVN)
 
-Package: @FOO@
-Architecture: all|any
-Description: @BAR@
- @BAZ@
+Package: libxau6
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: X.org libxau6 files
+ BAZ
+
+Package: libxau-dev
+Architecture: any
+Depends: libxau6 (= ${Source-Version})
+Description: X.org libxau6 development files
+ BAZ devel.

Added: xorg-lib-xau/trunk/debian/libxau-dev.install
===
--- xorg-lib-xau/trunk/debian/libxau-dev.install2004-10-22 06:18:02 UTC 
(rev 79)
+++ xorg-lib-xau/trunk/debian/libxau-dev.install2004-10-22 06:29:02 UTC 
(rev 80)
@@ -0,0 +1,4 @@
+usr/X11R6/include/X11/Xauth.h
+usr/X11R6/lib/libXau.a
+usr/X11R6/lib/libXau.so
+usr/share/lintian/overrides/libxau-dev

Added: xorg-lib-xau/trunk/debian/libxau-dev.lintian
===
--- xorg-lib-xau/trunk/debian/libxau-dev.lintian2004-10-22 06:18:02 UTC 
(rev 79)
+++ xorg-lib-xau/trunk/debian/libxau-dev.lintian2004-10-22 06:29:02 UTC 
(rev 80)
@@ -0,0 +1,4 @@
+# lintian doesn't know that we ARE a X Windows System as per
+# http://www.debian.org/doc/debian-policy/ch-customized-programs.html#s11.8.7
+
+libxau-dev: packages-installs-file-to-usr-x11r6

Added: xorg-lib-xau/trunk/debian/libxau6.install
===
--- xorg-lib-xau/trunk/debian/libxau6.install   2004-10-22 06:18:02 UTC (rev 79)
+++ xorg-lib-xau/trunk/debian/libxau6.install   2004-10-22 06:29:02 UTC (rev 80)
@@ -0,0 +1,3 @@
+usr/X11R6/lib/libXau.so.6.0
+usr/X11R6/lib/libXau.so.6
+usr/share/lintian/overrides/libxau6

Added: xorg-lib-xau/trunk/debian/libxau6.lintian
===
--- xorg-lib-xau/trunk/debian/libxau6.lintian   2004-10-22 06:18:02 UTC (rev 79)
+++ xorg-lib-xau/trunk/debian/libxau6.lintian   2004-10-22 06:29:02 UTC (rev 80)
@@ -0,0 +1,4 @@
+# lintian doesn't know that we ARE a X Windows System as

X Strike Force XOrg SVN commit: r79 - /

2004-10-22 Thread X Strike Force SVN Repository Admin 
Author: fabbione
Date: 2004-10-22 01:18:02 -0500 (Fri, 22 Oct 2004)
New Revision: 79

Added:
   xorg-lib-xau/
Modified:
   proposed-name-schema
Log:
Add xorg-lib-xau project.


Modified: proposed-name-schema
===
--- proposed-name-schema2004-10-22 05:41:54 UTC (rev 78)
+++ proposed-name-schema2004-10-22 06:18:02 UTC (rev 79)
@@ -58,6 +58,10 @@
 |-->  xorg-source-lib-xtrap -->  xorg-lib-xtrap
 |
 |-->  xorg-source-lib-xau   -->  xorg-lib-xau
+||
+||--> libxau6
+||
+|\--> libxau-dev
 |
 |-->  xorg-source-lib-xaw   -->  xorg-lib-xaw
 |

Copied: xorg-lib-xau (from rev 74, xorg-template)

X Strike Force XOrg SVN commit: r78 - in xorg-config/trunk/debian: . shared

2004-10-22 Thread X Strike Force SVN Repository Admin 
Author: fabbione
Date: 2004-10-22 00:41:54 -0500 (Fri, 22 Oct 2004)
New Revision: 78

Added:
   xorg-config/trunk/debian/shared/all.mk
   xorg-config/trunk/debian/shared/symlinks.mk
Modified:
   xorg-config/trunk/debian/CHANGESETS
   xorg-config/trunk/debian/MANIFEST.any
   xorg-config/trunk/debian/rules
   xorg-config/trunk/debian/xutils-devel.install
   xorg-config/trunk/debian/xutils-devel.lintian
Log:
* Add symlinks.mk to handle all symlinks creation at build time and
  all.mk to include all .mk scripts at once:
  + Modidy debian/rules to make use/ship them.
  + Update MANIFEST.any, xutils-devel.install and .lintian.



Modified: xorg-config/trunk/debian/CHANGESETS
===
--- xorg-config/trunk/debian/CHANGESETS 2004-10-22 05:20:17 UTC (rev 77)
+++ xorg-config/trunk/debian/CHANGESETS 2004-10-22 05:41:54 UTC (rev 78)
@@ -126,4 +126,10 @@
   complex to face two transition at the same time.)
 69
 
+* Add symlinks.mk to handle all symlinks creation at build time and
+  all.mk to include all .mk scripts at once:
+  + Modidy debian/rules to make use/ship them.
+  + Update MANIFEST.any, xutils-devel.install and .lintian.
+78
+
 vim:set ai et sts=4 sw=4 tw=80:

Modified: xorg-config/trunk/debian/MANIFEST.any
===
--- xorg-config/trunk/debian/MANIFEST.any   2004-10-22 05:20:17 UTC (rev 77)
+++ xorg-config/trunk/debian/MANIFEST.any   2004-10-22 05:41:54 UTC (rev 78)
@@ -135,6 +135,8 @@
 usr/X11R6/man/man1/revpath.1
 usr/X11R6/man/man1/xmkmf.1
 usr/share/lintian/overrides/xutils-devel
+usr/share/xorg/dbuild-scripts/all.mk
 usr/share/xorg/dbuild-scripts/arch.mk
 usr/share/xorg/dbuild-scripts/check-manifest.mk
 usr/share/xorg/dbuild-scripts/patch-audit.mk
+usr/share/xorg/dbuild-scripts/symlinks.mk

Modified: xorg-config/trunk/debian/rules
===
--- xorg-config/trunk/debian/rules  2004-10-22 05:20:17 UTC (rev 77)
+++ xorg-config/trunk/debian/rules  2004-10-22 05:41:54 UTC (rev 78)
@@ -32,18 +32,18 @@
 # Import anal patch-audit check.
 include debian/shared/patch-audit.mk
 
+# Import symlink creation target.
+include debian/shared/symlinks.mk
+
 configure: $(STAMP_DIR)/configure
 $(STAMP_DIR)/configure: $(patched)
dh_testdir
echo "" > $(SOURCE_TREE)/$(PROJECT_DIR)/cf/date.def
echo "" > $(SOURCE_TREE)/$(PROJECT_DIR)/cf/host.def
-   # create symlink to not depend on X11
-   cd $(SOURCE_TREE)/include && \
- ln -sf . X11
touch $@
 
 build: $(STAMP_DIR)/build
-$(STAMP_DIR)/build: patch-audit configure
+$(STAMP_DIR)/build: patch-audit symlinks configure
dh_testdir
# bootstrap imake and create version.def
cd $(SOURCE_TREE) && \
@@ -69,9 +69,11 @@
install -m 644 debian/xutils-devel.lintian 
debian/tmp/usr/share/lintian/overrides/xutils-devel
# Install common Debian build scripts.
install -d -m 755 debian/tmp/usr/share/xorg/dbuild-scripts/
+   install -m 644 debian/shared/all.mk 
debian/tmp/usr/share/xorg/dbuild-scripts/all.mk
install -m 644 debian/shared/arch.mk 
debian/tmp/usr/share/xorg/dbuild-scripts/arch.mk
install -m 644 debian/shared/check-manifest.mk 
debian/tmp/usr/share/xorg/dbuild-scripts/check-manifest.mk
install -m 644 debian/shared/patch-audit.mk 
debian/tmp/usr/share/xorg/dbuild-scripts/patch-audit.mk
+   install -m 644 debian/shared/symlinks.mk 
debian/tmp/usr/share/xorg/dbuild-scripts/symlinks.mk
touch $@
 
 binary-arch: check-manifest

Added: xorg-config/trunk/debian/shared/all.mk
===
--- xorg-config/trunk/debian/shared/all.mk  2004-10-22 05:20:17 UTC (rev 77)
+++ xorg-config/trunk/debian/shared/all.mk  2004-10-22 05:41:54 UTC (rev 78)
@@ -0,0 +1,22 @@
+#!/usr/bin/make -f
+# Original by Fabio M. Di Nitto <[EMAIL PROTECTED]>
+# Licensed under the GNU General Public License, version 2.  See the file
+# /usr/share/common-licenses/GPL or 
+
+# $Id$
+
+# include all in one shot
+
+# Determine our architecture.
+include /usr/share/xorg/dbuild-scripts/arch.mk
+
+# Import standard check-manifest.
+include /usr/share/xorg/dbuild-scripts/check-manifest.mk
+
+# Import anal patch-audit check.
+include /usr/share/xorg/dbuild-scripts/patch-audit.mk
+
+# Import symlink creation target.
+include /usr/share/xorg/dbuild-scripts/symlinks.mk
+
+# vim:set noet ai sts=8 sw=8 tw=0:


Property changes on: xorg-config/trunk/debian/shared/all.mk
___
Name: svn:keywords
   + Id

Added: xorg-config/trunk/debian/shared/symlinks.mk
===
--- xorg-config/trunk/debian/shared/symlinks.mk 2004-10-22 05:20:17 UTC (rev 77)
+++ xorg-config/trunk/debian/shared/symlinks.mk 2004-

X Strike Force XOrg SVN commit: r77 - in xorg-lib-fs/trunk/debian: . patches

2004-10-22 Thread X Strike Force SVN Repository Admin 
Author: fabbione
Date: 2004-10-22 00:20:17 -0500 (Fri, 22 Oct 2004)
New Revision: 77

Added:
   xorg-lib-fs/trunk/debian/patches/915_debian_fix_Imakefiles.diff
Removed:
   xorg-lib-fs/trunk/debian/patches/915_debian_X11R6_and_X11_various_fixups.diff
Modified:
   xorg-lib-fs/trunk/debian/CHANGESETS
Log:
* Rename 915_debian_X11R6_and_X11_various_fixups.diff to
  915_debian_fix_Imakefiles.diff for consistency and add
  proper header to the patch.



Modified: xorg-lib-fs/trunk/debian/CHANGESETS
===
--- xorg-lib-fs/trunk/debian/CHANGESETS 2004-10-22 04:19:50 UTC (rev 76)
+++ xorg-lib-fs/trunk/debian/CHANGESETS 2004-10-22 05:20:17 UTC (rev 77)
@@ -11,4 +11,9 @@
 * Import initial debian/* files
 76
 
+* Rename 915_debian_X11R6_and_X11_various_fixups.diff to
+  915_debian_fix_Imakefiles.diff for consistency and add
+  proper header to the patch.
+77
+
 vim:set ai et sts=4 sw=4 tw=80:

Deleted: 
xorg-lib-fs/trunk/debian/patches/915_debian_X11R6_and_X11_various_fixups.diff
===
--- 
xorg-lib-fs/trunk/debian/patches/915_debian_X11R6_and_X11_various_fixups.diff   
2004-10-22 04:19:50 UTC (rev 76)
+++ 
xorg-lib-fs/trunk/debian/patches/915_debian_X11R6_and_X11_various_fixups.diff   
2004-10-22 05:20:17 UTC (rev 77)
@@ -1,12 +0,0 @@
-diff -ruN xc-old/lib/FS/Imakefile xc/lib/FS/Imakefile
 xc-old/lib/FS/Imakefile2004-08-27 22:47:45.0 +
-+++ xc/lib/FS/Imakefile2004-10-21 12:59:26.210772584 +
-@@ -28,7 +28,7 @@
- 
- HEADERS = FSlib.h
- 
--INCLUDES = -I$(FONTINCSRC)
-+INCLUDES = -I$(FONTINCSRC) -I$(TOP)/include
- 
- SRCS =FSClServ.c FSCloseFt.c FSConnServ.c FSErrDis.c FSErrHndlr.c \
-   FSFlush.c FSFontInfo.c FSFtNames.c FSGetCats.c FSListCats.c \

Copied: xorg-lib-fs/trunk/debian/patches/915_debian_fix_Imakefiles.diff (from 
rev 76, 
xorg-lib-fs/trunk/debian/patches/915_debian_X11R6_and_X11_various_fixups.diff)
===
--- 
xorg-lib-fs/trunk/debian/patches/915_debian_X11R6_and_X11_various_fixups.diff   
2004-10-22 04:19:50 UTC (rev 76)
+++ xorg-lib-fs/trunk/debian/patches/915_debian_fix_Imakefiles.diff 
2004-10-22 05:20:17 UTC (rev 77)
@@ -0,0 +1,19 @@
+$Id$
+
+This patch will collect all the bits required to fix up the changes
+introduced by splitting the tree.
+
+Patch by Fabio M. Di Nitto.
+
+diff -ruN xc-old/lib/FS/Imakefile xc/lib/FS/Imakefile
+--- xc-old/lib/FS/Imakefile2004-08-27 22:47:45.0 +
 xc/lib/FS/Imakefile2004-10-21 12:59:26.210772584 +
+@@ -28,7 +28,7 @@
+ 
+ HEADERS = FSlib.h
+ 
+-INCLUDES = -I$(FONTINCSRC)
++INCLUDES = -I$(FONTINCSRC) -I$(TOP)/include
+ 
+ SRCS =FSClServ.c FSCloseFt.c FSConnServ.c FSErrDis.c FSErrHndlr.c \
+   FSFlush.c FSFontInfo.c FSFtNames.c FSGetCats.c FSListCats.c \