Re: X Strike Force XOrg SVN commit: r19 - in xorg/trunk/debian: . scripts

2004-10-02 Thread Fabio Massimo Di Nitto

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Hi Roland,

Roland Mainz wrote:
| X Strike Force SVN Repository Admin wrote:
|
|>Author: fabbione
|
|
|>+* Import and adapt debian/scripts/prune-non-free:
|>+  + update and review debian/copyright file.
|>+  (note xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/
disappeared from
|>+  upstream)
|>+19
|>+
|
|
| The SPSPARC2 model wasn't removed in the Xorg repository and is still
| there in DESTDIR after a % make install # ...

This file was not removed from our Xfree86 tree either, but
SPSPARC2/fonts is now empty. I will correct the note in the CHANGESET to
reflect the correct path.

|
|
|>+  6) The Compugraphic and Adobe fonts distributed as part of the XPrint
|>+ server are not licensed at all, and some of the fonts bear no
|>+ copyright information whatsoever.
|>+
|>+ All Rights Reserved.
|>+
|>+These font files therefore do not satisfy DFSG 1 ("Free
|>+Redistribution"), DFSG 2 ("Source Code"), or DFSG 3 ("Derived
Works").
|>+
|>+
xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00051.pmf
|
|
| These files are no fonts, they are font metrics information (and the
| copyright notice was just copied over from the original font from the
| converter and does NOT apply to the font metrics files. The converter
| just preserved all context attributes of the font regardless of their
| content). The PMF fonts shipped with Xprint _conform_ 100% to the DFSG
| 1/2/3 specs. This has extensively been discussed in the past.

Do you have any reference I can lookup please?

Thanks
Fabio

- --
 fajita: step one
 Whatever the problem, step one is always to look in the error log.
 fajita: step two
 When in danger or in doubt, step two is to scream and shout.
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.2.4 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFBX3zrhCzbekR3nhgRAkTEAJ41EKaYiPdvzpQfgCtFgbsZuwDZuwCeO2B1
A8z0bHJm8NojQIHwDbprzrI=
=Ri1j
-END PGP SIGNATURE-



Bug#116507: We Show you exactly what to say and what letter to send to stop the calls

2004-10-02 Thread ellis clark
End their harassment and tell them no more calls.
We have pioneered an advanced system of proven strategies 
that will get the creditors and debt collectors off your back for good

Our debt termination program has legally stopped millions of dollars worth
of debt from being collected.


check out our Elimination Program here
http://www.productindulgesite.com/e2/



not for you, then use link above




I--I've never guessed there was such a thing as a Master Key, or--or a
Demon of Electricity, and--and I'm awfully sorry I--I called you up!
stammered the boy, abashed by the imposing appearance of his companion. The
Demon actually smiled at this speech,--a smile that was almost reassuring
I am not sorry, he said, in kindlier tone, for it is not much pleasure
waiting century after century for some one to command my services



Bug#24192: Discover the Details about Money & Debt. Use it for your benefit

2004-10-02 Thread christine arnold
Bring the calls to a dead halt using legal methods.
We have pioneered an advanced system of proven strategies 
that will get the creditors and debt collectors off your back for good

Our debt termination program has legally stopped millions of dollars worth
of debt from being collected.


check out our Elimination Program here
http://www.topproductbrands.com/e2/



address on site along with no more feature




I have given them a fair trial, and they've got me into all sorts of
trouble and made all my friends miserable. If I was some high-up scientist
it would be different; but I'm just a common boy, and I don't want to be
anything else
But, your duty-- began the Demon



Bug#274607: xserver-xfree86: problems with XKB settings on a Sun type5/type6 keyboard

2004-10-02 Thread Wouter Verhelst
Package: xserver-xfree86
Version: 4.3.0.dfsg.1-4
Severity: normal

Hi,

As discussed on IRC today:

There seems to be a problem with the XKB map on a Sun Type5 (or Type6,
which is hardware-compatible) keyboard. Everything is mapped correctly
for 'normal' work, but special key sequences (I currently tested
ctrl-alt-bksp (to kill the server) and ctrl-alt- (to
switch to a different virtual console)) don't work by default.

This can be worked around by using 'us+srvr_ctrl' as a keymap instead of
plainly 'us'.

-- Package-specific info:
Contents of /var/lib/xfree86/X.roster:
xserver-xfree86

/etc/X11/X target unchanged from checksum in /var/lib/xfree86/X.md5sum.

X server symlink status:
lrwxr-xr-x  1 root root 20 2004-09-21 00:53 /etc/X11/X -> /usr/bin/X11/XFree86
-rwxr-xr-x  1 root root 1782824 2004-05-29 21:04 /usr/bin/X11/XFree86

Contents of /var/lib/xfree86/XF86Config-4.roster:
xserver-xfree86

VGA-compatible devices on PCI bus:
:01:02.0 VGA compatible controller: ATI Technologies Inc 3D Rage Pro 215GP 
(rev 5c)

/etc/X11/XF86Config-4 does not match checksum in 
/var/lib/xfree86/XF86Config-4.md5sum.

XFree86 X server configuration file status:
-rw-r--r--  1 root root 2879 2004-10-03 02:21 /etc/X11/XF86Config-4

Contents of /etc/X11/XF86Config-4:
# XF86Config-4 (XFree86 X Window System server configuration file)
#
# This file was generated by dexconf, the Debian X Configuration tool, using
# values from the debconf database.
#
# Edit this file with caution, and see the XF86Config-4 manual page.
# (Type "man XF86Config-4" at the shell prompt.)
#
# This file is automatically updated on xserver-xfree86 package upgrades *only*
# if it has not been modified since the last upgrade of the xserver-xfree86
# package.
#
# If you have edited this file but would like it to be automatically updated
# again, run the following commands as root:
#
#   cp /etc/X11/XF86Config-4 /etc/X11/XF86Config-4.custom
#   md5sum /etc/X11/XF86Config-4 > /var/lib/xfree86/XF86Config-4.md5sum
#   dpkg-reconfigure xserver-xfree86
Section "Files"
FontPath"unix/:7100"# local font server
# if the local font server has problems, we can fall back on these
FontPath"/usr/lib/X11/fonts/misc"
FontPath"/usr/lib/X11/fonts/cyrillic"
FontPath"/usr/lib/X11/fonts/100dpi/:unscaled"
FontPath"/usr/lib/X11/fonts/75dpi/:unscaled"
FontPath"/usr/lib/X11/fonts/Type1"
FontPath"/usr/lib/X11/fonts/CID"
FontPath"/usr/lib/X11/fonts/Speedo"
FontPath"/usr/lib/X11/fonts/100dpi"
FontPath"/usr/lib/X11/fonts/75dpi"
EndSection
Section "Module"
Load"GLcore"
Load"bitmap"
Load"dbe"
Load"ddc"
Load"dri"
Load"extmod"
Load"freetype"
Load"glx"
Load"int10"
Load"record"
Load"speedo"
Load"type1"
Load"vbe"
EndSection
Section "InputDevice"
Identifier  "Generic Keyboard"
Driver  "keyboard"
Option  "CoreKeyboard"
Option  "XkbRules"  "sun"
Option  "XkbModel"  "type5"
Option  "XkbLayout" "us+srvr_ctrl"
EndSection
Section "InputDevice"
Identifier  "Configured Mouse"
Driver  "mouse"
Option  "CorePointer"
Option  "Device""/dev/sunmouse"
Option  "Protocol"  "BusMouse"
EndSection

Section "InputDevice"
Identifier  "Generic Mouse"
Driver  "mouse"
Option  "SendCoreEvents""true"
Option  "Device""/dev/input/mice"
Option  "Protocol"  "ImPS/2"
EndSection
Section "Device"
Identifier  "Generic Video Card"
Driver  "sunffb"
EndSection
Section "Monitor"
Identifier  "Generic Monitor"
#HorizSync  28-50
#VertRefresh43-75
Option  "DPMS"
Mode "1024x768"
# D: 100.000 MHz, H: 97.656 kHz, V: 127.157 Hz
DotClock 100.001
HTimings 1024 1024 1024 1024
VTimings 768 768 768 768
Flags"-HSync" "-VSync"# Warning: XFree86 doesn't 
support accel
EndMode
EndSection
Section "Screen"
Identifier  "Default Screen"
Device  "Generic Video Card"
Monitor "Generic Monitor"
DefaultDepth24
SubSection "Display"
Depth   24
Modes   "1024x768"
EndSubSection
EndSection
Section "ServerLayout"
Identifier  "Default Layout"
Screen  "Default Screen"
InputDevice "Generic Keyboard"
InputDevice "Configured Mouse"
InputDevice "Generic 

Re: X Strike Force XOrg SVN commit: r19 - in xorg/trunk/debian: . scripts

2004-10-02 Thread Roland Mainz
X Strike Force SVN Repository Admin wrote:
> 
> Author: fabbione

> +* Import and adapt debian/scripts/prune-non-free:
> +  + update and review debian/copyright file.
> +  (note xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/ disappeared 
> from
> +  upstream)
> +19
> +

The SPSPARC2 model wasn't removed in the Xorg repository and is still
there in DESTDIR after a % make install # ...

> +  6) The Compugraphic and Adobe fonts distributed as part of the XPrint
> + server are not licensed at all, and some of the fonts bear no
> + copyright information whatsoever.
> +
> + All Rights Reserved.
> +
> +These font files therefore do not satisfy DFSG 1 ("Free
> +Redistribution"), DFSG 2 ("Source Code"), or DFSG 3 ("Derived Works").
> +
> +xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00051.pmf

These files are no fonts, they are font metrics information (and the
copyright notice was just copied over from the original font from the
converter and does NOT apply to the font metrics files. The converter
just preserved all context attributes of the font regardless of their
content). The PMF fonts shipped with Xprint _conform_ 100% to the DFSG
1/2/3 specs. This has extensively been discussed in the past.



Bye,
Roland

-- 
  __ .  . __
 (o.\ \/ /.o) [EMAIL PROTECTED]
  \__\/\/__/  MPEG specialist, C&&JAVA&&Sun&&Unix programmer
  /O /==\ O\  TEL +49 641 7950090
 (;O/ \/ \O;)



Bug#274457: ISO_Level3_Shift for ca keyboard layout should be on RALT, not RCTL

2004-10-02 Thread Denis Barbier
On Fri, Oct 01, 2004 at 05:57:53PM -0400, Christian Hudon wrote:
> Package: xlibs
> Version 4.3.0.dfsg.1-4
> 
> The ISO_Level3_Shift defined in the ca keyboard layout (and the 
> ca_enhanced one, because it is based on ca) is mapped to the RCTL key. 
> I'm not sure about the ca layout, but for the ca_enhanced layout (which 
> I use every day), it is definitely *wrong*. On every ca_enhanced 
> keyboard I've ever seen, this key is always on the RALT. Could you 
> please move ISO_Level3_Shift over to where it is in every ca_enhanced 
> keyboard, and on every other OS (well, Windows) I've ever run...

