cdk-includes.patch

   1 diff -ur cdk-4.9.10-20010106/Makefile.in cdk-4.9.10-20010106.mis/Makefile.in
   2 --- cdk-4.9.10-20010106/Makefile.in     Sat Sep 23 18:07:52 2000
   3 +++ cdk-4.9.10-20010106.mis/Makefile.in Thu Apr 19 12:00:52 2001
   4 @@ -173,7 +173,7 @@
   5  CDKOBJS                = $(CDKSRC:.c=.o)
   6  CDKSHOBJS      = $(CDKSRC:.c=.os)
   7
   8 -all $(CDKOBJS) ::      include/cdk_config.h
   9 +all $(CDKOBJS) ::      include/cdk/cdk_config.h
  10
  11
  12  #
  13 @@ -280,7 +280,7 @@
  14         cd examples     && $(RM) Makefile
  15         cd demos        && $(RM) Makefile
  16         cd cli          && $(RM) Makefile
  17 -       $(RM) include/cdk_config.h
  18 +       $(RM) include/cdk/cdk_config.h
  19         $(RM) Makefile
  20
  21  #
  22 diff -ur cdk-4.9.10-20010106/alphalist.c cdk-4.9.10-20010106.mis/alphalist.c
  23 --- cdk-4.9.10-20010106/alphalist.c     Sat Jan  6 20:25:27 2001
  24 +++ cdk-4.9.10-20010106.mis/alphalist.c Thu Apr 19 12:03:42 2001
  25 @@ -1,4 +1,4 @@
  26 -#include <cdk.h>
  27 +#include <cdk/cdk.h>
  28
  29  /*
  30   * $Author$
  31 diff -ur cdk-4.9.10-20010106/binding.c cdk-4.9.10-20010106.mis/binding.c
  32 --- cdk-4.9.10-20010106/binding.c       Sat Jan  6 20:27:47 2001
  33 +++ cdk-4.9.10-20010106.mis/binding.c   Thu Apr 19 12:03:42 2001
  34 @@ -1,4 +1,4 @@
  35 -#include <cdk.h>
  36 +#include <cdk/cdk.h>
  37
  38  /*
  39   * $Author$
  40 diff -ur cdk-4.9.10-20010106/buttonbox.c cdk-4.9.10-20010106.mis/buttonbox.c
  41 --- cdk-4.9.10-20010106/buttonbox.c     Sat Jan  6 20:38:19 2001
  42 +++ cdk-4.9.10-20010106.mis/buttonbox.c Thu Apr 19 12:03:42 2001
  43 @@ -1,4 +1,4 @@
  44 -#include <cdk.h>
  45 +#include <cdk/cdk.h>
  46
  47  /*
  48   * $Author$
  49 diff -ur cdk-4.9.10-20010106/calendar.c cdk-4.9.10-20010106.mis/calendar.c
  50 --- cdk-4.9.10-20010106/calendar.c      Sat Jan  6 20:39:43 2001
  51 +++ cdk-4.9.10-20010106.mis/calendar.c  Thu Apr 19 12:03:42 2001
  52 @@ -1,4 +1,4 @@
  53 -#include <cdk.h>
  54 +#include <cdk/cdk.h>
  55
  56  /*
  57   * $Author$
  58 diff -ur cdk-4.9.10-20010106/cdk.c cdk-4.9.10-20010106.mis/cdk.c
  59 --- cdk-4.9.10-20010106/cdk.c   Sat Oct 21 23:57:52 2000
  60 +++ cdk-4.9.10-20010106.mis/cdk.c       Thu Apr 19 12:03:42 2001
  61 @@ -1,4 +1,4 @@
  62 -#include <cdk.h>
  63 +#include <cdk/cdk.h>
  64
  65  /*
  66   * $Author$
  67 diff -ur cdk-4.9.10-20010106/cdkscreen.c cdk-4.9.10-20010106.mis/cdkscreen.c
  68 --- cdk-4.9.10-20010106/cdkscreen.c     Sat Sep 23 02:16:19 2000
  69 +++ cdk-4.9.10-20010106.mis/cdkscreen.c Thu Apr 19 12:03:42 2001
  70 @@ -1,4 +1,4 @@
  71 -#include <cdk.h>
  72 +#include <cdk/cdk.h>
  73  #include <signal.h>
  74
  75  /*
  76 diff -ur cdk-4.9.10-20010106/cli/cdkalphalist.c cdk-4.9.10-20010106.mis/cli/cdkalphalist.c
  77 --- cdk-4.9.10-20010106/cli/cdkalphalist.c      Sat Sep 23 17:09:12 2000
  78 +++ cdk-4.9.10-20010106.mis/cli/cdkalphalist.c  Thu Apr 19 12:08:45 2001
  79 @@ -1,6 +1,6 @@
  80  /* $Id$ */
  81
  82 -#include <cdk.h>
  83 +#include <cdk/cdk.h>
  84
  85  #ifdef XCURSES
  86  char *XCursesProgramName="cdkalphalist";
  87 diff -ur cdk-4.9.10-20010106/cli/cdkcalendar.c cdk-4.9.10-20010106.mis/cli/cdkcalendar.c
  88 --- cdk-4.9.10-20010106/cli/cdkcalendar.c       Sat Sep 23 17:12:08 2000
  89 +++ cdk-4.9.10-20010106.mis/cli/cdkcalendar.c   Thu Apr 19 12:08:45 2001
  90 @@ -1,6 +1,6 @@
  91  /* $Id$ */
  92
  93 -#include <cdk.h>
  94 +#include <cdk/cdk.h>
  95
  96  #ifdef XCURSES
  97  char *XCursesProgramName="cdkcalendar";
  98 diff -ur cdk-4.9.10-20010106/cli/cdkdialog.c cdk-4.9.10-20010106.mis/cli/cdkdialog.c
  99 --- cdk-4.9.10-20010106/cli/cdkdialog.c Sat Sep 23 17:12:08 2000
 100 +++ cdk-4.9.10-20010106.mis/cli/cdkdialog.c     Thu Apr 19 12:08:45 2001
 101 @@ -1,6 +1,6 @@
 102  /* $Id$ */
 103
 104 -#include <cdk.h>
 105 +#include <cdk/cdk.h>
 106
 107  #ifdef XCURSES
 108  char *XCursesProgramName="cdkdialog";
 109 diff -ur cdk-4.9.10-20010106/cli/cdkentry.c cdk-4.9.10-20010106.mis/cli/cdkentry.c
 110 --- cdk-4.9.10-20010106/cli/cdkentry.c  Sat Sep 23 17:12:08 2000
 111 +++ cdk-4.9.10-20010106.mis/cli/cdkentry.c      Thu Apr 19 12:08:45 2001
 112 @@ -1,6 +1,6 @@
 113  /* $Id$ */
 114
 115 -#include <cdk.h>
 116 +#include <cdk/cdk.h>
 117
 118  #ifdef XCURSES
 119  char *XCursesProgramName="cdkentry";
 120 diff -ur cdk-4.9.10-20010106/cli/cdkfselect.c cdk-4.9.10-20010106.mis/cli/cdkfselect.c
 121 --- cdk-4.9.10-20010106/cli/cdkfselect.c        Sat Sep 23 17:12:08 2000
 122 +++ cdk-4.9.10-20010106.mis/cli/cdkfselect.c    Thu Apr 19 12:08:45 2001
 123 @@ -1,6 +1,6 @@
 124  /* $Id$ */
 125
 126 -#include <cdk.h>
 127 +#include <cdk/cdk.h>
 128
 129  #ifdef XCURSES
 130  char *XCursesProgramName="cdkfselect";
 131 diff -ur cdk-4.9.10-20010106/cli/cdkitemlist.c cdk-4.9.10-20010106.mis/cli/cdkitemlist.c
 132 --- cdk-4.9.10-20010106/cli/cdkitemlist.c       Sat Sep 23 17:09:12 2000
 133 +++ cdk-4.9.10-20010106.mis/cli/cdkitemlist.c   Thu Apr 19 12:08:45 2001
 134 @@ -1,6 +1,6 @@
 135  /* $Id$ */
 136
 137 -#include <cdk.h>
 138 +#include <cdk/cdk.h>
 139
 140  #ifdef XCURSES
 141  char *XCursesProgramName="cdkitemlist";
 142 diff -ur cdk-4.9.10-20010106/cli/cdklabel.c cdk-4.9.10-20010106.mis/cli/cdklabel.c
 143 --- cdk-4.9.10-20010106/cli/cdklabel.c  Sat Sep 23 17:07:32 2000
 144 +++ cdk-4.9.10-20010106.mis/cli/cdklabel.c      Thu Apr 19 12:08:45 2001
 145 @@ -1,6 +1,6 @@
 146  /* $Id$ */
 147
 148 -#include <cdk.h>
 149 +#include <cdk/cdk.h>
 150
 151  #ifdef XCURSES
 152  char *XCursesProgramName="cdklabel";
 153 diff -ur cdk-4.9.10-20010106/cli/cdkmatrix.c cdk-4.9.10-20010106.mis/cli/cdkmatrix.c
 154 --- cdk-4.9.10-20010106/cli/cdkmatrix.c Sat Sep 23 17:08:19 2000
 155 +++ cdk-4.9.10-20010106.mis/cli/cdkmatrix.c     Thu Apr 19 12:08:45 2001
 156 @@ -1,6 +1,6 @@
 157  /* $Id$ */
 158
 159 -#include <cdk.h>
 160 +#include <cdk/cdk.h>
 161
 162  #ifdef XCURSES
 163  char *XCursesProgramName="cdkmatrix";
 164 diff -ur cdk-4.9.10-20010106/cli/cdkmentry.c cdk-4.9.10-20010106.mis/cli/cdkmentry.c
 165 --- cdk-4.9.10-20010106/cli/cdkmentry.c Sat Sep 23 17:12:08 2000
 166 +++ cdk-4.9.10-20010106.mis/cli/cdkmentry.c     Thu Apr 19 12:08:45 2001
 167 @@ -1,6 +1,6 @@
 168  /* $Id$ */
 169
 170 -#include <cdk.h>
 171 +#include <cdk/cdk.h>
 172
 173  #ifdef XCURSES
 174  char *XCursesProgramName="cdkmentry";
 175 diff -ur cdk-4.9.10-20010106/cli/cdkradio.c cdk-4.9.10-20010106.mis/cli/cdkradio.c
 176 --- cdk-4.9.10-20010106/cli/cdkradio.c  Sat Sep 23 17:09:12 2000
 177 +++ cdk-4.9.10-20010106.mis/cli/cdkradio.c      Thu Apr 19 12:08:45 2001
 178 @@ -1,6 +1,6 @@
 179  /* $Id$ */
 180
 181 -#include <cdk.h>
 182 +#include <cdk/cdk.h>
 183
 184  #ifdef XCURSES
 185  char *XCursesProgramName="cdkradio";
 186 diff -ur cdk-4.9.10-20010106/cli/cdkscale.c cdk-4.9.10-20010106.mis/cli/cdkscale.c
 187 --- cdk-4.9.10-20010106/cli/cdkscale.c  Sat Sep 23 17:09:12 2000
 188 +++ cdk-4.9.10-20010106.mis/cli/cdkscale.c      Thu Apr 19 12:08:45 2001
 189 @@ -1,6 +1,6 @@
 190  /* $Id$ */
 191
 192 -#include <cdk.h>
 193 +#include <cdk/cdk.h>
 194
 195  #ifdef XCURSES
 196  char *XCursesProgramName="cdkscale";
 197 diff -ur cdk-4.9.10-20010106/cli/cdkscroll.c cdk-4.9.10-20010106.mis/cli/cdkscroll.c
 198 --- cdk-4.9.10-20010106/cli/cdkscroll.c Sat Sep 23 17:09:12 2000
 199 +++ cdk-4.9.10-20010106.mis/cli/cdkscroll.c     Thu Apr 19 12:08:45 2001
 200 @@ -1,6 +1,6 @@
 201  /* $Id$ */
 202
 203 -#include <cdk.h>
 204 +#include <cdk/cdk.h>
 205
 206  #ifdef XCURSES
 207  char *XCursesProgramName="cdkscroll";
 208 diff -ur cdk-4.9.10-20010106/cli/cdkselection.c cdk-4.9.10-20010106.mis/cli/cdkselection.c
 209 --- cdk-4.9.10-20010106/cli/cdkselection.c      Sat Sep 23 17:09:12 2000
 210 +++ cdk-4.9.10-20010106.mis/cli/cdkselection.c  Thu Apr 19 12:08:45 2001
 211 @@ -1,6 +1,6 @@
 212  /* $Id$ */
 213
 214 -#include <cdk.h>
 215 +#include <cdk/cdk.h>
 216
 217  #ifdef XCURSES
 218  char *XCursesProgramName="cdkselection";
 219 diff -ur cdk-4.9.10-20010106/cli/cdkslider.c cdk-4.9.10-20010106.mis/cli/cdkslider.c
 220 --- cdk-4.9.10-20010106/cli/cdkslider.c Sat Sep 23 17:09:12 2000
 221 +++ cdk-4.9.10-20010106.mis/cli/cdkslider.c     Thu Apr 19 12:08:45 2001
 222 @@ -1,6 +1,6 @@
 223  /* $Id$ */
 224
 225 -#include <cdk.h>
 226 +#include <cdk/cdk.h>
 227
 228  #ifdef XCURSES
 229  char *XCursesProgramName="cdkslider";
 230 diff -ur cdk-4.9.10-20010106/cli/cdktemplate.c cdk-4.9.10-20010106.mis/cli/cdktemplate.c
 231 --- cdk-4.9.10-20010106/cli/cdktemplate.c       Sat Sep 23 17:12:08 2000
 232 +++ cdk-4.9.10-20010106.mis/cli/cdktemplate.c   Thu Apr 19 12:08:45 2001
 233 @@ -1,6 +1,6 @@
 234  /* $Id$ */
 235
 236 -#include <cdk.h>
 237 +#include <cdk/cdk.h>
 238
 239  #ifdef XCURSES
 240  char *XCursesProgramName="cdktemplate";
 241 diff -ur cdk-4.9.10-20010106/cli/cdkviewer.c cdk-4.9.10-20010106.mis/cli/cdkviewer.c
 242 --- cdk-4.9.10-20010106/cli/cdkviewer.c Sat Sep 23 17:12:08 2000
 243 +++ cdk-4.9.10-20010106.mis/cli/cdkviewer.c     Thu Apr 19 12:08:45 2001
 244 @@ -1,6 +1,6 @@
 245  /* $Id$ */
 246
 247 -#include <cdk.h>
 248 +#include <cdk/cdk.h>
 249
 250  #ifdef XCURSES
 251  char *XCursesProgramName="cdkviewer";
 252 diff -ur cdk-4.9.10-20010106/configure cdk-4.9.10-20010106.mis/configure
 253 --- cdk-4.9.10-20010106/configure       Sat Sep 16 01:54:10 2000
 254 +++ cdk-4.9.10-20010106.mis/configure   Thu Apr 19 12:02:55 2001
 255 @@ -460,7 +460,7 @@
 256
 257  # A filename unique to this package, relative to the directory that
 258  # configure is in, which we can look for to find out if srcdir is correct.
 259 -ac_unique_file=include/cdk.h
 260 +ac_unique_file=include/cdk/cdk.h
 261
 262  # Find the source files, if location was not specified.
 263  if test -z "$srcdir"; then
 264 @@ -4711,7 +4711,7 @@
 265  ac_given_srcdir=$srcdir
 266  ac_given_INSTALL="$INSTALL"
 267
 268 -trap 'rm -fr `echo "Makefile cli/Makefile examples/Makefile demos/Makefile include/cdk_config.h:include/config.hin" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 269 +trap 'rm -fr `echo "Makefile cli/Makefile examples/Makefile demos/Makefile include/cdk/cdk_config.h:include/cdk/config.hin" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 270  EOF
 271  cat >> $CONFIG_STATUS <<EOF
 272
 273 @@ -4887,7 +4887,7 @@
 274  if test "${CONFIG_HEADERS+set}" != set; then
 275  EOF
 276  cat >> $CONFIG_STATUS <<EOF
 277 -  CONFIG_HEADERS="include/cdk_config.h:include/config.hin"
 278 +  CONFIG_HEADERS="include/cdk/cdk_config.h:include/cdk/config.hin"
 279  EOF
 280  cat >> $CONFIG_STATUS <<\EOF
 281  fi
 282 diff -ur cdk-4.9.10-20010106/configure.in cdk-4.9.10-20010106.mis/configure.in
 283 --- cdk-4.9.10-20010106/configure.in    Sat Sep 23 03:53:55 2000
 284 +++ cdk-4.9.10-20010106.mis/configure.in        Thu Apr 19 12:01:30 2001
 285 @@ -1,8 +1,8 @@
 286  dnl
 287  dnl Process this file with autoconf to produce a configure script.
 288  dnl
 289 -AC_INIT(include/cdk.h)
 290 -AC_CONFIG_HEADER(include/cdk_config.h:include/config.hin)
 291 +AC_INIT(include/cdk/cdk.h)
 292 +AC_CONFIG_HEADER(include/cdk/cdk_config.h:include/cdk/config.hin)
 293
 294  CF_CHECK_CACHE
 295
 296 diff -ur cdk-4.9.10-20010106/debug.c cdk-4.9.10-20010106.mis/debug.c
 297 --- cdk-4.9.10-20010106/debug.c Sat Feb 19 00:20:55 2000
 298 +++ cdk-4.9.10-20010106.mis/debug.c     Thu Apr 19 12:03:42 2001
 299 @@ -1,4 +1,4 @@
 300 -#include <cdk.h>
 301 +#include <cdk/cdk.h>
 302
 303  /*
 304   * $Author$
 305 diff -ur cdk-4.9.10-20010106/demos/appointment.c cdk-4.9.10-20010106.mis/demos/appointment.c
 306 --- cdk-4.9.10-20010106/demos/appointment.c     Sat Jan  6 21:31:53 2001
 307 +++ cdk-4.9.10-20010106.mis/demos/appointment.c Thu Apr 19 12:06:21 2001
 308 @@ -1,4 +1,4 @@
 309 -#include <cdk.h>
 310 +#include <cdk/cdk.h>
 311
 312  #ifdef HAVE_XCURSES
 313  char *XCursesProgramName="appointmentBook";
 314 diff -ur cdk-4.9.10-20010106/demos/clock.c cdk-4.9.10-20010106.mis/demos/clock.c
 315 --- cdk-4.9.10-20010106/demos/clock.c   Sat Feb 19 00:18:18 2000
 316 +++ cdk-4.9.10-20010106.mis/demos/clock.c       Thu Apr 19 12:06:21 2001
 317 @@ -1,4 +1,4 @@
 318 -#include <cdk.h>
 319 +#include <cdk/cdk.h>
 320
 321  #ifdef HAVE_XCURSES
 322  char *XCursesProgramName="label_ex";
 323 diff -ur cdk-4.9.10-20010106/demos/command.c cdk-4.9.10-20010106.mis/demos/command.c
 324 --- cdk-4.9.10-20010106/demos/command.c Sat Jan  6 21:34:57 2001
 325 +++ cdk-4.9.10-20010106.mis/demos/command.c     Thu Apr 19 12:06:21 2001
 326 @@ -1,4 +1,4 @@
 327 -#include <cdk.h>
 328 +#include <cdk/cdk.h>
 329
 330  #ifdef HAVE_XCURSES
 331  char *XCursesProgramName="command";
 332 diff -ur cdk-4.9.10-20010106/demos/fileview.c cdk-4.9.10-20010106.mis/demos/fileview.c
 333 --- cdk-4.9.10-20010106/demos/fileview.c        Thu Jun 29 02:22:29 2000
 334 +++ cdk-4.9.10-20010106.mis/demos/fileview.c    Thu Apr 19 12:06:21 2001
 335 @@ -1,4 +1,4 @@
 336 -#include <cdk.h>
 337 +#include <cdk/cdk.h>
 338
 339  #ifdef HAVE_XCURSES
 340  char *XCursesProgramName="codeViewer";
 341 diff -ur cdk-4.9.10-20010106/demos/rolodex.h cdk-4.9.10-20010106.mis/demos/rolodex.h
 342 --- cdk-4.9.10-20010106/demos/rolodex.h Sat Feb 19 00:18:29 2000
 343 +++ cdk-4.9.10-20010106.mis/demos/rolodex.h     Thu Apr 19 12:08:21 2001
 344 @@ -1,4 +1,4 @@
 345 -#include <cdk.h>
 346 +#include <cdk/cdk.h>
 347  #include <time.h>
 348  #include <fcntl.h>
 349  #include <unistd.h>
 350 diff -ur cdk-4.9.10-20010106/demos/serial.c cdk-4.9.10-20010106.mis/demos/serial.c
 351 --- cdk-4.9.10-20010106/demos/serial.c  Sat Feb 19 00:18:34 2000
 352 +++ cdk-4.9.10-20010106.mis/demos/serial.c      Thu Apr 19 12:06:21 2001
 353 @@ -8,7 +8,7 @@
 354  #include <unistd.h>
 355  #include <time.h>
 356
 357 -#include <cdk.h>
 358 +#include <cdk/cdk.h>
 359
 360  #ifdef HAVE_XCURSES
 361  char *XCursesProgramName="serial";
 362 diff -ur cdk-4.9.10-20010106/demos/stopSign.c cdk-4.9.10-20010106.mis/demos/stopSign.c
 363 --- cdk-4.9.10-20010106/demos/stopSign.c        Sat Feb 19 00:18:38 2000
 364 +++ cdk-4.9.10-20010106.mis/demos/stopSign.c    Thu Apr 19 12:06:21 2001
 365 @@ -1,4 +1,4 @@
 366 -#include <cdk.h>
 367 +#include <cdk/cdk.h>
 368
 369  #ifdef HAVE_XCURSES
 370  char *XCursesProgramName="sillyness_ex";
 371 diff -ur cdk-4.9.10-20010106/demos/syb.c cdk-4.9.10-20010106.mis/demos/syb.c
 372 --- cdk-4.9.10-20010106/demos/syb.c     Sat Jan  6 20:48:57 2001
 373 +++ cdk-4.9.10-20010106.mis/demos/syb.c Thu Apr 19 12:06:21 2001
 374 @@ -1,4 +1,4 @@
 375 -#include <cdk.h>
 376 +#include <cdk/cdk.h>
 377  #include <sybfront.h>
 378  #include <sybdb.h>
 379
 380 diff -ur cdk-4.9.10-20010106/demos/vinstall.c cdk-4.9.10-20010106.mis/demos/vinstall.c
 381 --- cdk-4.9.10-20010106/demos/vinstall.c        Thu Jun 29 02:06:55 2000
 382 +++ cdk-4.9.10-20010106.mis/demos/vinstall.c    Thu Apr 19 12:06:21 2001
 383 @@ -1,4 +1,4 @@
 384 -#include <cdk.h>
 385 +#include <cdk/cdk.h>
 386
 387  #ifdef HAVE_XCURSES
 388  char *XCursesProgramName="vinstall";
 389 diff -ur cdk-4.9.10-20010106/dialog.c cdk-4.9.10-20010106.mis/dialog.c
 390 --- cdk-4.9.10-20010106/dialog.c        Sat Jan  6 20:39:43 2001
 391 +++ cdk-4.9.10-20010106.mis/dialog.c    Thu Apr 19 12:03:42 2001
 392 @@ -1,4 +1,4 @@
 393 -#include <cdk.h>
 394 +#include <cdk/cdk.h>
 395
 396  /*
 397   * $Author$
 398 diff -ur cdk-4.9.10-20010106/draw.c cdk-4.9.10-20010106.mis/draw.c
 399 --- cdk-4.9.10-20010106/draw.c  Thu Jun 29 01:59:06 2000
 400 +++ cdk-4.9.10-20010106.mis/draw.c      Thu Apr 19 12:03:42 2001
 401 @@ -1,4 +1,4 @@
 402 -#include <cdk.h>
 403 +#include <cdk/cdk.h>
 404
 405  /*
 406   * $Author$
 407 diff -ur cdk-4.9.10-20010106/entry.c cdk-4.9.10-20010106.mis/entry.c
 408 --- cdk-4.9.10-20010106/entry.c Sat Jan  6 20:39:43 2001
 409 +++ cdk-4.9.10-20010106.mis/entry.c     Thu Apr 19 12:03:42 2001
 410 @@ -1,4 +1,4 @@
 411 -#include <cdk.h>
 412 +#include <cdk/cdk.h>
 413
 414  /*
 415   * $Author$
 416 diff -ur cdk-4.9.10-20010106/examples/alphalist_ex.c cdk-4.9.10-20010106.mis/examples/alphalist_ex.c
 417 --- cdk-4.9.10-20010106/examples/alphalist_ex.c Thu Jun 29 02:25:54 2000
 418 +++ cdk-4.9.10-20010106.mis/examples/alphalist_ex.c     Thu Apr 19 12:05:14 2001
 419 @@ -1,4 +1,4 @@
 420 -#include <cdk.h>
 421 +#include <cdk/cdk.h>
 422
 423  #ifdef HAVE_XCURSES
 424  char *XCursesProgramName="alphalist_ex";
 425 diff -ur cdk-4.9.10-20010106/examples/bind_ex.c cdk-4.9.10-20010106.mis/examples/bind_ex.c
 426 --- cdk-4.9.10-20010106/examples/bind_ex.c      Sat Jan  6 21:41:44 2001
 427 +++ cdk-4.9.10-20010106.mis/examples/bind_ex.c  Thu Apr 19 12:05:15 2001
 428 @@ -1,4 +1,4 @@
 429 -#include <cdk.h>
 430 +#include <cdk/cdk.h>
 431
 432  #ifdef HAVE_XCURSES
 433  char *XCursesProgramName="bind_ex";
 434 diff -ur cdk-4.9.10-20010106/examples/buttonbox_ex.c cdk-4.9.10-20010106.mis/examples/buttonbox_ex.c
 435 --- cdk-4.9.10-20010106/examples/buttonbox_ex.c Sat Jan  6 20:53:27 2001
 436 +++ cdk-4.9.10-20010106.mis/examples/buttonbox_ex.c     Thu Apr 19 12:05:15 2001
 437 @@ -1,4 +1,4 @@
 438 -#include <cdk.h>
 439 +#include <cdk/cdk.h>
 440
 441  #ifdef HAVE_XCURSES
 442  char *XCursesProgramName="buttonbox_ex";
 443 diff -ur cdk-4.9.10-20010106/examples/calendar_ex.c cdk-4.9.10-20010106.mis/examples/calendar_ex.c
 444 --- cdk-4.9.10-20010106/examples/calendar_ex.c  Sat Jan  6 21:42:50 2001
 445 +++ cdk-4.9.10-20010106.mis/examples/calendar_ex.c      Thu Apr 19 12:05:15 2001
 446 @@ -1,4 +1,4 @@
 447 -#include <cdk.h>
 448 +#include <cdk/cdk.h>
 449
 450  #ifdef HAVE_XCURSES
 451  char *XCursesProgramName="calendar_ex";
 452 diff -ur cdk-4.9.10-20010106/examples/cdkscreen_ex.c cdk-4.9.10-20010106.mis/examples/cdkscreen_ex.c
 453 --- cdk-4.9.10-20010106/examples/cdkscreen_ex.c Sat Feb 19 01:18:54 2000
 454 +++ cdk-4.9.10-20010106.mis/examples/cdkscreen_ex.c     Thu Apr 19 12:05:15 2001
 455 @@ -1,4 +1,4 @@
 456 -#include <cdk.h>
 457 +#include <cdk/cdk.h>
 458
 459  /*
 460   * This demonstrates how to create four different Cdk
 461 diff -ur cdk-4.9.10-20010106/examples/dialog_ex.c cdk-4.9.10-20010106.mis/examples/dialog_ex.c
 462 --- cdk-4.9.10-20010106/examples/dialog_ex.c    Sat Feb 19 01:18:54 2000
 463 +++ cdk-4.9.10-20010106.mis/examples/dialog_ex.c        Thu Apr 19 12:05:15 2001
 464 @@ -1,4 +1,4 @@
 465 -#include <cdk.h>
 466 +#include <cdk/cdk.h>
 467
 468  #ifdef HAVE_XCURSES
 469  char *XCursesProgramName="dialog_ex";
 470 diff -ur cdk-4.9.10-20010106/examples/entry_ex.c cdk-4.9.10-20010106.mis/examples/entry_ex.c
 471 --- cdk-4.9.10-20010106/examples/entry_ex.c     Sat Jan  6 21:27:05 2001
 472 +++ cdk-4.9.10-20010106.mis/examples/entry_ex.c Thu Apr 19 12:05:15 2001
 473 @@ -1,4 +1,4 @@
 474 -#include <cdk.h>
 475 +#include <cdk/cdk.h>
 476
 477  #ifdef HAVE_XCURSES
 478  char *XCursesProgramName="entry_ex";
 479 diff -ur cdk-4.9.10-20010106/examples/fselect_ex.c cdk-4.9.10-20010106.mis/examples/fselect_ex.c
 480 --- cdk-4.9.10-20010106/examples/fselect_ex.c   Thu Jun 29 02:22:21 2000
 481 +++ cdk-4.9.10-20010106.mis/examples/fselect_ex.c       Thu Apr 19 12:05:15 2001
 482 @@ -1,4 +1,4 @@
 483 -#include <cdk.h>
 484 +#include <cdk/cdk.h>
 485
 486  #ifdef HAVE_XCURSES
 487  char *XCursesProgramName="fselect_ex";
 488 diff -ur cdk-4.9.10-20010106/examples/graph_ex.c cdk-4.9.10-20010106.mis/examples/graph_ex.c
 489 --- cdk-4.9.10-20010106/examples/graph_ex.c     Sat Feb 19 01:18:54 2000
 490 +++ cdk-4.9.10-20010106.mis/examples/graph_ex.c Thu Apr 19 12:05:15 2001
 491 @@ -1,4 +1,4 @@
 492 -#include <cdk.h>
 493 +#include <cdk/cdk.h>
 494
 495  #ifdef HAVE_XCURSES
 496  char *XCursesProgramName="graph_ex";
 497 diff -ur cdk-4.9.10-20010106/examples/hello_ex.c cdk-4.9.10-20010106.mis/examples/hello_ex.c
 498 --- cdk-4.9.10-20010106/examples/hello_ex.c     Sat Feb 19 01:18:54 2000
 499 +++ cdk-4.9.10-20010106.mis/examples/hello_ex.c Thu Apr 19 12:05:15 2001
 500 @@ -1,4 +1,4 @@
 501 -#include <cdk.h>
 502 +#include <cdk/cdk.h>
 503
 504  #ifdef HAVE_XCURSES
 505  char *XCursesProgramName="hello_ex";
 506 diff -ur cdk-4.9.10-20010106/examples/histogram_ex.c cdk-4.9.10-20010106.mis/examples/histogram_ex.c
 507 --- cdk-4.9.10-20010106/examples/histogram_ex.c Sat Feb 19 01:18:54 2000
 508 +++ cdk-4.9.10-20010106.mis/examples/histogram_ex.c     Thu Apr 19 12:05:15 2001
 509 @@ -1,4 +1,4 @@
 510 -#include <cdk.h>
 511 +#include <cdk/cdk.h>
 512
 513  #ifdef HAVE_XCURSES
 514  char *XCursesProgramName="histogram_ex";
 515 diff -ur cdk-4.9.10-20010106/examples/itemlist_ex.c cdk-4.9.10-20010106.mis/examples/itemlist_ex.c
 516 --- cdk-4.9.10-20010106/examples/itemlist_ex.c  Sat Feb 19 01:18:54 2000
 517 +++ cdk-4.9.10-20010106.mis/examples/itemlist_ex.c      Thu Apr 19 12:05:15 2001
 518 @@ -1,4 +1,4 @@
 519 -#include <cdk.h>
 520 +#include <cdk/cdk.h>
 521
 522  #ifdef HAVE_XCURSES
 523  char *XCursesProgramName="itemlist_ex";
 524 diff -ur cdk-4.9.10-20010106/examples/label_ex.c cdk-4.9.10-20010106.mis/examples/label_ex.c
 525 --- cdk-4.9.10-20010106/examples/label_ex.c     Sat Feb 19 01:18:54 2000
 526 +++ cdk-4.9.10-20010106.mis/examples/label_ex.c Thu Apr 19 12:05:15 2001
 527 @@ -1,4 +1,4 @@
 528 -#include <cdk.h>
 529 +#include <cdk/cdk.h>
 530
 531  #ifdef HAVE_XCURSES
 532  char *XCursesProgramName="label_ex";
 533 diff -ur cdk-4.9.10-20010106/examples/lowerCDKObject_ex.c cdk-4.9.10-20010106.mis/examples/lowerCDKObject_ex.c
 534 --- cdk-4.9.10-20010106/examples/lowerCDKObject_ex.c    Sat Sep 23 02:49:17 2000
 535 +++ cdk-4.9.10-20010106.mis/examples/lowerCDKObject_ex.c        Thu Apr 19 12:05:34 2001
 536 @@ -1,6 +1,6 @@
 537  /* $Id$ */
 538
 539 -#include "cdk.h"
 540 +#include <cdk/cdk.h>
 541
 542  #ifdef HAVE_XCURSES
 543  char *XCursesProgramName = "lowerCDKObject_ex";
 544 diff -ur cdk-4.9.10-20010106/examples/marquee_ex.c cdk-4.9.10-20010106.mis/examples/marquee_ex.c
 545 --- cdk-4.9.10-20010106/examples/marquee_ex.c   Sat Feb 19 01:18:54 2000
 546 +++ cdk-4.9.10-20010106.mis/examples/marquee_ex.c       Thu Apr 19 12:05:15 2001
 547 @@ -1,4 +1,4 @@
 548 -#include <cdk.h>
 549 +#include <cdk/cdk.h>
 550
 551  #ifdef HAVE_XCURSES
 552  char *XCursesProgramName="marquee_ex";
 553 diff -ur cdk-4.9.10-20010106/examples/matrix_ex.c cdk-4.9.10-20010106.mis/examples/matrix_ex.c
 554 --- cdk-4.9.10-20010106/examples/matrix_ex.c    Sat Feb 19 01:18:54 2000
 555 +++ cdk-4.9.10-20010106.mis/examples/matrix_ex.c        Thu Apr 19 12:05:15 2001
 556 @@ -1,4 +1,4 @@
 557 -#include <cdk.h>
 558 +#include <cdk/cdk.h>
 559
 560  #ifdef HAVE_XCURSES
 561  char *XCursesProgramName="matrix_ex";
 562 diff -ur cdk-4.9.10-20010106/examples/mentry_ex.c cdk-4.9.10-20010106.mis/examples/mentry_ex.c
 563 --- cdk-4.9.10-20010106/examples/mentry_ex.c    Sat Feb 19 02:56:55 2000
 564 +++ cdk-4.9.10-20010106.mis/examples/mentry_ex.c        Thu Apr 19 12:05:15 2001
 565 @@ -1,4 +1,4 @@
 566 -#include <cdk.h>
 567 +#include <cdk/cdk.h>
 568
 569  #ifdef HAVE_XCURSES
 570  char *XCursesProgramName="mentry_ex";
 571 diff -ur cdk-4.9.10-20010106/examples/menu_ex.c cdk-4.9.10-20010106.mis/examples/menu_ex.c
 572 --- cdk-4.9.10-20010106/examples/menu_ex.c      Sat Feb 19 01:18:54 2000
 573 +++ cdk-4.9.10-20010106.mis/examples/menu_ex.c  Thu Apr 19 12:05:15 2001
 574 @@ -1,4 +1,4 @@
 575 -#include <cdk.h>
 576 +#include <cdk/cdk.h>
 577
 578  #ifdef HAVE_XCURSES
 579  char *XCursesProgramName="menu_ex";
 580 diff -ur cdk-4.9.10-20010106/examples/position_ex.c cdk-4.9.10-20010106.mis/examples/position_ex.c
 581 --- cdk-4.9.10-20010106/examples/position_ex.c  Sat Feb 19 01:18:54 2000
 582 +++ cdk-4.9.10-20010106.mis/examples/position_ex.c      Thu Apr 19 12:05:15 2001
 583 @@ -1,4 +1,4 @@
 584 -#include <cdk.h>
 585 +#include <cdk/cdk.h>
 586
 587  #ifdef HAVE_XCURSES
 588  char *XCursesProgramName="position_ex";
 589 diff -ur cdk-4.9.10-20010106/examples/preprocess_ex.c cdk-4.9.10-20010106.mis/examples/preprocess_ex.c
 590 --- cdk-4.9.10-20010106/examples/preprocess_ex.c        Sat Jan  6 21:47:18 2001
 591 +++ cdk-4.9.10-20010106.mis/examples/preprocess_ex.c    Thu Apr 19 12:05:15 2001
 592 @@ -1,4 +1,4 @@
 593 -#include <cdk.h>
 594 +#include <cdk/cdk.h>
 595
 596  #ifdef HAVE_XCURSES
 597  char *XCursesProgramName="preprocess_ex";
 598 diff -ur cdk-4.9.10-20010106/examples/radio_ex.c cdk-4.9.10-20010106.mis/examples/radio_ex.c
 599 --- cdk-4.9.10-20010106/examples/radio_ex.c     Thu Jun 29 03:07:43 2000
 600 +++ cdk-4.9.10-20010106.mis/examples/radio_ex.c Thu Apr 19 12:05:15 2001
 601 @@ -1,4 +1,4 @@
 602 -#include <cdk.h>
 603 +#include <cdk/cdk.h>
 604
 605  #ifdef HAVE_XCURSES
 606  char *XCursesProgramName="radio_ex";
 607 diff -ur cdk-4.9.10-20010106/examples/raiseCDKObject_ex.c cdk-4.9.10-20010106.mis/examples/raiseCDKObject_ex.c
 608 --- cdk-4.9.10-20010106/examples/raiseCDKObject_ex.c    Sat Sep 23 02:49:24 2000
 609 +++ cdk-4.9.10-20010106.mis/examples/raiseCDKObject_ex.c        Thu Apr 19 12:06:05 2001
 610 @@ -1,6 +1,6 @@
 611  /* $Id$ */
 612
 613 -#include "cdk.h"
 614 +#include <cdk/cdk.h>
 615
 616  #ifdef HAVE_XCURSES
 617  char *XCursesProgramName = "raiseCDKObject_ex";
 618 diff -ur cdk-4.9.10-20010106/examples/scale_ex.c cdk-4.9.10-20010106.mis/examples/scale_ex.c
 619 --- cdk-4.9.10-20010106/examples/scale_ex.c     Sat Feb 19 01:18:54 2000
 620 +++ cdk-4.9.10-20010106.mis/examples/scale_ex.c Thu Apr 19 12:05:15 2001
 621 @@ -1,4 +1,4 @@
 622 -#include <cdk.h>
 623 +#include <cdk/cdk.h>
 624
 625  #ifdef HAVE_XCURSES
 626  char *XCursesProgramName="scale_ex";
 627 diff -ur cdk-4.9.10-20010106/examples/scroll_ex.c cdk-4.9.10-20010106.mis/examples/scroll_ex.c
 628 --- cdk-4.9.10-20010106/examples/scroll_ex.c    Thu Jun 29 03:06:50 2000
 629 +++ cdk-4.9.10-20010106.mis/examples/scroll_ex.c        Thu Apr 19 12:05:15 2001
 630 @@ -1,4 +1,4 @@
 631 -#include <cdk.h>
 632 +#include <cdk/cdk.h>
 633
 634  #ifdef HAVE_XCURSES
 635  char *XCursesProgramName="scroll_ex";
 636 diff -ur cdk-4.9.10-20010106/examples/selection_ex.c cdk-4.9.10-20010106.mis/examples/selection_ex.c
 637 --- cdk-4.9.10-20010106/examples/selection_ex.c Sat Feb 19 01:18:54 2000
 638 +++ cdk-4.9.10-20010106.mis/examples/selection_ex.c     Thu Apr 19 12:05:15 2001
 639 @@ -1,4 +1,4 @@
 640 -#include <cdk.h>
 641 +#include <cdk/cdk.h>
 642
 643  #ifdef HAVE_XCURSES
 644  char *XCursesProgramName="selection_ex";
 645 diff -ur cdk-4.9.10-20010106/examples/slider_ex.c cdk-4.9.10-20010106.mis/examples/slider_ex.c
 646 --- cdk-4.9.10-20010106/examples/slider_ex.c    Sat Feb 19 01:18:54 2000
 647 +++ cdk-4.9.10-20010106.mis/examples/slider_ex.c        Thu Apr 19 12:05:15 2001
 648 @@ -1,4 +1,4 @@
 649 -#include <cdk.h>
 650 +#include <cdk/cdk.h>
 651
 652  #ifdef HAVE_XCURSES
 653  char *XCursesProgramName="slider_ex";
 654 diff -ur cdk-4.9.10-20010106/examples/subwindow_ex.c cdk-4.9.10-20010106.mis/examples/subwindow_ex.c
 655 --- cdk-4.9.10-20010106/examples/subwindow_ex.c Sun Apr  9 20:36:22 2000
 656 +++ cdk-4.9.10-20010106.mis/examples/subwindow_ex.c     Thu Apr 19 12:05:15 2001
 657 @@ -1,4 +1,4 @@
 658 -#include <cdk.h>
 659 +#include <cdk/cdk.h>
 660
 661  #ifdef HAVE_XCURSES
 662  char *XCursesProgramName="subwindow_ex";
 663 diff -ur cdk-4.9.10-20010106/examples/swindow_ex.c cdk-4.9.10-20010106.mis/examples/swindow_ex.c
 664 --- cdk-4.9.10-20010106/examples/swindow_ex.c   Sat Feb 19 01:18:54 2000
 665 +++ cdk-4.9.10-20010106.mis/examples/swindow_ex.c       Thu Apr 19 12:05:15 2001
 666 @@ -1,4 +1,4 @@
 667 -#include <cdk.h>
 668 +#include <cdk/cdk.h>
 669
 670  #ifdef HAVE_XCURSES
 671  char *XCursesProgramName="swindow_ex";
 672 diff -ur cdk-4.9.10-20010106/examples/template_ex.c cdk-4.9.10-20010106.mis/examples/template_ex.c
 673 --- cdk-4.9.10-20010106/examples/template_ex.c  Sat Feb 19 01:18:54 2000
 674 +++ cdk-4.9.10-20010106.mis/examples/template_ex.c      Thu Apr 19 12:05:15 2001
 675 @@ -1,4 +1,4 @@
 676 -#include <cdk.h>
 677 +#include <cdk/cdk.h>
 678
 679  #ifdef HAVE_XCURSES
 680  char *XCursesProgramName="template_ex";
 681 diff -ur cdk-4.9.10-20010106/examples/viewer_ex.c cdk-4.9.10-20010106.mis/examples/viewer_ex.c
 682 --- cdk-4.9.10-20010106/examples/viewer_ex.c    Thu Jun 29 02:22:21 2000
 683 +++ cdk-4.9.10-20010106.mis/examples/viewer_ex.c        Thu Apr 19 12:05:15 2001
 684 @@ -1,4 +1,4 @@
 685 -#include <cdk.h>
 686 +#include <cdk/cdk.h>
 687
 688  #ifdef HAVE_XCURSES
 689  char *XCursesProgramName="viewer_ex";
 690 diff -ur cdk-4.9.10-20010106/examples/vinstall.c cdk-4.9.10-20010106.mis/examples/vinstall.c
 691 --- cdk-4.9.10-20010106/examples/vinstall.c     Thu Jun 29 02:10:55 2000
 692 +++ cdk-4.9.10-20010106.mis/examples/vinstall.c Thu Apr 19 12:05:15 2001
 693 @@ -1,4 +1,4 @@
 694 -#include <cdk.h>
 695 +#include <cdk/cdk.h>
 696
 697  #ifdef HAVE_XCURSES
 698  char *XCursesProgramName="vinstall";
 699 diff -ur cdk-4.9.10-20010106/fselect.c cdk-4.9.10-20010106.mis/fselect.c
 700 --- cdk-4.9.10-20010106/fselect.c       Sat Jan  6 20:26:18 2001
 701 +++ cdk-4.9.10-20010106.mis/fselect.c   Thu Apr 19 12:03:42 2001
 702 @@ -1,4 +1,4 @@
 703 -#include <cdk.h>
 704 +#include <cdk/cdk.h>
 705
 706  /*
 707   * $Author$
 708 diff -ur cdk-4.9.10-20010106/graph.c cdk-4.9.10-20010106.mis/graph.c
 709 --- cdk-4.9.10-20010106/graph.c Sat Feb 19 00:20:55 2000
 710 +++ cdk-4.9.10-20010106.mis/graph.c     Thu Apr 19 12:03:42 2001
 711 @@ -1,4 +1,4 @@
 712 -#include <cdk.h>
 713 +#include <cdk/cdk.h>
 714
 715  /*
 716   * $Author$
 717 diff -ur cdk-4.9.10-20010106/histogram.c cdk-4.9.10-20010106.mis/histogram.c
 718 --- cdk-4.9.10-20010106/histogram.c     Sat Feb 19 00:20:55 2000
 719 +++ cdk-4.9.10-20010106.mis/histogram.c Thu Apr 19 12:03:42 2001
 720 @@ -1,4 +1,4 @@
 721 -#include <cdk.h>
 722 +#include <cdk/cdk.h>
 723
 724  /*
 725   * $Author$
 726 diff -ur cdk-4.9.10-20010106/include/alphalist.h cdk-4.9.10-20010106.mis/include/alphalist.h
 727 --- cdk-4.9.10-20010106/include/alphalist.h     Sat Feb 19 01:17:02 2000
 728 +++ cdk-4.9.10-20010106.mis/include/alphalist.h Thu Apr 19 12:04:23 2001
 729 @@ -1,9 +1,9 @@
 730  #ifndef CDKALPHALIST_H
 731  #define CDKALPHALIST_H 1
 732
 733 -#include <cdk.h>
 734 -#include <entry.h>
 735 -#include <scroll.h>
 736 +#include <cdk/cdk.h>
 737 +#include <cdk/entry.h>
 738 +#include <cdk/scroll.h>
 739
 740  /*
 741   * Description of the widget:
 742 diff -ur cdk-4.9.10-20010106/include/binding.h cdk-4.9.10-20010106.mis/include/binding.h
 743 --- cdk-4.9.10-20010106/include/binding.h       Sat Jan  6 20:24:41 2001
 744 +++ cdk-4.9.10-20010106.mis/include/binding.h   Thu Apr 19 11:42:31 2001
 745 @@ -1,7 +1,7 @@
 746  #ifndef CDKBINDING_H
 747  #define CDKBINDING_H   1
 748
 749 -#include <cdk.h>
 750 +#include <cdk/cdk.h>
 751
 752  /*
 753   * Copyright 1999, Mike Glover
 754 diff -ur cdk-4.9.10-20010106/include/buttonbox.h cdk-4.9.10-20010106.mis/include/buttonbox.h
 755 --- cdk-4.9.10-20010106/include/buttonbox.h     Sat Feb 19 01:16:18 2000
 756 +++ cdk-4.9.10-20010106.mis/include/buttonbox.h Thu Apr 19 11:42:31 2001
 757 @@ -1,7 +1,7 @@
 758  #ifndef CDKBUTTONBOX_H
 759  #define CDKBUTTONBOX_H 1
 760
 761 -#include <cdk.h>
 762 +#include <cdk/cdk.h>
 763
 764  /*
 765   * Description of the widget:
 766 diff -ur cdk-4.9.10-20010106/include/calendar.h cdk-4.9.10-20010106.mis/include/calendar.h
 767 --- cdk-4.9.10-20010106/include/calendar.h      Sat Feb 19 01:16:18 2000
 768 +++ cdk-4.9.10-20010106.mis/include/calendar.h  Thu Apr 19 11:42:31 2001
 769 @@ -1,7 +1,7 @@
 770  #ifndef CDKCALENDAR_H
 771  #define CDKCALENDAR_H  1
 772
 773 -#include <cdk.h>
 774 +#include <cdk/cdk.h>
 775
 776  /*
 777   * Description of the widget:
 778 diff -ur cdk-4.9.10-20010106/include/cdk.h cdk-4.9.10-20010106.mis/include/cdk.h
 779 --- cdk-4.9.10-20010106/include/cdk.h   Sun Oct 22 01:04:47 2000
 780 +++ cdk-4.9.10-20010106.mis/include/cdk.h       Thu Apr 19 11:44:12 2001
 781 @@ -34,7 +34,7 @@
 782   * SUCH DAMAGE.
 783   */
 784
 785 -#include <cdk_config.h>
 786 +#include <cdk/cdk_config.h>
 787
 788  #ifdef CDK_PERL_EXT
 789  #undef instr
 790 @@ -228,37 +228,37 @@
 791  /*
 792   * These header files define miscellaneous values and prototypes.
 793   */
 794 -#include <cdkscreen.h>
 795 -#include <curdefs.h>
 796 -#include <binding.h>
 797 -#include <cdk_util.h>
 798 -#include <cdk_objs.h>
 799 +#include <cdk/cdkscreen.h>
 800 +#include <cdk/curdefs.h>
 801 +#include <cdk/binding.h>
 802 +#include <cdk/cdk_util.h>
 803 +#include <cdk/cdk_objs.h>
 804
 805  /*
 806   * Include the CDK widget header files.
 807   */
 808 -#include <alphalist.h>
 809 -#include <buttonbox.h>
 810 -#include <calendar.h>
 811 -#include <dialog.h>
 812 -#include <entry.h>
 813 -#include <fselect.h>
 814 -#include <graph.h>
 815 -#include <histogram.h>
 816 -#include <itemlist.h>
 817 -#include <label.h>
 818 -#include <marquee.h>
 819 -#include <matrix.h>
 820 -#include <mentry.h>
 821 -#include <menu.h>
 822 -#include <radio.h>
 823 -#include <scale.h>
 824 -#include <scroll.h>
 825 -#include <selection.h>
 826 -#include <slider.h>
 827 -#include <swindow.h>
 828 -#include <template.h>
 829 -#include <viewer.h>
 830 -#include <draw.h>
 831 +#include <cdk/alphalist.h>
 832 +#include <cdk/buttonbox.h>
 833 +#include <cdk/calendar.h>
 834 +#include <cdk/dialog.h>
 835 +#include <cdk/entry.h>
 836 +#include <cdk/fselect.h>
 837 +#include <cdk/graph.h>
 838 +#include <cdk/histogram.h>
 839 +#include <cdk/itemlist.h>
 840 +#include <cdk/label.h>
 841 +#include <cdk/marquee.h>
 842 +#include <cdk/matrix.h>
 843 +#include <cdk/mentry.h>
 844 +#include <cdk/menu.h>
 845 +#include <cdk/radio.h>
 846 +#include <cdk/scale.h>
 847 +#include <cdk/scroll.h>
 848 +#include <cdk/selection.h>
 849 +#include <cdk/slider.h>
 850 +#include <cdk/swindow.h>
 851 +#include <cdk/template.h>
 852 +#include <cdk/viewer.h>
 853 +#include <cdk/draw.h>
 854
 855  #endif /* CDK_H */
 856 diff -ur cdk-4.9.10-20010106/include/cdk_util.h cdk-4.9.10-20010106.mis/include/cdk_util.h
 857 --- cdk-4.9.10-20010106/include/cdk_util.h      Thu Jun 29 03:04:09 2000
 858 +++ cdk-4.9.10-20010106.mis/include/cdk_util.h  Thu Apr 19 11:42:31 2001
 859 @@ -1,7 +1,7 @@
 860  #ifndef CDKUTIL_H
 861  #define CDKUTIL_H      1
 862
 863 -#include <cdk.h>
 864 +#include <cdk/cdk.h>
 865
 866  /*
 867   * Copyright 1999, Mike Glover
 868 diff -ur cdk-4.9.10-20010106/include/cdkscreen.h cdk-4.9.10-20010106.mis/include/cdkscreen.h
 869 --- cdk-4.9.10-20010106/include/cdkscreen.h     Sat Feb 19 01:16:18 2000
 870 +++ cdk-4.9.10-20010106.mis/include/cdkscreen.h Thu Apr 19 11:42:31 2001
 871 @@ -1,7 +1,7 @@
 872  #ifndef CDKSCREEN_H
 873  #define CDKSCREEN_H    1
 874
 875 -#include <cdk.h>
 876 +#include <cdk/cdk.h>
 877
 878  /*
 879   * Copyright 1999, Mike Glover
 880 diff -ur cdk-4.9.10-20010106/include/dialog.h cdk-4.9.10-20010106.mis/include/dialog.h
 881 --- cdk-4.9.10-20010106/include/dialog.h        Sat Feb 19 01:16:18 2000
 882 +++ cdk-4.9.10-20010106.mis/include/dialog.h    Thu Apr 19 11:42:31 2001
 883 @@ -1,7 +1,7 @@
 884  #ifndef CDKDIALOG_H
 885  #define CDKDIALOG_H    1
 886
 887 -#include <cdk.h>
 888 +#include <cdk/cdk.h>
 889
 890  /*
 891   * Description of the widget:
 892 diff -ur cdk-4.9.10-20010106/include/draw.h cdk-4.9.10-20010106.mis/include/draw.h
 893 --- cdk-4.9.10-20010106/include/draw.h  Sat Feb 19 01:16:18 2000
 894 +++ cdk-4.9.10-20010106.mis/include/draw.h      Thu Apr 19 11:42:31 2001
 895 @@ -1,7 +1,7 @@
 896  #ifndef CDKDRAW_H
 897  #define CDKDRAW_H      1
 898
 899 -#include <cdk.h>
 900 +#include <cdk/cdk.h>
 901
 902  /*
 903   * Copyright 1999, Mike Glover
 904 diff -ur cdk-4.9.10-20010106/include/entry.h cdk-4.9.10-20010106.mis/include/entry.h
 905 --- cdk-4.9.10-20010106/include/entry.h Sat Feb 19 01:16:18 2000
 906 +++ cdk-4.9.10-20010106.mis/include/entry.h     Thu Apr 19 11:42:31 2001
 907 @@ -1,7 +1,7 @@
 908  #ifndef CDKENTRY_H
 909  #define CDKENTRY_H     1
 910
 911 -#include <cdk.h>
 912 +#include <cdk/cdk.h>
 913
 914  /*
 915   * Description of the widget:
 916 diff -ur cdk-4.9.10-20010106/include/fselect.h cdk-4.9.10-20010106.mis/include/fselect.h
 917 --- cdk-4.9.10-20010106/include/fselect.h       Sat Feb 19 01:17:02 2000
 918 +++ cdk-4.9.10-20010106.mis/include/fselect.h   Thu Apr 19 11:57:20 2001
 919 @@ -1,7 +1,7 @@
 920  #ifndef CDKFSELECT_H
 921  #define CDKFSELECT_H   1
 922
 923 -#include <cdk.h>
 924 +#include <cdk/cdk.h>
 925
 926  /*
 927   * Description of the widget:
 928 @@ -41,8 +41,8 @@
 929   * SUCH DAMAGE.
 930   */
 931
 932 -#include <label.h>
 933 -#include <entry.h>
 934 +#include <cdk/label.h>
 935 +#include <cdk/entry.h>
 936
 937  /*
 938   * Define the CDK file selector widget structure.
 939 diff -ur cdk-4.9.10-20010106/include/graph.h cdk-4.9.10-20010106.mis/include/graph.h
 940 --- cdk-4.9.10-20010106/include/graph.h Sat Feb 19 01:16:18 2000
 941 +++ cdk-4.9.10-20010106.mis/include/graph.h     Thu Apr 19 11:42:31 2001
 942 @@ -1,7 +1,7 @@
 943  #ifndef CDKGRAPH_H
 944  #define CDKGRAPH_H     1
 945
 946 -#include <cdk.h>
 947 +#include <cdk/cdk.h>
 948
 949  /*
 950   * Description of the widget:
 951 diff -ur cdk-4.9.10-20010106/include/histogram.h cdk-4.9.10-20010106.mis/include/histogram.h
 952 --- cdk-4.9.10-20010106/include/histogram.h     Sat Feb 19 01:16:18 2000
 953 +++ cdk-4.9.10-20010106.mis/include/histogram.h Thu Apr 19 11:42:31 2001
 954 @@ -1,7 +1,7 @@
 955  #ifndef CDKHISTOGRAM_H
 956  #define CDKHISTOGRAM_H 1
 957
 958 -#include <cdk.h>
 959 +#include <cdk/cdk.h>
 960
 961  /*
 962   * Description of the widget:
 963 diff -ur cdk-4.9.10-20010106/include/itemlist.h cdk-4.9.10-20010106.mis/include/itemlist.h
 964 --- cdk-4.9.10-20010106/include/itemlist.h      Sat Feb 19 01:16:18 2000
 965 +++ cdk-4.9.10-20010106.mis/include/itemlist.h  Thu Apr 19 11:42:31 2001
 966 @@ -1,7 +1,7 @@
 967  #ifndef CDKITEMLIST_H
 968  #define CDKITEMLIST_H  1
 969
 970 -#include <cdk.h>
 971 +#include <cdk/cdk.h>
 972
 973  /*
 974   * Description of the widget:
 975 diff -ur cdk-4.9.10-20010106/include/label.h cdk-4.9.10-20010106.mis/include/label.h
 976 --- cdk-4.9.10-20010106/include/label.h Sat Feb 19 01:16:18 2000
 977 +++ cdk-4.9.10-20010106.mis/include/label.h     Thu Apr 19 11:42:31 2001
 978 @@ -1,7 +1,7 @@
 979  #ifndef CDKLABEL_H
 980  #define CDKLABEL_H     1
 981
 982 -#include <cdk.h>
 983 +#include <cdk/cdk.h>
 984
 985  /*
 986   * Description of the widget:
 987 diff -ur cdk-4.9.10-20010106/include/marquee.h cdk-4.9.10-20010106.mis/include/marquee.h
 988 --- cdk-4.9.10-20010106/include/marquee.h       Sat Feb 19 01:16:18 2000
 989 +++ cdk-4.9.10-20010106.mis/include/marquee.h   Thu Apr 19 11:42:31 2001
 990 @@ -1,7 +1,7 @@
 991  #ifndef CDKMARQUEE_H
 992  #define CDKMARQUEE_H   1
 993
 994 -#include <cdk.h>
 995 +#include <cdk/cdk.h>
 996
 997  /*
 998   * Description of the widget:
 999 diff -ur cdk-4.9.10-20010106/include/matrix.h cdk-4.9.10-20010106.mis/include/matrix.h
1000 --- cdk-4.9.10-20010106/include/matrix.h        Sat Feb 19 01:16:18 2000
1001 +++ cdk-4.9.10-20010106.mis/include/matrix.h    Thu Apr 19 11:42:31 2001
1002 @@ -1,7 +1,7 @@
1003  #ifndef CDKMATRIX_H
1004  #define CDKMATRIX_H    1
1005
1006 -#include <cdk.h>
1007 +#include <cdk/cdk.h>
1008
1009  /*
1010   * Description of the widget:
1011 diff -ur cdk-4.9.10-20010106/include/mentry.h cdk-4.9.10-20010106.mis/include/mentry.h
1012 --- cdk-4.9.10-20010106/include/mentry.h        Sat Feb 19 01:16:18 2000
1013 +++ cdk-4.9.10-20010106.mis/include/mentry.h    Thu Apr 19 11:42:31 2001
1014 @@ -1,7 +1,7 @@
1015  #ifndef CDKMENTRY_H
1016  #define CDKMENTRY_H    1
1017
1018 -#include <cdk.h>
1019 +#include <cdk/cdk.h>
1020
1021  /*
1022   * Description of the widget:
1023 diff -ur cdk-4.9.10-20010106/include/menu.h cdk-4.9.10-20010106.mis/include/menu.h
1024 --- cdk-4.9.10-20010106/include/menu.h  Sat Feb 19 01:16:18 2000
1025 +++ cdk-4.9.10-20010106.mis/include/menu.h      Thu Apr 19 11:42:31 2001
1026 @@ -1,7 +1,7 @@
1027  #ifndef CDKMENU_H
1028  #define CDKMENU_H      1
1029
1030 -#include <cdk.h>
1031 +#include <cdk/cdk.h>
1032
1033  /*
1034   * Copyright 1999, Mike Glover
1035 diff -ur cdk-4.9.10-20010106/include/radio.h cdk-4.9.10-20010106.mis/include/radio.h
1036 --- cdk-4.9.10-20010106/include/radio.h Sat Feb 19 01:16:18 2000
1037 +++ cdk-4.9.10-20010106.mis/include/radio.h     Thu Apr 19 11:42:31 2001
1038 @@ -1,7 +1,7 @@
1039  #ifndef CDKRADIO_H
1040  #define CDKRADIO_H     1
1041
1042 -#include <cdk.h>
1043 +#include <cdk/cdk.h>
1044
1045  /*
1046   * Description of the widget:
1047 diff -ur cdk-4.9.10-20010106/include/scale.h cdk-4.9.10-20010106.mis/include/scale.h
1048 --- cdk-4.9.10-20010106/include/scale.h Sat Feb 19 01:16:18 2000
1049 +++ cdk-4.9.10-20010106.mis/include/scale.h     Thu Apr 19 11:42:31 2001
1050 @@ -1,7 +1,7 @@
1051  #ifndef CDKSCALE_H
1052  #define CDKSCALE_H     1
1053
1054 -#include <cdk.h>
1055 +#include <cdk/cdk.h>
1056
1057  /*
1058   * Description of the widget:
1059 diff -ur cdk-4.9.10-20010106/include/scroll.h cdk-4.9.10-20010106.mis/include/scroll.h
1060 --- cdk-4.9.10-20010106/include/scroll.h        Sat Feb 19 01:16:18 2000
1061 +++ cdk-4.9.10-20010106.mis/include/scroll.h    Thu Apr 19 11:42:31 2001
1062 @@ -1,7 +1,7 @@
1063  #ifndef CDKSCROLL_H
1064  #define CDKSCROLL_H    1
1065
1066 -#include <cdk.h>
1067 +#include <cdk/cdk.h>
1068
1069  /*
1070   * Description of the widget:
1071 diff -ur cdk-4.9.10-20010106/include/selection.h cdk-4.9.10-20010106.mis/include/selection.h
1072 --- cdk-4.9.10-20010106/include/selection.h     Sat Feb 19 01:16:18 2000
1073 +++ cdk-4.9.10-20010106.mis/include/selection.h Thu Apr 19 11:42:31 2001
1074 @@ -1,7 +1,7 @@
1075  #ifndef CDKSELECTION_H
1076  #define CDKSELECTION_H 1
1077
1078 -#include <cdk.h>
1079 +#include <cdk/cdk.h>
1080
1081  /*
1082   * Description of the widget:
1083 diff -ur cdk-4.9.10-20010106/include/slider.h cdk-4.9.10-20010106.mis/include/slider.h
1084 --- cdk-4.9.10-20010106/include/slider.h        Sat Feb 19 01:16:18 2000
1085 +++ cdk-4.9.10-20010106.mis/include/slider.h    Thu Apr 19 11:42:31 2001
1086 @@ -1,7 +1,7 @@
1087  #ifndef CDKSLIDER_H
1088  #define CDKSLIDER_H    1
1089
1090 -#include <cdk.h>
1091 +#include <cdk/cdk.h>
1092
1093  /*
1094   * Description of the widget:
1095 diff -ur cdk-4.9.10-20010106/include/swindow.h cdk-4.9.10-20010106.mis/include/swindow.h
1096 --- cdk-4.9.10-20010106/include/swindow.h       Sat Feb 19 01:16:18 2000
1097 +++ cdk-4.9.10-20010106.mis/include/swindow.h   Thu Apr 19 11:42:31 2001
1098 @@ -1,7 +1,7 @@
1099  #ifndef CDKSWINDOW_H
1100  #define CDKSWINDOW_H   1
1101
1102 -#include <cdk.h>
1103 +#include <cdk/cdk.h>
1104
1105  /*
1106   * Description of the widget:
1107 diff -ur cdk-4.9.10-20010106/include/template.h cdk-4.9.10-20010106.mis/include/template.h
1108 --- cdk-4.9.10-20010106/include/template.h      Sat Feb 19 01:16:18 2000
1109 +++ cdk-4.9.10-20010106.mis/include/template.h  Thu Apr 19 11:42:31 2001
1110 @@ -1,7 +1,7 @@
1111  #ifndef CDKTEMPLATE_H
1112  #define CDKTEMPLATE_H  1
1113
1114 -#include <cdk.h>
1115 +#include <cdk/cdk.h>
1116
1117  /*
1118   * Description of the widget:
1119 diff -ur cdk-4.9.10-20010106/include/viewer.h cdk-4.9.10-20010106.mis/include/viewer.h
1120 --- cdk-4.9.10-20010106/include/viewer.h        Sat Feb 19 01:16:18 2000
1121 +++ cdk-4.9.10-20010106.mis/include/viewer.h    Thu Apr 19 11:42:31 2001
1122 @@ -1,7 +1,7 @@
1123  #ifndef CDKVIEWER_H
1124  #define CDKVIEWER_H    1
1125
1126 -#include <cdk.h>
1127 +#include <cdk/cdk.h>
1128
1129  /*
1130   * Description of the widget:
1131 diff -ur cdk-4.9.10-20010106/itemlist.c cdk-4.9.10-20010106.mis/itemlist.c
1132 --- cdk-4.9.10-20010106/itemlist.c      Sat Jan  6 20:39:43 2001
1133 +++ cdk-4.9.10-20010106.mis/itemlist.c  Thu Apr 19 12:03:42 2001
1134 @@ -1,4 +1,4 @@
1135 -#include <cdk.h>
1136 +#include <cdk/cdk.h>
1137
1138  /*
1139   * $Author$
1140 diff -ur cdk-4.9.10-20010106/label.c cdk-4.9.10-20010106.mis/label.c
1141 --- cdk-4.9.10-20010106/label.c Sat Aug 19 02:47:17 2000
1142 +++ cdk-4.9.10-20010106.mis/label.c     Thu Apr 19 12:03:42 2001
1143 @@ -1,4 +1,4 @@
1144 -#include <cdk.h>
1145 +#include <cdk/cdk.h>
1146
1147  /*
1148   * $Author$
1149 diff -ur cdk-4.9.10-20010106/marquee.c cdk-4.9.10-20010106.mis/marquee.c
1150 --- cdk-4.9.10-20010106/marquee.c       Sat Feb 19 00:20:55 2000
1151 +++ cdk-4.9.10-20010106.mis/marquee.c   Thu Apr 19 12:03:42 2001
1152 @@ -1,4 +1,4 @@
1153 -#include <cdk.h>
1154 +#include <cdk/cdk.h>
1155
1156  /*
1157   * $Author$
1158 diff -ur cdk-4.9.10-20010106/matrix.c cdk-4.9.10-20010106.mis/matrix.c
1159 --- cdk-4.9.10-20010106/matrix.c        Sat Jan  6 20:39:43 2001
1160 +++ cdk-4.9.10-20010106.mis/matrix.c    Thu Apr 19 12:03:42 2001
1161 @@ -1,4 +1,4 @@
1162 -#include <cdk.h>
1163 +#include <cdk/cdk.h>
1164
1165  /*
1166   * $Author$
1167 diff -ur cdk-4.9.10-20010106/mentry.c cdk-4.9.10-20010106.mis/mentry.c
1168 --- cdk-4.9.10-20010106/mentry.c        Sat Jan  6 20:39:43 2001
1169 +++ cdk-4.9.10-20010106.mis/mentry.c    Thu Apr 19 12:03:42 2001
1170 @@ -1,4 +1,4 @@
1171 -#include <cdk.h>
1172 +#include <cdk/cdk.h>
1173
1174  /*
1175   * $Author$
1176 diff -ur cdk-4.9.10-20010106/menu.c cdk-4.9.10-20010106.mis/menu.c
1177 --- cdk-4.9.10-20010106/menu.c  Sat Jan  6 20:39:43 2001
1178 +++ cdk-4.9.10-20010106.mis/menu.c      Thu Apr 19 12:03:42 2001
1179 @@ -1,4 +1,4 @@
1180 -#include <cdk.h>
1181 +#include <cdk/cdk.h>
1182
1183  /*
1184   * $Author$
1185 diff -ur cdk-4.9.10-20010106/position.c cdk-4.9.10-20010106.mis/position.c
1186 --- cdk-4.9.10-20010106/position.c      Sat Feb 19 00:20:55 2000
1187 +++ cdk-4.9.10-20010106.mis/position.c  Thu Apr 19 12:03:42 2001
1188 @@ -1,4 +1,4 @@
1189 -#include <cdk.h>
1190 +#include <cdk/cdk.h>
1191
1192  /*
1193   * $Author$
1194 diff -ur cdk-4.9.10-20010106/radio.c cdk-4.9.10-20010106.mis/radio.c
1195 --- cdk-4.9.10-20010106/radio.c Sat Jan  6 20:39:43 2001
1196 +++ cdk-4.9.10-20010106.mis/radio.c     Thu Apr 19 12:03:42 2001
1197 @@ -1,4 +1,4 @@
1198 -#include <cdk.h>
1199 +#include <cdk/cdk.h>
1200
1201  /*
1202   * $Author$
1203 diff -ur cdk-4.9.10-20010106/scale.c cdk-4.9.10-20010106.mis/scale.c
1204 --- cdk-4.9.10-20010106/scale.c Sat Jan  6 20:39:43 2001
1205 +++ cdk-4.9.10-20010106.mis/scale.c     Thu Apr 19 12:03:42 2001
1206 @@ -1,4 +1,4 @@
1207 -#include <cdk.h>
1208 +#include <cdk/cdk.h>
1209
1210  /*
1211   * $Author$
1212 diff -ur cdk-4.9.10-20010106/scroll.c cdk-4.9.10-20010106.mis/scroll.c
1213 --- cdk-4.9.10-20010106/scroll.c        Sat Jan  6 20:39:43 2001
1214 +++ cdk-4.9.10-20010106.mis/scroll.c    Thu Apr 19 12:03:42 2001
1215 @@ -1,4 +1,4 @@
1216 -#include <cdk.h>
1217 +#include <cdk/cdk.h>
1218
1219  /*
1220   * $Author$
1221 diff -ur cdk-4.9.10-20010106/selection.c cdk-4.9.10-20010106.mis/selection.c
1222 --- cdk-4.9.10-20010106/selection.c     Sat Jan  6 20:39:43 2001
1223 +++ cdk-4.9.10-20010106.mis/selection.c Thu Apr 19 12:03:42 2001
1224 @@ -1,4 +1,4 @@
1225 -#include <cdk.h>
1226 +#include <cdk/cdk.h>
1227
1228  /*
1229   * $Author$
1230 diff -ur cdk-4.9.10-20010106/slider.c cdk-4.9.10-20010106.mis/slider.c
1231 --- cdk-4.9.10-20010106/slider.c        Sat Jan  6 20:39:43 2001
1232 +++ cdk-4.9.10-20010106.mis/slider.c    Thu Apr 19 12:03:42 2001
1233 @@ -1,4 +1,4 @@
1234 -#include <cdk.h>
1235 +#include <cdk/cdk.h>
1236
1237  /*
1238   * $Author$
1239 diff -ur cdk-4.9.10-20010106/swindow.c cdk-4.9.10-20010106.mis/swindow.c
1240 --- cdk-4.9.10-20010106/swindow.c       Sat Jan  6 20:39:43 2001
1241 +++ cdk-4.9.10-20010106.mis/swindow.c   Thu Apr 19 12:03:42 2001
1242 @@ -1,4 +1,4 @@
1243 -#include <cdk.h>
1244 +#include <cdk/cdk.h>
1245
1246  /*
1247   * $Author$
1248 diff -ur cdk-4.9.10-20010106/template.c cdk-4.9.10-20010106.mis/template.c
1249 --- cdk-4.9.10-20010106/template.c      Sat Jan  6 20:39:43 2001
1250 +++ cdk-4.9.10-20010106.mis/template.c  Thu Apr 19 12:03:42 2001
1251 @@ -1,4 +1,4 @@
1252 -#include <cdk.h>
1253 +#include <cdk/cdk.h>
1254
1255  /*
1256   * $Author$
1257 diff -ur cdk-4.9.10-20010106/viewer.c cdk-4.9.10-20010106.mis/viewer.c
1258 --- cdk-4.9.10-20010106/viewer.c        Sat Aug 19 03:41:31 2000
1259 +++ cdk-4.9.10-20010106.mis/viewer.c    Thu Apr 19 12:03:42 2001
1260 @@ -1,4 +1,4 @@
1261 -#include <cdk.h>
1262 +#include <cdk/cdk.h>
1263
1264  /*
1265   * $Author$
1266 --- cdk-4.9.10-20010106/Makefile.in     Thu Apr 19 12:23:08 2001
1267 +++ cdk-4.9.10-20010106.mis/Makefile.in Thu Apr 19 12:25:29 2001
1268 @@ -216,8 +216,8 @@
1269  installCDKHeaderFiles:: $(INCLUDE_DIR)
1270         @echo "Installing CDK header files in $(INCLUDE_DIR)..."
1271         @for i in $(CDKHDR); do \
1272 -          echo "       ... include/$$i"; \
1273 -          $(INSTALL_DATA) include/$$i $(INCLUDE_DIR)/$$i; \
1274 +          echo "       ... include/cdk/$$i"; \
1275 +          $(INSTALL_DATA) include/cdk/$$i $(INCLUDE_DIR)/$$i; \
1276         done
1277
1278  #