Author: dnusinow
Date: 2006-08-28 20:37:42 -0400 (Mon, 28 Aug 2006)
New Revision: 3092

Added:
   trunk/app/xbase-clients/appres/
   trunk/app/xbase-clients/beforelight/
   trunk/app/xbase-clients/editres/
   trunk/app/xbase-clients/iceauth/
   trunk/app/xbase-clients/ico/
   trunk/app/xbase-clients/listres/
   trunk/app/xbase-clients/oclock/
   trunk/app/xbase-clients/setxkbmap/
   trunk/app/xbase-clients/viewres/
   trunk/app/xbase-clients/x11perf/
   trunk/app/xbase-clients/xauth/
   trunk/app/xbase-clients/xbiff/
   trunk/app/xbase-clients/xcalc/
   trunk/app/xbase-clients/xclipboard/
   trunk/app/xbase-clients/xcmsdb/
   trunk/app/xbase-clients/xdbedizzy/
   trunk/app/xbase-clients/xditview/
   trunk/app/xbase-clients/xdpyinfo/
   trunk/app/xbase-clients/xedit/
   trunk/app/xbase-clients/xev/
   trunk/app/xbase-clients/xeyes/
   trunk/app/xbase-clients/xf86dga/
   trunk/app/xbase-clients/xfd/
   trunk/app/xbase-clients/xfontsel/
   trunk/app/xbase-clients/xgamma/
   trunk/app/xbase-clients/xgc/
   trunk/app/xbase-clients/xkbprint/
   trunk/app/xbase-clients/xkbutils/
   trunk/app/xbase-clients/xkill/
   trunk/app/xbase-clients/xload/
   trunk/app/xbase-clients/xlogo/
   trunk/app/xbase-clients/xlsatoms/
   trunk/app/xbase-clients/xlsclients/
   trunk/app/xbase-clients/xlsfonts/
   trunk/app/xbase-clients/xmag/
   trunk/app/xbase-clients/xmessage/
   trunk/app/xbase-clients/xmore/
   trunk/app/xbase-clients/xprop/
   trunk/app/xbase-clients/xsetmode/
   trunk/app/xbase-clients/xsetpointer/
   trunk/app/xbase-clients/xsetroot/
   trunk/app/xbase-clients/xsm/
   trunk/app/xbase-clients/xstdcmap/
   trunk/app/xbase-clients/xtrap/
   trunk/app/xbase-clients/xvidtune/
   trunk/app/xbase-clients/xvinfo/
   trunk/app/xbase-clients/xwd/
   trunk/app/xbase-clients/xwud/