You are right.
Another problem with ca and ca_enhanced layouts is that they can not
be combined with other layouts.  This has been fixed upstream (both in
XFree86 and freedesktop.org trees), here is the relevant
/etc/X11/xkb/symbols/pc/ca file.  Can you please test it?
It seems that 'ca(fr)' replaces ca_enhanced, but only the first group
was implemented, no idea if the 2nd one should be added.
You have to edit /etc/X11/xkb/rules/xfree86 and remove 'ca' from the
$oldlayouts list before loading this file.

Denis

default partial
xkb_symbols "fr" {
name[Group1] = "Canadian French";

key   { [ numbersign,   bar, backslash ]  };
key   { [ 1, exclam, plusminus ]  };
key   { [ 2,   quotedbl,at ]  };
key   { [ 3,  slash,  sterling ]  };
key   { [ 4, dollar,  cent ]  };
key   { [ 5,percent,  currency ]  };
key   { [ 6,   question,   notsign ]  };
key   { [ 7,  ampersand, brokenbar ]  };
key   { [ 8,   asterisk,   twosuperior ]  };
key   { [ 9,  parenleft, threesuperior ]  };
key   { [ 0, parenright,onequarter ]  };
key   { [ minus, underscore,   onehalf ]  };
key   { [ equal,   plus, threequarters ]  };

key   { [ q,  Q ] };
key   { [ w,  W ] };
key   { [ e,  E ] };
key   { [ r,  R ] };
key   { [ t,  T ] };
key   { [ y,  Y ] };
key   { [ u,  U ] };
key   { [ i,  I ] };
key   { [ o,  O,   section ]  };
key   { [ p,  P, paragraph ]  };
key   { [dead_circumflex, dead_circumflex, bracketleft  ] };
key   { [   dead_cedilla,  dead_diaeresis, bracketright ] };

key   { [ a,  A ] };
key   { [ s,  S ] };
key   { [ d,  D ] };
key   { [ f,  F ] };
key   { [ g,  G ] };
key   { [ h,  H ] };
key   { [ j,  J ] };
key   { [ k,  K ] };
key   { [ l,  L ] };
key   { [ semicolon,  colon, asciitilde ] };
key   { [dead_grave, dead_grave,  braceleft ] };
key   { [  less,greater, braceright ] };

key   { [guillemotleft, guillemotright, degree]   };
key   { [ z,  Z ] };
key   { [ x,  X ] };
key   { [ c,  C ] };
key   { [ v,  V ] };
key   { [ b,  B ] };
key   { [ n,  N ] };
key   { [ m,  M,   mu ]   };
key   { [ comma, apostrophe,   macron ]   };
key   { [period, period,   hyphen ]   };
key   { [eacute, Eacute,   dead_acute ]   };

include "level3(ralt_switch_multikey)"
};

