From 0ccc29e81c5ca92dece3cbca352e8f4460e7378c Mon Sep 17 00:00:00 2001 From: Dirk Meyer Date: Tue, 6 Sep 2005 08:38:32 +0000 Subject: [PATCH] - rename and merge patches (for better CVS tracking of next updates) --- misc/estic/files/patch-ae | 13 ------------- .../files/{patch-spunk_check.cc => patch-check.cc} | 0 .../files/{patch-spunk_check.h => patch-check.h} | 0 .../files/{patch-spunk_coll.h => patch-coll.h} | 13 +++++++++++++ misc/estic/files/{patch-ag => patch-console.cc} | 0 misc/estic/files/{patch-ah => patch-delay.cc} | 0 .../files/{patch-aa => patch-estic-freebsd-x.mak} | 0 .../files/{patch-ab => patch-estic-freebsd.mak} | 0 misc/estic/files/{patch-av => patch-estic.cc} | 0 misc/estic/files/{patch-ak => patch-filepath.h} | 0 misc/estic/files/{patch-al => patch-filesys.cc} | 0 misc/estic/files/{patch-ai => patch-filesys.h} | 0 misc/estic/files/{patch-aw => patch-icbaseed.cc} | 0 misc/estic/files/{patch-ax => patch-icdevs.cc} | 0 misc/estic/files/{patch-ac => patch-icfile.cc} | 0 misc/estic/files/{patch-ay => patch-imon.cc} | 0 misc/estic/files/{patch-am => patch-menue.cc} | 0 misc/estic/files/{patch-aj => patch-palette.h} | 0 misc/estic/files/{patch-an => patch-password.cc} | 0 misc/estic/files/{patch-at => patch-resitem.cc} | 0 misc/estic/files/{patch-ao => patch-sercom.h} | 0 .../files/{patch-au => patch-spunk-freebsd-x.mak} | 0 misc/estic/files/{patch-ap => patch-stream.cc} | 0 misc/estic/files/{patch-af => patch-stream.h} | 0 misc/estic/files/{patch-aq => patch-syserror.cc} | 0 misc/estic/files/{patch-ar => patch-textstrm.cc} | 0 misc/estic/files/{patch-as => patch-window.cc} | 0 27 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 misc/estic/files/patch-ae rename misc/estic/files/{patch-spunk_check.cc => patch-check.cc} (100%) rename misc/estic/files/{patch-spunk_check.h => patch-check.h} (100%) rename misc/estic/files/{patch-spunk_coll.h => patch-coll.h} (78%) rename misc/estic/files/{patch-ag => patch-console.cc} (100%) rename misc/estic/files/{patch-ah => patch-delay.cc} (100%) rename misc/estic/files/{patch-aa => patch-estic-freebsd-x.mak} (100%) rename misc/estic/files/{patch-ab => patch-estic-freebsd.mak} (100%) rename misc/estic/files/{patch-av => patch-estic.cc} (100%) rename misc/estic/files/{patch-ak => patch-filepath.h} (100%) rename misc/estic/files/{patch-al => patch-filesys.cc} (100%) rename misc/estic/files/{patch-ai => patch-filesys.h} (100%) rename misc/estic/files/{patch-aw => patch-icbaseed.cc} (100%) rename misc/estic/files/{patch-ax => patch-icdevs.cc} (100%) rename misc/estic/files/{patch-ac => patch-icfile.cc} (100%) rename misc/estic/files/{patch-ay => patch-imon.cc} (100%) rename misc/estic/files/{patch-am => patch-menue.cc} (100%) rename misc/estic/files/{patch-aj => patch-palette.h} (100%) rename misc/estic/files/{patch-an => patch-password.cc} (100%) rename misc/estic/files/{patch-at => patch-resitem.cc} (100%) rename misc/estic/files/{patch-ao => patch-sercom.h} (100%) rename misc/estic/files/{patch-au => patch-spunk-freebsd-x.mak} (100%) rename misc/estic/files/{patch-ap => patch-stream.cc} (100%) rename misc/estic/files/{patch-af => patch-stream.h} (100%) rename misc/estic/files/{patch-aq => patch-syserror.cc} (100%) rename misc/estic/files/{patch-ar => patch-textstrm.cc} (100%) rename misc/estic/files/{patch-as => patch-window.cc} (100%) diff --git a/misc/estic/files/patch-ae b/misc/estic/files/patch-ae deleted file mode 100644 index 862a176ccc34..000000000000 --- a/misc/estic/files/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ ---- spunk/coll.h.orig Sat Feb 26 17:44:32 2000 -+++ spunk/coll.h Sat Feb 26 17:45:58 2000 -@@ -33,8 +33,8 @@ - - - --static const coIndexError = 1; // Index out of range --static const coOverflowError = 2; // Collection overflow -+static const int coIndexError = 1; // Index out of range -+static const int coOverflowError = 2; // Collection overflow - - - diff --git a/misc/estic/files/patch-spunk_check.cc b/misc/estic/files/patch-check.cc similarity index 100% rename from misc/estic/files/patch-spunk_check.cc rename to misc/estic/files/patch-check.cc diff --git a/misc/estic/files/patch-spunk_check.h b/misc/estic/files/patch-check.h similarity index 100% rename from misc/estic/files/patch-spunk_check.h rename to misc/estic/files/patch-check.h diff --git a/misc/estic/files/patch-spunk_coll.h b/misc/estic/files/patch-coll.h similarity index 78% rename from misc/estic/files/patch-spunk_coll.h rename to misc/estic/files/patch-coll.h index 30ab6b294e21..3b35317799fa 100644 --- a/misc/estic/files/patch-spunk_coll.h +++ b/misc/estic/files/patch-coll.h @@ -1,3 +1,16 @@ +--- spunk/coll.h.orig Sat Feb 26 17:44:32 2000 ++++ spunk/coll.h Sat Feb 26 17:45:58 2000 +@@ -33,8 +33,8 @@ + + + +-static const coIndexError = 1; // Index out of range +-static const coOverflowError = 2; // Collection overflow ++static const int coIndexError = 1; // Index out of range ++static const int coOverflowError = 2; // Collection overflow + + + --- spunk/coll.h.orig Thu Dec 23 20:58:57 2004 +++ spunk/coll.h Thu Dec 23 20:50:11 2004 @@ -418,15 +418,15 @@ diff --git a/misc/estic/files/patch-ag b/misc/estic/files/patch-console.cc similarity index 100% rename from misc/estic/files/patch-ag rename to misc/estic/files/patch-console.cc diff --git a/misc/estic/files/patch-ah b/misc/estic/files/patch-delay.cc similarity index 100% rename from misc/estic/files/patch-ah rename to misc/estic/files/patch-delay.cc diff --git a/misc/estic/files/patch-aa b/misc/estic/files/patch-estic-freebsd-x.mak similarity index 100% rename from misc/estic/files/patch-aa rename to misc/estic/files/patch-estic-freebsd-x.mak diff --git a/misc/estic/files/patch-ab b/misc/estic/files/patch-estic-freebsd.mak similarity index 100% rename from misc/estic/files/patch-ab rename to misc/estic/files/patch-estic-freebsd.mak diff --git a/misc/estic/files/patch-av b/misc/estic/files/patch-estic.cc similarity index 100% rename from misc/estic/files/patch-av rename to misc/estic/files/patch-estic.cc diff --git a/misc/estic/files/patch-ak b/misc/estic/files/patch-filepath.h similarity index 100% rename from misc/estic/files/patch-ak rename to misc/estic/files/patch-filepath.h diff --git a/misc/estic/files/patch-al b/misc/estic/files/patch-filesys.cc similarity index 100% rename from misc/estic/files/patch-al rename to misc/estic/files/patch-filesys.cc diff --git a/misc/estic/files/patch-ai b/misc/estic/files/patch-filesys.h similarity index 100% rename from misc/estic/files/patch-ai rename to misc/estic/files/patch-filesys.h diff --git a/misc/estic/files/patch-aw b/misc/estic/files/patch-icbaseed.cc similarity index 100% rename from misc/estic/files/patch-aw rename to misc/estic/files/patch-icbaseed.cc diff --git a/misc/estic/files/patch-ax b/misc/estic/files/patch-icdevs.cc similarity index 100% rename from misc/estic/files/patch-ax rename to misc/estic/files/patch-icdevs.cc diff --git a/misc/estic/files/patch-ac b/misc/estic/files/patch-icfile.cc similarity index 100% rename from misc/estic/files/patch-ac rename to misc/estic/files/patch-icfile.cc diff --git a/misc/estic/files/patch-ay b/misc/estic/files/patch-imon.cc similarity index 100% rename from misc/estic/files/patch-ay rename to misc/estic/files/patch-imon.cc diff --git a/misc/estic/files/patch-am b/misc/estic/files/patch-menue.cc similarity index 100% rename from misc/estic/files/patch-am rename to misc/estic/files/patch-menue.cc diff --git a/misc/estic/files/patch-aj b/misc/estic/files/patch-palette.h similarity index 100% rename from misc/estic/files/patch-aj rename to misc/estic/files/patch-palette.h diff --git a/misc/estic/files/patch-an b/misc/estic/files/patch-password.cc similarity index 100% rename from misc/estic/files/patch-an rename to misc/estic/files/patch-password.cc diff --git a/misc/estic/files/patch-at b/misc/estic/files/patch-resitem.cc similarity index 100% rename from misc/estic/files/patch-at rename to misc/estic/files/patch-resitem.cc diff --git a/misc/estic/files/patch-ao b/misc/estic/files/patch-sercom.h similarity index 100% rename from misc/estic/files/patch-ao rename to misc/estic/files/patch-sercom.h diff --git a/misc/estic/files/patch-au b/misc/estic/files/patch-spunk-freebsd-x.mak similarity index 100% rename from misc/estic/files/patch-au rename to misc/estic/files/patch-spunk-freebsd-x.mak diff --git a/misc/estic/files/patch-ap b/misc/estic/files/patch-stream.cc similarity index 100% rename from misc/estic/files/patch-ap rename to misc/estic/files/patch-stream.cc diff --git a/misc/estic/files/patch-af b/misc/estic/files/patch-stream.h similarity index 100% rename from misc/estic/files/patch-af rename to misc/estic/files/patch-stream.h diff --git a/misc/estic/files/patch-aq b/misc/estic/files/patch-syserror.cc similarity index 100% rename from misc/estic/files/patch-aq rename to misc/estic/files/patch-syserror.cc diff --git a/misc/estic/files/patch-ar b/misc/estic/files/patch-textstrm.cc similarity index 100% rename from misc/estic/files/patch-ar rename to misc/estic/files/patch-textstrm.cc diff --git a/misc/estic/files/patch-as b/misc/estic/files/patch-window.cc similarity index 100% rename from misc/estic/files/patch-as rename to misc/estic/files/patch-window.cc