Removed:
   trunk/app/xbase-clients/appres-X11R7.0-1.0.0/
   trunk/app/xbase-clients/beforelight-X11R7.0-1.0.1/
   trunk/app/xbase-clients/editres-X11R7.0-1.0.1/
   trunk/app/xbase-clients/iceauth-X11R7.0-1.0.1/
   trunk/app/xbase-clients/ico-X11R7.0-1.0.1/
   trunk/app/xbase-clients/listres-X11R7.0-1.0.1/
   trunk/app/xbase-clients/oclock-X11R7.0-1.0.1/
   trunk/app/xbase-clients/setxkbmap-1.0.2/
   trunk/app/xbase-clients/viewres-X11R7.0-1.0.1/
   trunk/app/xbase-clients/x11perf-1.4.1/
   trunk/app/xbase-clients/xauth-X11R7.0-1.0.1/
   trunk/app/xbase-clients/xbiff-X11R7.0-1.0.1/
   trunk/app/xbase-clients/xcalc-X11R7.0-1.0.1/
   trunk/app/xbase-clients/xclipboard-X11R7.0-1.0.1/
   trunk/app/xbase-clients/xcmsdb-X11R7.0-1.0.1/
   trunk/app/xbase-clients/xdbedizzy-X11R7.0-1.0.1/
   trunk/app/xbase-clients/xditview-X11R7.0-1.0.1/
   trunk/app/xbase-clients/xdpyinfo-X11R7.0-1.0.1/
   trunk/app/xbase-clients/xedit-X11R7.0-1.0.1/
   trunk/app/xbase-clients/xev-X11R7.0-1.0.1/
   trunk/app/xbase-clients/xeyes-X11R7.0-1.0.1/
   trunk/app/xbase-clients/xf86dga-X11R7.0-1.0.1/
   trunk/app/xbase-clients/xfd-X11R7.0-1.0.1/
   trunk/app/xbase-clients/xfontsel-X11R7.0-1.0.1/
   trunk/app/xbase-clients/xgamma-X11R7.0-1.0.1/
   trunk/app/xbase-clients/xgc-X11R7.0-1.0.1/
   trunk/app/xbase-clients/xkbprint-X11R7.0-1.0.1/
   trunk/app/xbase-clients/xkbutils-X11R7.0-1.0.1/
   trunk/app/xbase-clients/xkill-X11R7.0-1.0.1/
   trunk/app/xbase-clients/xload-X11R7.0-1.0.1/
   trunk/app/xbase-clients/xlogo-X11R7.0-1.0.1/
   trunk/app/xbase-clients/xlsatoms-X11R7.0-1.0.1/
   trunk/app/xbase-clients/xlsclients-X11R7.0-1.0.1/
   trunk/app/xbase-clients/xlsfonts-X11R7.0-1.0.1/
   trunk/app/xbase-clients/xmag-X11R7.0-1.0.1/
   trunk/app/xbase-clients/xmessage-X11R7.0-1.0.1/
   trunk/app/xbase-clients/xmore-X11R7.0-1.0.1/
   trunk/app/xbase-clients/xprop-X11R7.0-1.0.1/
   trunk/app/xbase-clients/xsetmode-X11R7.0-1.0.0/
   trunk/app/xbase-clients/xsetpointer-X11R7.0-1.0.0/
   trunk/app/xbase-clients/xsetroot-X11R7.0-1.0.1/
   trunk/app/xbase-clients/xsm-X11R7.0-1.0.1/
   trunk/app/xbase-clients/xstdcmap-X11R7.0-1.0.1/
   trunk/app/xbase-clients/xtrap-X11R7.0-1.0.1/
   trunk/app/xbase-clients/xvidtune-X11R7.0-1.0.1/
   trunk/app/xbase-clients/xvinfo-X11R7.0-1.0.1/
   trunk/app/xbase-clients/xwd-X11R7.0-1.0.1/
   trunk/app/xbase-clients/xwud-X11R7.0-1.0.1/
Modified:
   trunk/app/xbase-clients/debian/rules
Log:
* Merge xbase-clients fixes from the 7.1 branch back to trunk


Copied: trunk/app/xbase-clients/appres (from rev 3091, 
branches/7.1/app/xbase-clients/appres)

Copied: trunk/app/xbase-clients/beforelight (from rev 3091, 
branches/7.1/app/xbase-clients/beforelight)

Modified: trunk/app/xbase-clients/debian/rules
===================================================================
--- trunk/app/xbase-clients/debian/rules        2006-08-29 00:35:07 UTC (rev 
3091)
+++ trunk/app/xbase-clients/debian/rules        2006-08-29 00:37:42 UTC (rev 
3092)
@@ -14,8 +14,8 @@
 
 # This package contains multiple modules as shipped by upstream. Each module 
is # contained in a subdirectory in the root dir of the package. You must list 
each
 # subdirectory explicitly so that the build system knows what to build