partial
xkb_symbols "fr-legacy" {

name[Group1] = "Canadian French (Legacy)";

include "pc/ca(fr)"

key   { [degree, degree,   notsign ]  };
key   { [ 1, exclam,   onesuperior ]  };

key   { [ 3, numbersign, threesuperior ]  };
key   { [ 4, dollar,onequarter ]  };
key   { [ 5,percent,   onehalf ]  };
key   { [ 6,   question, threequarters ]  };
key   { [ 7,  ampersand, braceleft ]  };
key   { [ 8,   asterisk,   bracketleft ]  };
key   { [ 9,  parenleft,  bracketright,   plusminus ] };
key   { [ 0, parenright,braceright ]  };
key   { [ minus, underscore,   bar, questiondown] };
key   { [ equal,   plus,  dead_cedilla ]  };

key   { [ r,  R, paragraph,  registered ] };
key   { [ y,  Y,   yen ]  };
key   { [ o,  O,oslash,  Ooblique ] };
key   { [ p,  P, thorn,   THORN ] };
key   { [dead_circumflex, dead_circumflex,   degree ] };
key   { [  cced

X Strike Force XOrg SVN commit: r19 - in xorg/trunk/debian: . scripts

2004-10-02 Thread X Strike Force SVN Repository Admin
Author: fabbione
Date: 2004-10-02 15:47:11 -0500 (Sat, 02 Oct 2004)
New Revision: 19

Added:
   xorg/trunk/debian/scripts/prune-non-free
Modified:
   xorg/trunk/debian/CHANGESETS
   xorg/trunk/debian/TODO
   xorg/trunk/debian/copyright
Log:
Import and adapt debian/scripts/prune-non-free:
 + update and review debian/copyright file.


Modified: xorg/trunk/debian/CHANGESETS
===
--- xorg/trunk/debian/CHANGESETS2004-10-02 20:01:28 UTC (rev 18)
+++ xorg/trunk/debian/CHANGESETS2004-10-02 20:47:11 UTC (rev 19)
@@ -32,4 +32,10 @@
   + change Build-Depends to Build-Depends-Indep.
 18
 
+* Import and adapt debian/scripts/prune-non-free:
+  + update and review debian/copyright file.
+  (note xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/ disappeared from
+  upstream)
+19
+
 vim:set ai et sts=4 sw=4 tw=80:

Modified: xorg/trunk/debian/TODO
===
--- xorg/trunk/debian/TODO  2004-10-02 20:01:28 UTC (rev 18)
+++ xorg/trunk/debian/TODO  2004-10-02 20:47:11 UTC (rev 19)
@@ -13,7 +13,6 @@
 6.8.1-1
 ---
 
-* Import and adapt prune-non-free from xfree86/trunk/debian/scripts.
 * Add proper descriptions for each package.
   (create a standard template or a script to generate control dinamically?)
 * Define proper source patch policy.

Modified: xorg/trunk/debian/copyright
===
--- xorg/trunk/debian/copyright 2004-10-02 20:01:28 UTC (rev 18)
+++ xorg/trunk/debian/copyright 2004-10-02 20:47:11 UTC (rev 19)
@@ -6,9 +6,271 @@
 
 Debian modifications to upstream sources:
 
-None. The code needs to be DFSG sanitized and therefor not ready for
-its redistributions within Debian.
+  1) The Beth Mardutho Meltho OpenType fonts have a license which prohibits
+ free modification of the font software:
 
+The Font Software may not be modified, altered, or added to, and in
+particular the designs of glyphs or characters in the Fonts may not
+be modified nor may additional glyphs or characters be added to the
+Fonts. This License becomes null and void when the Fonts or Font
+Software have been modified.
+
+ These font files therefore do not satisfy DFSG 3 ("Derived Works").
+
+xc/fonts/scaled/Meltho/README
+xc/fonts/scaled/Meltho/SyrCOMAdiabene.otf
+xc/fonts/scaled/Meltho/SyrCOMAntioch.otf
+xc/fonts/scaled/Meltho/SyrCOMBatnan.otf
+xc/fonts/scaled/Meltho/SyrCOMBatnanBold.otf
+xc/fonts/scaled/Meltho/SyrCOMCtesiphon.otf
+xc/fonts/scaled/Meltho/SyrCOMEdessa.otf
+xc/fonts/scaled/Meltho/SyrCOMJerusalem.otf
+xc/fonts/scaled/Meltho/SyrCOMJerusalemBold.otf
+xc/fonts/scaled/Meltho/SyrCOMJerusalemItalic.otf
+xc/fonts/scaled/Meltho/SyrCOMJerusalemOutline.otf
+xc/fonts/scaled/Meltho/SyrCOMKharput.otf
+xc/fonts/scaled/Meltho/SyrCOMMalankara.otf
+xc/fonts/scaled/Meltho/SyrCOMMardin.otf
+xc/fonts/scaled/Meltho/SyrCOMMardinBold.otf
+xc/fonts/scaled/Meltho/SyrCOMMidyat.otf
+xc/fonts/scaled/Meltho/SyrCOMNisibin.otf
+xc/fonts/scaled/Meltho/SyrCOMNisibinOutline.otf
+xc/fonts/scaled/Meltho/SyrCOMQenNeshrin.otf
+xc/fonts/scaled/Meltho/SyrCOMTalada.otf
+xc/fonts/scaled/Meltho/SyrCOMTurAbdin.otf
+xc/fonts/scaled/Meltho/SyrCOMUrhoy.otf
+xc/fonts/scaled/Meltho/SyrCOMUrhoyBold.otf
+xc/fonts/scaled/Meltho/license.txt
+
+  2) The Bigelow & Holmes Luxi TrueType fonts have a license which prohibits
+ free modification of the font software:
+
+The Font Software may not be modified, altered, or added to, and in
+particular the designs of glyphs or characters in the Fonts may not
+be modified nor may additional glyphs or characters be added to the
+Fonts. This License becomes null and void when the Fonts or Font
+Software have been modified.
+
+ These font files therefore do not satisfy DFSG 3 ("Derived Works").
+
+xc/fonts/scaled/TTF/COPYRIGHT.BH
+xc/fonts/scaled/TTF/luximb.ttf
+xc/fonts/scaled/TTF/luximbi.ttf
+xc/fonts/scaled/TTF/luximr.ttf
+xc/fonts/scaled/TTF/luximri.ttf
+xc/fonts/scaled/TTF/luxirb.ttf
+xc/fonts/scaled/TTF/luxirbi.ttf
+xc/fonts/scaled/TTF/luxirr.ttf
+xc/fonts/scaled/TTF/luxirri.ttf
+xc/fonts/scaled/TTF/luxisb.ttf
+xc/fonts/scaled/TTF/luxisbi.ttf
+xc/fonts/scaled/TTF/luxisr.ttf
+xc/fonts/scaled/TTF/luxisri.ttf
+
+  3) The IBM Courier Type1 fonts have a license which does not grant
+ permission to modify the font software:
+
+You are hereby granted permission under the terms of the IBM/MIT X
+Consortium Courier Typefont agreement to execute, reproduce,
+distribute, display, market, sell and otherwise transfer copies of
+the IBM Courier font to third parties.
+
+ These font files therefore do not satisfy DFSG 3 ("Derived Works").
+
+xc/fonts/s

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

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

