[Debian-astro-commits] [saods9] 05/05: Remove ds9_diffs: they are now in the main directory
Ole Streicher
olebole at moszumanska.debian.org
Fri Sep 18 11:44:30 UTC 2015
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch experimental
in repository saods9.
commit 34323be98f5dbcc2340c65955dbb359e595d855e
Author: Ole Streicher <debian at liska.ath.cx>
Date: Fri Sep 18 13:25:53 2015 +0200
Remove ds9_diffs: they are now in the main directory
---
debian/ds9_diffs/README | 2 -
debian/ds9_diffs/tcl8.5.8.diff | 226 --------------------------------------
debian/ds9_diffs/tcllib-1.10.diff | 12 --
debian/ds9_diffs/tk8.5.8.diff | 116 -------------------
4 files changed, 356 deletions(-)
diff --git a/debian/ds9_diffs/README b/debian/ds9_diffs/README
deleted file mode 100644
index cea11f4..0000000
--- a/debian/ds9_diffs/README
+++ /dev/null
@@ -1,2 +0,0 @@
-This directory contains the differences between (some of) the packages that
-were included in ds9 and their originals.
diff --git a/debian/ds9_diffs/tcl8.5.8.diff b/debian/ds9_diffs/tcl8.5.8.diff
deleted file mode 100644
index bf43978..0000000
--- a/debian/ds9_diffs/tcl8.5.8.diff
+++ /dev/null
@@ -1,226 +0,0 @@
-diff -uNr -I '\(RCS.*\|CVS.*\|Id:.*Exp.*\|\$Date:.*\$\|\$Source:.*\$\|\$Revision:.*\$\)' tcl8.5.8/generic/tclIOUtil.c ds9/tcl8.5.8//generic/tclIOUtil.c
---- tcl8.5.8/generic/tclIOUtil.c 2008-11-14 01:22:39.000000000 +0100
-+++ ds9/tcl8.5.8//generic/tclIOUtil.c 2010-06-01 21:26:40.000000000 +0200
-@@ -245,7 +245,8 @@
- * support, I suggest all these hooks are removed.
- */
-
--#undef USE_OBSOLETE_FS_HOOKS
-+/*#undef USE_OBSOLETE_FS_HOOKS*/
-+#define USE_OBSOLETE_FS_HOOKS 1
-
- #ifdef USE_OBSOLETE_FS_HOOKS
-
-diff -uNr -I '\(RCS.*\|CVS.*\|Id:.*Exp.*\|\$Date:.*\$\|\$Source:.*\$\|\$Revision:.*\$\)' tcl8.5.8/win/configure ds9/tcl8.5.8//win/configure
---- tcl8.5.8/win/configure 2009-11-13 19:38:45.000000000 +0100
-+++ ds9/tcl8.5.8//win/configure 2010-06-07 19:28:31.000000000 +0200
-@@ -2994,15 +2994,15 @@
- fi
- echo "$as_me:$LINENO: result: $ac_cv_cygwin" >&5
- echo "${ECHO_T}$ac_cv_cygwin" >&6
--if test "$ac_cv_cygwin" = "yes" ; then
-- { { echo "$as_me:$LINENO: error: Compiling under Cygwin is not currently supported.
--A maintainer for the Cygwin port of Tcl/Tk is needed. See the README
--file for information about building with Mingw." >&5
--echo "$as_me: error: Compiling under Cygwin is not currently supported.
--A maintainer for the Cygwin port of Tcl/Tk is needed. See the README
--file for information about building with Mingw." >&2;}
-- { (exit 1); exit 1; }; }
--fi
-+#if test "$ac_cv_cygwin" = "yes" ; then
-+# { { echo "$as_me:$LINENO: error: Compiling under Cygwin is not currently supported.
-+#A maintainer for the Cygwin port of Tcl/Tk is needed. See the README
-+#file for information about building with Mingw." >&5
-+#echo "$as_me: error: Compiling under Cygwin is not currently supported.
-+#A maintainer for the Cygwin port of Tcl/Tk is needed. See the README
-+#file for information about building with Mingw." >&2;}
-+# { (exit 1); exit 1; }; }
-+#fi
-
-
- echo "$as_me:$LINENO: checking for SEH support in compiler" >&5
-diff -uNr -I '\(RCS.*\|CVS.*\|Id:.*Exp.*\|\$Date:.*\$\|\$Source:.*\$\|\$Revision:.*\$\)' tcl8.5.8/win/Makefile.in ds9/tcl8.5.8//win/Makefile.in
---- tcl8.5.8/win/Makefile.in 2009-11-13 19:38:45.000000000 +0100
-+++ ds9/tcl8.5.8//win/Makefile.in 2010-06-07 22:06:38.000000000 +0200
-@@ -657,15 +657,19 @@
-
- install-tzdata:
- @echo "Installing time zone data"
-- @TCL_LIBRARY="${LIBRARY_DIR}"; export TCL_LIBRARY; \
-+# @TCL_LIBRARY=${LIBRARY_DIR}; export TCL_LIBRARY; \
- ./$(TCLSH) "$(ROOT_DIR)/tools/installData.tcl" \
- "$(ROOT_DIR)/library/tzdata" "$(SCRIPT_INSTALL_DIR)/tzdata"
-+ /usr/bin/tclsh "$(ROOT_DIR)/tools/installData.tcl" \
-+ "$(ROOT_DIR)/library/tzdata" "$(SCRIPT_INSTALL_DIR)/tzdata"
-
- install-msgs:
- @echo "Installing message catalogs"
-- @TCL_LIBRARY="${LIBRARY_DIR}"; export TCL_LIBRARY; \
-+# @TCL_LIBRARY="${LIBRARY_DIR}"; export TCL_LIBRARY; \
- ./$(TCLSH) "$(ROOT_DIR)/tools/installData.tcl" \
- "$(ROOT_DIR)/library/msgs" "$(SCRIPT_INSTALL_DIR)/msgs"
-+ /usr/bin/tclsh "$(ROOT_DIR)/tools/installData.tcl" \
-+ "$(ROOT_DIR)/library/msgs" "$(SCRIPT_INSTALL_DIR)/msgs"
-
- install-doc: doc
-
-diff -uNr -I '\(RCS.*\|CVS.*\|Id:.*Exp.*\|\$Date:.*\$\|\$Source:.*\$\|\$Revision:.*\$\)' tcl8.5.8/win/tclWinDde.c ds9/tcl8.5.8//win/tclWinDde.c
---- tcl8.5.8/win/tclWinDde.c 2006-09-26 02:05:03.000000000 +0200
-+++ ds9/tcl8.5.8//win/tclWinDde.c 2010-06-07 20:33:55.000000000 +0200
-@@ -15,7 +15,7 @@
- #include "tclInt.h"
- #include <dde.h>
- #include <ddeml.h>
--#include <tchar.h>
-+/*#include <tchar.h>*/
-
- /*
- * TCL_STORAGE_CLASS is set unconditionally to DLLEXPORT because the Dde_Init
-@@ -630,7 +630,7 @@
-
- for (riPtr = tsdPtr->interpListPtr; riPtr != NULL;
- riPtr = riPtr->nextPtr) {
-- if (stricmp(utilString, riPtr->name) == 0) {
-+ if (strcmp(utilString, riPtr->name) == 0) {
- Tcl_DStringFree(&dString);
- return (HDDEDATA) TRUE;
- }
-@@ -654,7 +654,7 @@
- CP_WINANSI);
- for (riPtr = tsdPtr->interpListPtr; riPtr != NULL;
- riPtr = riPtr->nextPtr) {
-- if (stricmp(riPtr->name, utilString) == 0) {
-+ if (strcmp(riPtr->name, utilString) == 0) {
- convPtr = (Conversation *) ckalloc(sizeof(Conversation));
- convPtr->nextPtr = tsdPtr->currentConversations;
- convPtr->returnPackagePtr = NULL;
-@@ -719,7 +719,7 @@
- utilString = Tcl_DStringValue(&dString);
- DdeQueryString(ddeInstance, ddeItem, utilString, (DWORD) len + 1,
- CP_WINANSI);
-- if (stricmp(utilString, TCL_DDE_EXECUTE_RESULT) == 0) {
-+ if (strcmp(utilString, TCL_DDE_EXECUTE_RESULT) == 0) {
- returnString =
- Tcl_GetStringFromObj(convPtr->returnPackagePtr, &len);
- ddeReturn = DdeCreateDataHandle(ddeInstance, returnString,
-@@ -1500,7 +1500,7 @@
-
- for (riPtr = tsdPtr->interpListPtr; riPtr != NULL;
- riPtr = riPtr->nextPtr) {
-- if (stricmp(serviceName, riPtr->name) == 0) {
-+ if (strcmp(serviceName, riPtr->name) == 0) {
- break;
- }
- }
-diff -uNr -I '\(RCS.*\|CVS.*\|Id:.*Exp.*\|\$Date:.*\$\|\$Source:.*\$\|\$Revision:.*\$\)' tcl8.5.8/win/tclWinFile.c ds9/tcl8.5.8//win/tclWinFile.c
---- tcl8.5.8/win/tclWinFile.c 2009-03-18 18:13:45.000000000 +0100
-+++ ds9/tcl8.5.8//win/tclWinFile.c 2010-06-07 20:12:28.000000000 +0200
-@@ -1262,8 +1262,8 @@
- }
- }
-
-- } else if (!stricmp(path, "prn") || !stricmp(path, "nul")
-- || !stricmp(path, "aux")) {
-+ } else if (!strcmp(path, "prn") || !strcmp(path, "nul")
-+ || !strcmp(path, "aux")) {
- /*
- * Have match for 'prn', 'nul' or 'aux'.
- */
-@@ -1776,9 +1776,9 @@
- * Use wide-char case-insensitive comparison
- */
-
-- if ((_wcsicmp(path+len-3, L"exe") == 0)
-- || (_wcsicmp(path+len-3, L"com") == 0)
-- || (_wcsicmp(path+len-3, L"bat") == 0)) {
-+ if ((_wcscmp(path+len-3, L"exe") == 0)
-+ || (_wcscmp(path+len-3, L"com") == 0)
-+ || (_wcscmp(path+len-3, L"bat") == 0)) {
- return 1;
- }
- } else {
-@@ -1797,9 +1797,9 @@
- * executable, whereas access did not.
- */
-
-- if ((stricmp(p, "exe") == 0)
-- || (stricmp(p, "com") == 0)
-- || (stricmp(p, "bat") == 0)) {
-+ if ((strcmp(p, "exe") == 0)
-+ || (strcmp(p, "com") == 0)
-+ || (strcmp(p, "bat") == 0)) {
- /*
- * File that ends with .exe, .com, or .bat is executable.
- */
-diff -uNr -I '\(RCS.*\|CVS.*\|Id:.*Exp.*\|\$Date:.*\$\|\$Source:.*\$\|\$Revision:.*\$\)' tcl8.5.8/win/tclWinPipe.c ds9/tcl8.5.8//win/tclWinPipe.c
---- tcl8.5.8/win/tclWinPipe.c 2007-02-21 00:24:07.000000000 +0100
-+++ ds9/tcl8.5.8//win/tclWinPipe.c 2010-06-07 20:15:24.000000000 +0200
-@@ -1424,7 +1424,7 @@
- Tcl_DStringFree(&ds);
-
- ext = strrchr(fullName, '.');
-- if ((ext != NULL) && (stricmp(ext, ".bat") == 0)) {
-+ if ((ext != NULL) && (strcmp(ext, ".bat") == 0)) {
- applType = APPL_DOS;
- break;
- }
-@@ -1448,7 +1448,7 @@
- */
-
- CloseHandle(hFile);
-- if ((ext != NULL) && (stricmp(ext, ".com") == 0)) {
-+ if ((ext != NULL) && (strcmp(ext, ".com") == 0)) {
- applType = APPL_DOS;
- break;
- }
-diff -uNr -I '\(RCS.*\|CVS.*\|Id:.*Exp.*\|\$Date:.*\$\|\$Source:.*\$\|\$Revision:.*\$\)' tcl8.5.8/win/tclWinSerial.c ds9/tcl8.5.8//win/tclWinSerial.c
---- tcl8.5.8/win/tclWinSerial.c 2008-01-14 01:11:44.000000000 +0100
-+++ ds9/tcl8.5.8//win/tclWinSerial.c 2010-06-07 20:17:11.000000000 +0200
-@@ -1744,16 +1744,16 @@
- dcb.XonLim = (WORD) (infoPtr->sysBufRead*1/2);
- dcb.XoffLim = (WORD) (infoPtr->sysBufRead*1/4);
-
-- if (strnicmp(value, "NONE", vlen) == 0) {
-+ if (strncmp(value, "NONE", vlen) == 0) {
- /*
- * Leave all handshake options disabled.
- */
-- } else if (strnicmp(value, "XONXOFF", vlen) == 0) {
-+ } else if (strncmp(value, "XONXOFF", vlen) == 0) {
- dcb.fOutX = dcb.fInX = TRUE;
-- } else if (strnicmp(value, "RTSCTS", vlen) == 0) {
-+ } else if (strncmp(value, "RTSCTS", vlen) == 0) {
- dcb.fOutxCtsFlow = TRUE;
- dcb.fRtsControl = RTS_CONTROL_HANDSHAKE;
-- } else if (strnicmp(value, "DTRDSR", vlen) == 0) {
-+ } else if (strncmp(value, "DTRDSR", vlen) == 0) {
- dcb.fOutxDsrFlow = TRUE;
- dcb.fDtrControl = DTR_CONTROL_HANDSHAKE;
- } else {
-@@ -1863,7 +1863,7 @@
- result = TCL_ERROR;
- break;
- }
-- if (strnicmp(argv[i], "DTR", strlen(argv[i])) == 0) {
-+ if (strncmp(argv[i], "DTR", strlen(argv[i])) == 0) {
- if (!EscapeCommFunction(infoPtr->handle,
- (DWORD) (flag ? SETDTR : CLRDTR))) {
- if (interp != NULL) {
-@@ -1872,7 +1872,7 @@
- result = TCL_ERROR;
- break;
- }
-- } else if (strnicmp(argv[i], "RTS", strlen(argv[i])) == 0) {
-+ } else if (strncmp(argv[i], "RTS", strlen(argv[i])) == 0) {
- if (!EscapeCommFunction(infoPtr->handle,
- (DWORD) (flag ? SETRTS : CLRRTS))) {
- if (interp != NULL) {
-@@ -1881,7 +1881,7 @@
- result = TCL_ERROR;
- break;
- }
-- } else if (strnicmp(argv[i], "BREAK", strlen(argv[i])) == 0) {
-+ } else if (strncmp(argv[i], "BREAK", strlen(argv[i])) == 0) {
- if (!EscapeCommFunction(infoPtr->handle,
- (DWORD) (flag ? SETBREAK : CLRBREAK))) {
- if (interp != NULL) {
diff --git a/debian/ds9_diffs/tcllib-1.10.diff b/debian/ds9_diffs/tcllib-1.10.diff
deleted file mode 100644
index e2aa74f..0000000
--- a/debian/ds9_diffs/tcllib-1.10.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur -I '\(RCS.*\|CVS.*\|Id:.*Exp.*\|\$Date:.*\$\|\$Source:.*\$\|\$Revision:.*\$\)' tcllib-1.10/configure ds9/tcllib-1.10//configure
---- tcllib-1.10/configure 2005-01-27 19:22:56.000000000 +0100
-+++ ds9/tcllib-1.10//configure 2007-12-06 19:57:12.000000000 +0100
-@@ -556,7 +556,7 @@
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-
-- search_path=`echo ${exec_prefix}/bin:${prefix}/bin:${TCL_BIN_DIR}:${TCL_BIN_DIR}/../bin:${PATH} | sed -e 's/:/ /g'`
-+ search_path=`echo ${PATH}:${exec_prefix}/bin:${prefix}/bin:${TCL_BIN_DIR}:${TCL_BIN_DIR}/../bin | sed -e 's/:/ /g'`
- for dir in $search_path ; do
- for j in `ls -r $dir/tclsh[8-9]*${EXEEXT} 2> /dev/null` \
- `ls -r $dir/tclsh*${EXEEXT} 2> /dev/null` ; do
diff --git a/debian/ds9_diffs/tk8.5.8.diff b/debian/ds9_diffs/tk8.5.8.diff
deleted file mode 100644
index 9f5d3c4..0000000
--- a/debian/ds9_diffs/tk8.5.8.diff
+++ /dev/null
@@ -1,116 +0,0 @@
-Description: Difference between original tk8.5.8 and the version included
- in saods9. Command:
- diff -uNr -I '\(RCS.*\|CVS.*\|Id:.*Exp.*\)' tk8.5.8 ds9/tk8.5.8/
---- tk8.5.8/generic/tkArgv.c 2008-10-05 13:34:46.000000000 +0200
-+++ ds9/tk8.5.8//generic/tkArgv.c 2010-06-03 17:47:44.000000000 +0200
-@@ -21,8 +21,8 @@
- */
-
- static Tk_ArgvInfo defaultTable[] = {
-- {"-help", TK_ARGV_HELP, NULL, NULL,
-- "Print summary of command-line options and abort"},
-+ /* {"-help", TK_ARGV_HELP, NULL, NULL,
-+ "Print summary of command-line options and abort"},*/
- {NULL, TK_ARGV_END, NULL, NULL, NULL}
- };
-
---- tk8.5.8/generic/tkCanvPs.c 2009-04-10 13:07:32.000000000 +0200
-+++ ds9/tk8.5.8//generic/tkCanvPs.c 2010-06-03 17:47:45.000000000 +0200
-@@ -18,6 +18,10 @@
- #include "tkCanvas.h"
- #include "tkFont.h"
-
-+/*** waj ***/
-+float psScale =1;
-+/*** waj ***/
-+
- /*
- * See tkCanvas.h for key data structures used to implement canvases.
- */
-@@ -506,6 +510,21 @@
- Tcl_AppendResult(interp, string,
- " lineto closepath clip newpath\n", NULL);
- }
-+
-+ /*** waj ***/
-+ sprintf(string, "%g %g translate\n",
-+ (Tk_PostscriptY((double) psInfo.x, (Tk_PostscriptInfo) &psInfo) -
-+ Tk_PostscriptY((double) psInfo.x2, (Tk_PostscriptInfo) &psInfo))
-+ *(1.-psScale)/2.,
-+ (Tk_PostscriptY((double) psInfo.y, (Tk_PostscriptInfo) &psInfo) -
-+ Tk_PostscriptY((double) psInfo.y2, (Tk_PostscriptInfo) &psInfo))
-+ *(1.-psScale)/2.);
-+ Tcl_AppendResult(interp, string, (char *) NULL);
-+
-+ sprintf(string, "%.4g %.4g scale\n", psScale, psScale);
-+ Tcl_AppendResult(interp, string, (char *) NULL);
-+ /*** waj ***/
-+
- if (psInfo.chan != NULL) {
- Tcl_Write(psInfo.chan, Tcl_GetStringResult(interp), -1);
- Tcl_ResetResult(canvasPtr->interp);
---- tk8.5.8/macosx/tkMacOSXDraw.c 2008-02-27 01:12:33.000000000 +0100
-+++ ds9/tk8.5.8//macosx/tkMacOSXDraw.c 2010-06-11 20:55:56.000000000 +0200
-@@ -842,12 +842,12 @@
- void
- XDrawRectangles(
- Display *display,
-- Drawable drawable,
-+ Drawable d,
- GC gc,
- XRectangle *rectArr,
- int nRects)
- {
-- MacDrawable *macWin = (MacDrawable *) drawable;
-+ MacDrawable *macWin = (MacDrawable *) d;
- TkMacOSXDrawingContext dc;
- XRectangle * rectPtr;
- int i, lw = gc->line_width;
---- tk8.5.8/unix/configure 2009-11-13 19:38:48.000000000 +0100
-+++ ds9/tk8.5.8//unix/configure 2010-06-11 20:41:28.000000000 +0200
-@@ -6175,6 +6175,7 @@
-
- cat >>confdefs.h <<\_ACEOF
- #define MAC_OSX_TCL 1
-+#define TK_MACOSXDRAW_UNUSED 1
- _ACEOF
-
- PLAT_OBJS='${MAC_OSX_OBJS}'
---- tk8.5.8/win/configure 2009-11-13 19:38:48.000000000 +0100
-+++ ds9/tk8.5.8//win/configure 2010-06-07 22:15:56.000000000 +0200
-@@ -2982,15 +2982,15 @@
- fi
- echo "$as_me:$LINENO: result: $ac_cv_cygwin" >&5
- echo "${ECHO_T}$ac_cv_cygwin" >&6
--if test "$ac_cv_cygwin" = "yes" ; then
-- { { echo "$as_me:$LINENO: error: Compiling under Cygwin is not currently supported.
--A maintainer for the Cygwin port of Tcl/Tk is needed. See the README
--file for information about building with Mingw." >&5
--echo "$as_me: error: Compiling under Cygwin is not currently supported.
--A maintainer for the Cygwin port of Tcl/Tk is needed. See the README
--file for information about building with Mingw." >&2;}
-- { (exit 1); exit 1; }; }
--fi
-+#if test "$ac_cv_cygwin" = "yes" ; then
-+# { { echo "$as_me:$LINENO: error: Compiling under Cygwin is not currently supported.
-+#A maintainer for the Cygwin port of Tcl/Tk is needed. See the README
-+#file for information about building with Mingw." >&5
-+#echo "$as_me: error: Compiling under Cygwin is not currently supported.
-+#A maintainer for the Cygwin port of Tcl/Tk is needed. See the README
-+#file for information about building with Mingw." >&2;}
-+# { (exit 1); exit 1; }; }
-+#fi
-
- #--------------------------------------------------------------------
- # Determines the correct binary file extension (.o, .obj, .exe etc.)
---- tk8.5.8/win/tkWinPort.h 2005-09-28 20:31:57.000000000 +0200
-+++ ds9/tk8.5.8//win/tkWinPort.h 2010-06-07 22:18:39.000000000 +0200
-@@ -123,7 +123,7 @@
- * Define timezone for gettimeofday.
- */
-
--struct timezone {
-+struct timezonee {
- int tz_minuteswest;
- int tz_dsttime;
- };
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/saods9.git
More information about the Debian-astro-commits
mailing list