-DEF_SUBDIRS=appres-X11R7.0-1.0.0 beforelight-X11R7.0-1.0.1 bitmap 
editres-X11R7.0-1.0.1 fstobdf iceauth-X11R7.0-1.0.1 ico-X11R7.0-1.0.1 
listres-X11R7.0-1.0.1 oclock-X11R7.0-1.0.1 smproxy viewres-X11R7.0-1.0.1 
x11perf-1.4.1 xauth-X11R7.0-1.0.1 xbiff-X11R7.0-1.0.1 xcalc-X11R7.0-1.0.1 
xclipboard-X11R7.0-1.0.1 xclock xcmsdb-X11R7.0-1.0.1 xconsole xcursorgen 
xdbedizzy-X11R7.0-1.0.1 xditview-X11R7.0-1.0.1 xdpyinfo-X11R7.0-1.0.1 xdriinfo 
xedit-X11R7.0-1.0.1 xev-X11R7.0-1.0.1 xeyes-X11R7.0-1.0.1 xf86dga-X11R7.0-1.0.1 
xfd-X11R7.0-1.0.1 xfontsel-X11R7.0-1.0.1 xgamma-X11R7.0-1.0.1 xgc-X11R7.0-1.0.1 
xhost xinit xkill-X11R7.0-1.0.1 xload-X11R7.0-1.0.1 xlogo-X11R7.0-1.0.1 
xlsatoms-X11R7.0-1.0.1 xlsclients-X11R7.0-1.0.1 xlsfonts-X11R7.0-1.0.1 
xmag-X11R7.0-1.0.1 xman xmessage-X11R7.0-1.0.1 xmodmap xmore-X11R7.0-1.0.1 
xprop-X11R7.0-1.0.1 xrandr xrdb xrefresh xsetmode-X11R7.0-1.0.0 
xsetpointer-X11R7.0-1.0.0 xsetroot-X11R7.0-1.0.1 xset xsm-X11R7.0-1.0.1 
xstdcmap-X11R7.0-1.0.1 xtrap-X11R7.0-1.0.1 xvidtune-X11R7.0-1.0.1 
xvinfo-X11R7.0-1.0.1 xwd-X11R7.0-1.0.1 xwininfo xwud-X11R7.0-1.0.1
-XKB_SUBDIRS=setxkbmap-1.0.2 xkbcomp xkbevd xkbprint-X11R7.0-1.0.1 
xkbutils-X11R7.0-1.0.1
+DEF_SUBDIRS=appres beforelight bitmap editres fstobdf iceauth ico listres 
oclock smproxy viewres x11perf xauth xbiff xcalc xclipboard xclock xcmsdb 
xconsole xcursorgen xdbedizzy xditview xdpyinfo xdriinfo xedit xev xeyes 
xf86dga xfd xfontsel xgamma xgc xhost xinit xkill xload xlogo xlsatoms 
xlsclients xlsfonts xmag xman xmessage xmodmap xmore xprop xrandr xrdb xrefresh 
xsetmode xsetpointer xsetroot xset xsm xstdcmap xtrap xvidtune xvinfo xwd 
xwininfo xwud
+XKB_SUBDIRS=setxkbmap xkbcomp xkbevd xkbprint xkbutils
 SUBDIRS=$(DEF_SUBDIRS) $(XKB_SUBDIRS)
 
 CFLAGS = -Wall -g

Copied: trunk/app/xbase-clients/editres (from rev 3091, 
branches/7.1/app/xbase-clients/editres)

Copied: trunk/app/xbase-clients/iceauth (from rev 3091, 
branches/7.1/app/xbase-clients/iceauth)

Copied: trunk/app/xbase-clients/ico (from rev 3091, 
branches/7.1/app/xbase-clients/ico)

Copied: trunk/app/xbase-clients/listres (from rev 3091, 
branches/7.1/app/xbase-clients/listres)

Copied: trunk/app/xbase-clients/oclock (from rev 3091, 
branches/7.1/app/xbase-clients/oclock)

Copied: trunk/app/xbase-clients/setxkbmap (from rev 3091, 
branches/7.1/app/xbase-clients/setxkbmap)

Copied: trunk/app/xbase-clients/viewres (from rev 3091, 
branches/7.1/app/xbase-clients/viewres)

Copied: trunk/app/xbase-clients/x11perf (from rev 3091, 
branches/7.1/app/xbase-clients/x11perf)

Copied: trunk/app/xbase-clients/xauth (from rev 3091, 
branches/7.1/app/xbase-clients/xauth)

Copied: trunk/app/xbase-clients/xbiff (from rev 3091, 
branches/7.1/app/xbase-clients/xbiff)

Copied: trunk/app/xbase-clients/xcalc (from rev 3091, 
branches/7.1/app/xbase-clients/xcalc)

Copied: trunk/app/xbase-clients/xclipboard (from rev 3091, 
branches/7.1/app/xbase-clients/xclipboard)

Copied: trunk/app/xbase-clients/xcmsdb (from rev 3091, 
branches/7.1/app/xbase-clients/xcmsdb)

Copied: trunk/app/xbase-clients/xdbedizzy (from rev 3091, 
branches/7.1/app/xbase-clients/xdbedizzy)