Modified:
   xorg/trunk/debian/CHANGESETS
   xorg/trunk/debian/TODO
   xorg/trunk/debian/changelog
   xorg/trunk/debian/control
Log:
lintian/linda cleanup:
  + set a proper target in debian/changelog.
  + change Build-Depends to Build-Depends-Indep.



Modified: xorg/trunk/debian/CHANGESETS
===
--- xorg/trunk/debian/CHANGESETS2004-10-02 19:43:16 UTC (rev 17)
+++ xorg/trunk/debian/CHANGESETS2004-10-02 20:01:28 UTC (rev 18)
@@ -27,4 +27,9 @@
 * Add first draft of debian/copyright.
 17
 
+* lintian/linda cleanup:
+  + set a proper target in debian/changelog.
+  + change Build-Depends to Build-Depends-Indep.
+18
+
 vim:set ai et sts=4 sw=4 tw=80:

Modified: xorg/trunk/debian/TODO
===
--- xorg/trunk/debian/TODO  2004-10-02 19:43:16 UTC (rev 17)
+++ xorg/trunk/debian/TODO  2004-10-02 20:01:28 UTC (rev 18)
@@ -20,6 +20,5 @@
 * Define complete name scheme for foo package that Build-dep on -source-
   and binar{y,ies} package{,s} it will build.
 * Document package relationship (dia diagram?).
-* lintian/linda clean up.
 
 vim:set ai et sts=4 sw=4 tw=80:

Modified: xorg/trunk/debian/changelog
===
--- xorg/trunk/debian/changelog 2004-10-02 19:43:16 UTC (rev 17)
+++ xorg/trunk/debian/changelog 2004-10-02 20:01:28 UTC (rev 18)
@@ -1,4 +1,4 @@
-xorg (6.8.1-0+SVN) sid; urgency=low
+xorg (6.8.1-0+SVN) unstable; urgency=low
 
   * First Release.
 

Modified: xorg/trunk/debian/control
===
--- xorg/trunk/debian/control   2004-10-02 19:43:16 UTC (rev 17)
+++ xorg/trunk/debian/control   2004-10-02 20:01:28 UTC (rev 18)
@@ -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)
+Build-Depends-Indep: dpkg (>= 1.7.0), dbs, debhelper (>= 4.1.16)
 
 Package: xorg-source-config
 Architecture: all



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

2004-10-02 Thread X Strike Force SVN Repository Admin
Author: fabbione
Date: 2004-10-02 14:43:16 -0500 (Sat, 02 Oct 2004)
New Revision: 17

Added:
   xorg/trunk/debian/copyright
Modified:
   xorg/trunk/debian/CHANGESETS
   xorg/trunk/debian/TODO
Log:
Add first draft of debian/copyright.


Modified: xorg/trunk/debian/CHANGESETS
===
--- xorg/trunk/debian/CHANGESETS2004-10-02 05:26:10 UTC (rev 16)
+++ xorg/trunk/debian/CHANGESETS2004-10-02 19:43:16 UTC (rev 17)
@@ -24,4 +24,7 @@
   instead of failing at the first error to catch all the problems in one run.
 16
 
+* Add first draft of debian/copyright.
+17
+
 vim:set ai et sts=4 sw=4 tw=80:

Modified: xorg/trunk/debian/TODO
===
--- xorg/trunk/debian/TODO  2004-10-02 05:26:10 UTC (rev 16)
+++ xorg/trunk/debian/TODO  2004-10-02 19:43:16 UTC (rev 17)
@@ -13,7 +13,6 @@
 6.8.1-1
 ---
 
-* Add missing copyright file.
 * Import and adapt prune-non-free from xfree86/trunk/debian/scripts.
 * Add proper descriptions for each package.
   (create a standard template or a script to generate control dinamically?)

Added: xorg/trunk/debian/copyright
===
--- xorg/trunk/debian/copyright 2004-10-02 05:26:10 UTC (rev 16)
+++ xorg/trunk/debian/copyright 2004-10-02 19:43:16 UTC (rev 17)
@@ -0,0 +1,1130 @@
+$Id$
+
+Source Package: xorg
+Obtained from: http://freedesktop.org/XOrg
+Debian package author(s): Branden Robinson, Fabio M. Di Nitto
+
+Debian modifications to upstream sources:
+
+None. The code needs to be DFSG sanitized and therefor not ready for
+its redistributions within Debian.
+
+Debian copyright(s)/license(s):
+
+Unless otherwise noted, all modifications and additions to XOrg found in
+this Debian package bear the following copyright and license terms:
+
+Copyright 1996-2002 Software in the Public Interest, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+SOFTWARE IN THE PUBLIC INTEREST, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of Software in the Public
+Interest, Inc. shall not be used in advertising or otherwise to promote the
+sale, use or other dealings in this Software without prior written
+authorization from Software in the Public Interest, Inc.
+
+Upstream copyright(s)/license(s):
+
+
+
+(From xc/LABEL:)
+
+X Window System, Version 11
+Release 6.8
+
+   Portions Copyright by:
+
+ 2d3d Inc.
+Adam de Boor
+ Adobe Systems Inc.
+ After X-TT Project
+   AGE Logic Inc.
+   Alan Hourihane
+  Andreas Monitzer
+ Andrew C Aitchison
+Andy Ritger
+ Ani Joshi
+   Anton Zioviev
+Apollo Computer Inc.
+Apple Computer Inc.
+Ares Software Corp.
+   ATI Technologies Inc.
+ AT&T Inc.
+  Bigelow & Holmes
+   Bill Reynolds
+   Bitstream Inc.
+ Brian Fundakowski Feldman
+Brian Goines
+ Brian Paul
+Bruno Haible
+   Charles Murcko
+   Chen Xiangyang
+  Chris Constello
+  Cognition Corp.
+Compaq Computer Corporation
+  Concurrent Computer Corporation
+   Conectiva S.A.
+   Corin Anderson
+   Craig Struble
+Daewoo Elec

Bug#252068: us_intl now broken ?

2004-10-02 Thread Denis Barbier
On Fri, Oct 01, 2004 at 09:50:39PM +0200, Denis Barbier wrote:
> On Fri, Oct 01, 2004 at 10:05:09AM -0400, Pascal Giard (QB/EMC) wrote:
> > Hi, i think my problem is related to this one,
> 
> No, please file a new bugreport.
> 
> > since xlibs 4.3.0.dfsg.1-8 us_intl no longer work (on 3 different
> > computers).
> 
> Do not trust the changelog, there has been no change with us_intl
> in -8.  In your bugreport, please run
>   setxkbmap -model pc104 us_intl -print | xkbcomp -w0 -I/etc/X11/xkb - :0
> and send error messages.  These error messages can also be found in
> your display manager log file (/var/log/[gkwx]dm.log)

Err, it works for me because I have pc/us_intl installed, but of course
it is broken.  I am going to file a separate bugreport, in the meantime
you can edit /etc/X11/xkb/rules/xfree86 and add us_intl to $oldlayouts.

Denis



X Strike Force XFree86 SVN commit: r1907 - trunk/debian

2004-10-02 Thread X Strike Force SVN Repository Admin
Author: barbier
Date: 2004-10-02 07:17:20 -0500 (Sat, 02 Oct 2004)
New Revision: 1907

Modified:
   trunk/debian/CHANGESETS
   trunk/debian/MANIFEST.alpha.in
   trunk/debian/MANIFEST.amd64.in
   trunk/debian/MANIFEST.arm.in
   trunk/debian/MANIFEST.hppa.in
   trunk/debian/MANIFEST.hurd-i386.in
   trunk/debian/MANIFEST.i386.in
   trunk/debian/MANIFEST.ia64.in
   trunk/debian/MANIFEST.m68k.in
   trunk/debian/MANIFEST.mips.in
   trunk/debian/MANIFEST.mipsel.in
   trunk/debian/MANIFEST.powerpc.in
   trunk/debian/MANIFEST.s390.in
   trunk/debian/MANIFEST.sparc.in
   trunk/debian/changelog
Log:
Also add /etc/X11/xkb/symbols/pc/us_intl to MANIFEST files.