Copied: trunk/app/xbase-clients/xditview (from rev 3091, 
branches/7.1/app/xbase-clients/xditview)

Copied: trunk/app/xbase-clients/xdpyinfo (from rev 3091, 
branches/7.1/app/xbase-clients/xdpyinfo)

Copied: trunk/app/xbase-clients/xedit (from rev 3091, 
branches/7.1/app/xbase-clients/xedit)

Copied: trunk/app/xbase-clients/xev (from rev 3091, 
branches/7.1/app/xbase-clients/xev)

Copied: trunk/app/xbase-clients/xeyes (from rev 3091, 
branches/7.1/app/xbase-clients/xeyes)

Copied: trunk/app/xbase-clients/xf86dga (from rev 3091, 
branches/7.1/app/xbase-clients/xf86dga)

Copied: trunk/app/xbase-clients/xfd (from rev 3091, 
branches/7.1/app/xbase-clients/xfd)

Copied: trunk/app/xbase-clients/xfontsel (from rev 3091, 
branches/7.1/app/xbase-clients/xfontsel)

Copied: trunk/app/xbase-clients/xgamma (from rev 3091, 
branches/7.1/app/xbase-clients/xgamma)

Copied: trunk/app/xbase-clients/xgc (from rev 3091, 
branches/7.1/app/xbase-clients/xgc)

Copied: trunk/app/xbase-clients/xkbprint (from rev 3091, 
branches/7.1/app/xbase-clients/xkbprint)

Copied: trunk/app/xbase-clients/xkbutils (from rev 3091, 
branches/7.1/app/xbase-clients/xkbutils)

Copied: trunk/app/xbase-clients/xkill (from rev 3091, 
branches/7.1/app/xbase-clients/xkill)

Copied: trunk/app/xbase-clients/xload (from rev 3091, 
branches/7.1/app/xbase-clients/xload)

Copied: trunk/app/xbase-clients/xlogo (from rev 3091, 
branches/7.1/app/xbase-clients/xlogo)

Copied: trunk/app/xbase-clients/xlsatoms (from rev 3091, 
branches/7.1/app/xbase-clients/xlsatoms)

Copied: trunk/app/xbase-clients/xlsclients (from rev 3091, 
branches/7.1/app/xbase-clients/xlsclients)

Copied: trunk/app/xbase-clients/xlsfonts (from rev 3091, 
branches/7.1/app/xbase-clients/xlsfonts)

Copied: trunk/app/xbase-clients/xmag (from rev 3091, 
branches/7.1/app/xbase-clients/xmag)

Copied: trunk/app/xbase-clients/xmessage (from rev 3091, 
branches/7.1/app/xbase-clients/xmessage)

Copied: trunk/app/xbase-clients/xmore (from rev 3091, 
branches/7.1/app/xbase-clients/xmore)

Copied: trunk/app/xbase-clients/xprop (from rev 3091, 
branches/7.1/app/xbase-clients/xprop)

Copied: trunk/app/xbase-clients/xsetmode (from rev 3091, 
branches/7.1/app/xbase-clients/xsetmode)

Copied: trunk/app/xbase-clients/xsetpointer (from rev 3091, 
branches/7.1/app/xbase-clients/xsetpointer)

Copied: trunk/app/xbase-clients/xsetroot (from rev 3091, 
branches/7.1/app/xbase-clients/xsetroot)

Copied: trunk/app/xbase-clients/xsm (from rev 3091, 
branches/7.1/app/xbase-clients/xsm)

Copied: trunk/app/xbase-clients/xstdcmap (from rev 3091, 
branches/7.1/app/xbase-clients/xstdcmap)

Copied: trunk/app/xbase-clients/xtrap (from rev 3091, 
branches/7.1/app/xbase-clients/xtrap)

Copied: trunk/app/xbase-clients/xvidtune (from rev 3091, 
branches/7.1/app/xbase-clients/xvidtune)

Copied: trunk/app/xbase-clients/xvinfo (from rev 3091, 
branches/7.1/app/xbase-clients/xvinfo)

Copied: trunk/app/xbase-clients/xwd (from rev 3091, 
branches/7.1/app/xbase-clients/xwd)

Copied: trunk/app/xbase-clients/xwud (from rev 3091, 
branches/7.1/app/xbase-clients/xwud)


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

Reply via email to