Modified: trunk/debian/CHANGESETS
===
--- trunk/debian/CHANGESETS 2004-10-01 21:06:06 UTC (rev 1906)
+++ trunk/debian/CHANGESETS 2004-10-02 12:17:20 UTC (rev 1907)
@@ -12,8 +12,8 @@
 (Closes: #274101)
 1905
 
-List /etc/X11/xkb/symbols/pc/us_intl into xlibs.install so that this
-file gets shipped.  (Closes: #271326)
-1906
+List /etc/X11/xkb/symbols/pc/us_intl into xlibs.install and MANIFEST
+files so that this keymap gets shipped.  (Closes: #271326, #274513)
+1906, 1907
 
 vim:set ai et sts=4 sw=4 tw=80:

Modified: trunk/debian/MANIFEST.alpha.in
===
--- trunk/debian/MANIFEST.alpha.in  2004-10-01 21:06:06 UTC (rev 1906)
+++ trunk/debian/MANIFEST.alpha.in  2004-10-02 12:17:20 UTC (rev 1907)
@@ -371,6 +371,7 @@
 etc/X11/xkb/symbols/pc/tr
 etc/X11/xkb/symbols/pc/ua
 etc/X11/xkb/symbols/pc/us
+etc/X11/xkb/symbols/pc/us_intl
 etc/X11/xkb/symbols/pc/yu
 etc/X11/xkb/symbols/pc104
 etc/X11/xkb/symbols/pl

Modified: trunk/debian/MANIFEST.amd64.in
===
--- trunk/debian/MANIFEST.amd64.in  2004-10-01 21:06:06 UTC (rev 1906)
+++ trunk/debian/MANIFEST.amd64.in  2004-10-02 12:17:20 UTC (rev 1907)
@@ -371,6 +371,7 @@
 etc/X11/xkb/symbols/pc/tr
 etc/X11/xkb/symbols/pc/ua
 etc/X11/xkb/symbols/pc/us
+etc/X11/xkb/symbols/pc/us_intl
 etc/X11/xkb/symbols/pc/yu
 etc/X11/xkb/symbols/pc104
 etc/X11/xkb/symbols/pl

Modified: trunk/debian/MANIFEST.arm.in
===
--- trunk/debian/MANIFEST.arm.in2004-10-01 21:06:06 UTC (rev 1906)
+++ trunk/debian/MANIFEST.arm.in2004-10-02 12:17:20 UTC (rev 1907)
@@ -371,6 +371,7 @@
 etc/X11/xkb/symbols/pc/tr
 etc/X11/xkb/symbols/pc/ua
 etc/X11/xkb/symbols/pc/us
+etc/X11/xkb/symbols/pc/us_intl
 etc/X11/xkb/symbols/pc/yu
 etc/X11/xkb/symbols/pc104
 etc/X11/xkb/symbols/pl

Modified: trunk/debian/MANIFEST.hppa.in
===
--- trunk/debian/MANIFEST.hppa.in   2004-10-01 21:06:06 UTC (rev 1906)
+++ trunk/debian/MANIFEST.hppa.in   2004-10-02 12:17:20 UTC (rev 1907)
@@ -371,6 +371,7 @@
 etc/X11/xkb/symbols/pc/tr
 etc/X11/xkb/symbols/pc/ua
 etc/X11/xkb/symbols/pc/us
+etc/X11/xkb/symbols/pc/us_intl
 etc/X11/xkb/symbols/pc/yu
 etc/X11/xkb/symbols/pc104
 etc/X11/xkb/symbols/pl

Modified: trunk/debian/MANIFEST.hurd-i386.in
===
--- trunk/debian/MANIFEST.hurd-i386.in  2004-10-01 21:06:06 UTC (rev 1906)
+++ trunk/debian/MANIFEST.hurd-i386.in  2004-10-02 12:17:20 UTC (rev 1907)
@@ -371,6 +371,7 @@
 etc/X11/xkb/symbols/pc/tr
 etc/X11/xkb/symbols/pc/ua
 etc/X11/xkb/symbols/pc/us
+etc/X11/xkb/symbols/pc/us_intl
 etc/X11/xkb/symbols/pc/yu
 etc/X11/xkb/symbols/pc104
 etc/X11/xkb/symbols/pl

Modified: trunk/debian/MANIFEST.i386.in
===
--- trunk/debian/MANIFEST.i386.in   2004-10-01 21:06:06 UTC (rev 1906)
+++ trunk/debian/MANIFEST.i386.in   2004-10-02 12:17:20 UTC (rev 1907)
@@ -371,6 +371,7 @@
 etc/X11/xkb/symbols/pc/tr
 etc/X11/xkb/symbols/pc/ua
 etc/X11/xkb/symbols/pc/us
+etc/X11/xkb/symbols/pc/us_intl
 etc/X11/xkb/symbols/pc/yu
 etc/X11/xkb/symbols/pc104
 etc/X11/xkb/symbols/pl

Modified: trunk/debian/MANIFEST.ia64.in
===
--- trunk/debian/MANIFEST.ia64.in   2004-10-01 21:06:06 UTC (rev 1906)
+++ trunk/debian/MANIFEST.ia64.in   2004-10-02 12:17:20 UTC (rev 1907)
@@ -371,6 +371,7 @@
 etc/X11/xkb/symbols/pc/tr
 etc/X11/xkb/symbols/pc/ua
 etc/X11/xkb/symbols/pc/us
+etc/X11/xkb/symbols/pc/us_intl
 etc/X11/xkb/symbols/pc/yu
 etc/X11/xkb/symbols/pc104
 etc/X11/xkb/symbols/pl

Modified: trunk/debian/MANIFEST.m68k.in
===
--- trunk/debian/MANIFEST.m68k.in   2004-10-01 21:06:06 UTC (rev 1906)
+++ trunk/debian/MANIFEST.m68k.in   2004-10-02 12:17:20 UTC (rev 1907)
@@ -371,6 +371,7 @@
 etc/X11/xkb/symbols/pc/tr
 etc/X11/xkb/symbols/pc/ua
 etc/X11/xkb/symbols/pc/us
+etc/X11/xkb/symbols/pc/us_intl
 etc/X11/xkb/symbols/pc/yu
 etc/X11/xkb/symbols/pc104
 etc/

Bug#274513: xlibs: us_intl layout unusable in 4.3.0.dfsg.1-8

2004-10-02 Thread Denis Barbier
Package: xlibs
Version: 4.3.0.dfsg.1-8
Severity: normal

A new symbols/pc/us_intl keymap was meant to be shipped in xlibs
4.3.0.dfsg.1-8 in order to fix us_intl related bugs.  Unfortunately
it was not included in the Debian package, and as a consequence
this layout is broken.  Until this gets fixed, a workaround is to
add us_intl to $oldlayouts in /etc/X11/xkb/rules/xfree86 so that the
old us_intl keymap gets used.

Denis



Bug#274496: marked as done (xfonts-base-transcoded: 10x20-ISO8859-15.pcf.gz unreadable?)

2004-10-02 Thread Debian Bug Tracking System
Your message dated Sat, 2 Oct 2004 11:54:57 +0200
with message-id <[EMAIL PROTECTED]>
and subject line Bug#274496: xfonts-base-transcoded: 10x20-ISO8859-15.pcf.gz 
unreadable?
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; 2 Oct 2004 08:56:27 +
>From [EMAIL PROTECTED] Sat Oct 02 01:56:27 2004
Return-path: <[EMAIL PROTECTED]>
Received: from main.uucpssh.org [212.27.33.224] 
by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
id 1CDfgp-0002nY-00; Sat, 02 Oct 2004 01:56:27 -0700
Received: from localhost (localhost [127.0.0.1])
by main.uucpssh.org (Postfix) with ESMTP id A0BF6633BD;
Sat,  2 Oct 2004 10:56:25 +0200 (CEST)
Received: by main.uucpssh.org (Postfix, from userid 10)
id 3EDFD633D2; Sat,  2 Oct 2004 10:56:24 +0200 (CEST)
Received: by localhost.localdomain (Postfix, from userid 1000)
id 3897523D10; Sat,  2 Oct 2004 10:52:01 +0200 (CEST)
Date: Sat, 2 Oct 2004 10:52:01 +0200
From: Denis Barbier <[EMAIL PROTECTED]>
To: Debian Bug Tracking System <[EMAIL PROTECTED]>
Subject: xfonts-base-transcoded: 10x20-ISO8859-15.pcf.gz unreadable?
Message-ID: <[EMAIL PROTECTED]>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
X-Reportbug-Version: 2.99.4
User-Agent: Mutt/1.5.6+20040907i
X-Virus-Scanned: by amavisd-new-20030616-p10 (Debian) at uucpssh.org
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: xfonts-base-transcoded
Version: 4.3.0.dfsg.1-8
Severity: normal

Since the upgrade to 4.3.0.dfsg.1-8,
  xterm -fn -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-15
is unreadable whereas iso8859-1 and iso10646-1 variants look fine.
I have no idea what is causing trouble, so I file this bug against
xfonts-base-transcoded, but downgrading to -4 did not help.

Denis

---
Received: (at 274496-done) by bugs.debian.org; 2 Oct 2004 09:56:25 +
>From [EMAIL PROTECTED] Sat Oct 02 02:56:25 2004
Return-path: <[EMAIL PROTECTED]>
Received: from main.uucpssh.org [212.27.33.224] 
by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
id 1CDgcr-0001xs-00; Sat, 02 Oct 2004 02:56:25 -0700
Received: from localhost (localhost [127.0.0.1])
by main.uucpssh.org (Postfix) with ESMTP id 187DC63491
for <[EMAIL PROTECTED]>; Sat,  2 Oct 2004 11:56:24 +0200 (CEST)
Received: by main.uucpssh.org (Postfix, from userid 10)
id C3C616036D; Sat,  2 Oct 2004 11:56:22 +0200 (CEST)
Received: by localhost.localdomain (Postfix, from userid 1000)
id C16CE23E14; Sat,  2 Oct 2004 11:54:57 +0200 (CEST)
Date: Sat, 2 Oct 2004 11:54:57 +0200
To: [EMAIL PROTECTED]
Subject: Re: Bug#274496: xfonts-base-transcoded: 10x20-ISO8859-15.pcf.gz 
unreadable?
Message-ID: <[EMAIL PROTECTED]>
References: <[EMAIL PROTECTED]>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <[EMAIL PROTECTED]>
User-Agent: Mutt/1.5.6+20040907i
From: [EMAIL PROTECTED] (Denis Barbier)
X-Virus-Scanned: by amavisd-new-20030616-p10 (Debian) at uucpssh.org
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=-6.0 required=4.0 tests=BAYES_00,HAS_BUG_NUMBER 
autolearn=no version=2.60-bugs.debian.org_2004_03_25
X-Spam-Level: 

On Sat, Oct 02, 2004 at 10:52:01AM +0200, Denis Barbier wrote:
> Package: xfonts-base-transcoded
> Version: 4.3.0.dfsg.1-8
> Severity: normal
> 
> Since the upgrade to 4.3.0.dfsg.1-8,
>   xterm -fn -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-15
> is unreadable whereas iso8859-1 and iso10646-1 variants look fine.
> I have no idea what is causing trouble, so I file this bug against
> xfonts-base-transcoded, but downgrading to -4 did not help.

It appears that xfs was installed; after removing it, everything works
fine again, so I guess that there was some misconfiguration on my side.
Closing this bug.

Denis



Bug#274496: xfonts-base-transcoded: 10x20-ISO8859-15.pcf.gz unreadable?

2004-10-02 Thread Denis Barbier
Package: xfonts-base-transcoded
Version: 4.3.0.dfsg.1-8
Severity: normal

Since the upgrade to 4.3.0.dfsg.1-8,
  xterm -fn -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-15
is unreadable whereas iso8859-1 and iso10646-1 variants look fine.
I have no idea what is causing trouble, so I file this bug against
xfonts-base-transcoded, but downgrading to -4 did not help.

Denis



Bug#256052: Fixed in 4.3.0.dfsg.1-8

2004-10-02 Thread Frank Murphy

This problem is fixed in 4.3.0.dfsg.1-8. The relevant changelog entry is:

  * Update nv driver and some support code, and grab an XVideo bugfix from
X.Org CVS as of 2004-09-15:
...
+ Update 000_stolen_from_HEAD.diff:
  - Include xf86xv.c Xv fix for little-endian machines.

There is a problem in the change log in that the fix is for big-endian 
machines (the comment says the code assumes a "little-endian framebuffer," 
but it's in the #else clause of a #ifdef X_LITTLE_ENDIAN.

So you can close this bug. I don't know what could be done about the erroneous 
changelog.

Frank



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

2004-10-02 Thread X Strike Force SVN Repository Admin
Author: fabbione
Date: 2004-10-02 00:26:10 -0500 (Sat, 02 Oct 2004)
New Revision: 16

Modified:
   xorg/trunk/debian/CHANGESETS
   xorg/trunk/debian/rules
Log:
Document debian/rules target sanity-checks.
Always run all the checks to catch all the problems in one run.


Modified: xorg/trunk/debian/CHANGESETS
===
--- xorg/trunk/debian/CHANGESETS2004-10-02 05:10:35 UTC (rev 15)
+++ xorg/trunk/debian/CHANGESETS2004-10-02 05:26:10 UTC (rev 16)
@@ -20,4 +20,8 @@
   tars actually created from the source and viceversa.
 15
 
+* Document debian/rules target sanity-checks and always run all the checks
+  instead of failing at the first error to catch all the problems in one run.
+16
+
 vim:set ai et sts=4 sw=4 tw=80:

Modified: xorg/trunk/debian/rules
===
--- xorg/trunk/debian/rules 2004-10-02 05:10:35 UTC (rev 15)
+++ xorg/trunk/debian/rules 2004-10-02 05:26:10 UTC (rev 16)
@@ -37,24 +37,50 @@
 $(STAMP_DIR)/sanity-checks: build
dh_testdir
mkdir -p debian/checks
+
+   # Create list of packages declared in debian/control.
+
cat debian/control | grep ^Package | awk '{print $$NF}' > 
debian/checks/controllist
+
+   # Create list of packages that have been built from the source.
+
cd $(SOURCE_DIR)/tarballs && \
ls *.tar.gz | sed -e 's/.tar.gz//g' | tr '[A-Z]' '[a-z]' > 
../../debian/checks/tarlist && \
cd - > /dev/null
+
+   # Double check the lists against each others. These tests will catch:
+   # 
+   # - a package that has been declared in debian/control but has not been 
built
+   #   due to the following possible reasons:
+   # + package has been banned (see debian/scripts/indipendent-sources)
+   # + package has been removed from the upstream tree
+   # + package has been renamed within the upstream tree
+   # + package changed location within the upstream tree
+   #
+   # - a package that has been built but not declared in debian/control
+   #   due to the following possible reasons:
+   # + package has been added in the upstream tree
+   # + package has been renamed within the upstream tree
+   # + package changed location within the upstream tree
+
+   error=0 && \
for i in `cat debian/checks/controllist`; do \
  if ! grep -q ^$$i$$ debian/checks/tarlist; then \
echo "ERROR: $$i" && \
echo "is defined in debian/control but has not been built!" && \
-   exit 1; \
+   error=1; \
  fi; \
-   done
+   done && \
for i in `cat debian/checks/tarlist`; do \
  if ! grep -q ^$$i$$ debian/checks/controllist; then \
echo "ERROR: $$i" && \
echo "has been built but is not defined in debian/control!" && \
-   exit 1; \
+   error=1; \
  fi; \
-   done
+   done && \
+   if [ "$$error" = "1" ]; then \
+ exit 1; \
+   fi
 
touch $@
 



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

2004-10-02 Thread X Strike Force SVN Repository Admin
Author: fabbione
Date: 2004-10-02 00:10:35 -0500 (Sat, 02 Oct 2004)
New Revision: 15

Modified:
   xorg/trunk/debian/CHANGESETS
   xorg/trunk/debian/rules
Log:
Add sanity checks to verify consistency between debian/control and the list of
tars actually created from the source and viceversa.



Modified: xorg/trunk/debian/CHANGESETS
===
--- xorg/trunk/debian/CHANGESETS2004-10-01 12:06:17 UTC (rev 14)
+++ xorg/trunk/debian/CHANGESETS2004-10-02 05:10:35 UTC (rev 15)
@@ -16,4 +16,8 @@
   not want to ship.
 14
 
+* Add sanity checks to verify consistency between debian/control and the list 
of
+  tars actually created from the source and viceversa.
+15
+
 vim:set ai et sts=4 sw=4 tw=80:

Modified: xorg/trunk/debian/rules
===
--- xorg/trunk/debian/rules 2004-10-01 12:06:17 UTC (rev 14)
+++ xorg/trunk/debian/rules 2004-10-02 05:10:35 UTC (rev 15)
@@ -33,11 +33,36 @@
 
touch $@
 
-binary-arch: build
+sanity-checks: $(STAMP_DIR)/sanity-checks
+$(STAMP_DIR)/sanity-checks: build
dh_testdir
+   mkdir -p debian/checks
+   cat debian/control | grep ^Package | awk '{print $$NF}' > 
debian/checks/controllist
+   cd $(SOURCE_DIR)/tarballs && \
+   ls *.tar.gz | sed -e 's/.tar.gz//g' | tr '[A-Z]' '[a-z]' > 
../../debian/checks/tarlist && \
+   cd - > /dev/null
+   for i in `cat debian/checks/controllist`; do \
+ if ! grep -q ^$$i$$ debian/checks/tarlist; then \
+   echo "ERROR: $$i" && \
+   echo "is defined in debian/control but has not been built!" && \
+   exit 1; \
+ fi; \
+   done
+   for i in `cat debian/checks/tarlist`; do \
+ if ! grep -q ^$$i$$ debian/checks/controllist; then \
+   echo "ERROR: $$i" && \
+   echo "has been built but is not defined in debian/control!" && \
+   exit 1; \
+ fi; \
+   done
 
-binary-indep: build
+   touch $@
+
+binary-arch: sanity-checks
dh_testdir
+
+binary-indep: sanity-checks
+   dh_testdir
dh_installdirs
dh_installchangelogs
dh_installdocs
@@ -64,7 +89,7 @@
 clean:
dh_testdir
dh_clean
-   rm -rf $(STAMP_DIR) $(SOURCE_DIR)
+   rm -rf $(STAMP_DIR) $(SOURCE_DIR) debian/checks
perl $(SCRIPT_DIR)/dbs_split clean
 
 # vim:set noet ai sts=8 sw=8 tw=0: