[med-svn] r15140 - trunk/packages/ctn/trunk/debian/patches
Andreas Tille
tille at alioth.debian.org
Thu Nov 7 14:14:29 UTC 2013
Author: tille
Date: 2013-11-07 14:14:28 +0000 (Thu, 07 Nov 2013)
New Revision: 15140
Modified:
trunk/packages/ctn/trunk/debian/patches/10_all_patches.patch
trunk/packages/ctn/trunk/debian/patches/11_csh-to-bash.patch
trunk/packages/ctn/trunk/debian/patches/20_mysql_4.2.patch
Log:
DEP3
Modified: trunk/packages/ctn/trunk/debian/patches/10_all_patches.patch
===================================================================
--- trunk/packages/ctn/trunk/debian/patches/10_all_patches.patch 2013-11-07 14:11:38 UTC (rev 15139)
+++ trunk/packages/ctn/trunk/debian/patches/10_all_patches.patch 2013-11-07 14:14:28 UTC (rev 15140)
@@ -1,11 +1,11 @@
-Misc patches inherited from the monolithic .diff.gz. This includes:
-- changes to the bison parser;
-- detection of intsizes by Steinar Gundersson
-- various changes to make it build or work with Debian
-could be split out into separate patches.
+Description: Misc patches inherited from the monolithic .diff.gz. This includes:
+ - changes to the bison parser;
+ - detection of intsizes by Steinar Gundersson
+ - various changes to make it build or work with Debian
+ could be split out into separate patches.
---- ctn-3.0.6.orig/apps/dcm_modify_object/gram.h
-+++ ctn-3.0.6/apps/dcm_modify_object/gram.h
+--- a/apps/dcm_modify_object/gram.h
++++ b/apps/dcm_modify_object/gram.h
@@ -1,22 +1,73 @@
-#ifndef BISON_Y_TAB_H
-# define BISON_Y_TAB_H
@@ -90,9 +90,9 @@
extern YYSTYPE yylval;
-#endif /* not BISON_Y_TAB_H */
---- ctn-3.0.6.orig/facilities/objects/dcmprivate.h
-+++ ctn-3.0.6/facilities/objects/dcmprivate.h
-@@ -117,11 +117,7 @@
+--- a/facilities/objects/dcmprivate.h
++++ b/facilities/objects/dcmprivate.h
+@@ -117,11 +117,7 @@ typedef union {
} SHORT_WORD;
typedef union {
@@ -104,9 +104,9 @@
unsigned char u[4];
} LONG_WORD;
---- ctn-3.0.6.orig/facilities/utility/utility.c
-+++ ctn-3.0.6/facilities/utility/utility.c
-@@ -912,7 +912,9 @@
+--- a/facilities/utility/utility.c
++++ b/facilities/utility/utility.c
+@@ -912,7 +912,9 @@ CONDITION UTL_SetConfigFile(const char*
if (configFile == 0 || configFile[0] == '\0') {
char* p = getenv("CTN_TARGET");
if (p == NULL) {
@@ -117,9 +117,9 @@
}
UTL_configFile = (char*) malloc(strlen(p) + strlen("/runtime/ctn_cfg.txt") + 1);
strcpy(UTL_configFile, p);
---- ctn-3.0.6.orig/facilities/xutl/xutl.c
-+++ ctn-3.0.6/facilities/xutl/xutl.c
-@@ -31,7 +31,9 @@
+--- a/facilities/xutl/xutl.c
++++ b/facilities/xutl/xutl.c
+@@ -31,7 +31,9 @@ findRuntime(XUTL_STRUCT* s)
c = getenv("CTN_TARGET");
if (c == NULL)
@@ -130,8 +130,8 @@
sprintf(s->runtime, "%s/runtime/fontmap", c);
}
---- ctn-3.0.6.orig/facilities/dicom/dicom.h
-+++ ctn-3.0.6/facilities/dicom/dicom.h
+--- a/facilities/dicom/dicom.h
++++ b/facilities/dicom/dicom.h
@@ -57,6 +57,8 @@
#ifdef _MSC_VER
@@ -141,7 +141,7 @@
#endif
#ifdef __cplusplus
-@@ -85,14 +87,13 @@
+@@ -85,14 +87,13 @@ extern "C" {
typedef unsigned short U16; /* unsigned, 16 bit */
typedef short S16; /* signed, 16 bit */
@@ -157,9 +157,9 @@
#else /* Something we do not support */
/* The writers of this code assume that we can find a 32 bit integer
---- ctn-3.0.6.orig/facilities/dicom/Makefile
-+++ ctn-3.0.6/facilities/dicom/Makefile
-@@ -8,6 +8,7 @@
+--- a/facilities/dicom/Makefile
++++ b/facilities/dicom/Makefile
+@@ -8,6 +8,7 @@ library:
install:
$(INSTALLINCLUDE) ctn_os.h $(DICOM_INCLUDE)
$(INSTALLINCLUDE) dicom.h $(DICOM_INCLUDE)
@@ -167,7 +167,7 @@
$(INSTALLINCLUDE) dicom_platform.h $(DICOM_INCLUDE)
export:
-@@ -19,9 +20,10 @@
+@@ -19,9 +20,10 @@ headerexport:
$(INSTALLINCLUDE) dicom_platform.h $(DICOM_INCLUDE)
links:
rm -f $(DICOM_LIBSRC)/dicom.h $(DICOM_LIBSRC)/dicom_platform.h $(DICOM_LIBSRC)/ctn_os.h
@@ -181,9 +181,9 @@
clean:
rm -f *.a *.o *.BAK *% core
---- ctn-3.0.6/libsrc/Makefile 2002-04-17 19:22:22.000000000 +0200
-+++ ctn-3.0.6/libsrc/Makefile 2008-07-25 17:10:01.000000000 +0200
-@@ -25,7 +25,7 @@
+--- a/libsrc/Makefile
++++ b/libsrc/Makefile
+@@ -25,7 +25,7 @@ BASE_OBJS = \
OBJS = $(BASE_OBJS) $(TBL_DB) tblcond.o idb.o idbcond.o
OBJS_MBCTN = $(BASE_OBJS) dicom_chr.o $(TBLMB_DB) tblmbcond.o idbmb.o idbmbcond.o xutl_mb.o
@@ -192,7 +192,7 @@
dicom_ddr.h dicom_ie.h dicom_irs.h dicom_messages.h \
dicom_objects.h dicom_platform.h dicom_print.h dicom_services.h \
dicom_sq.h dicom_uids.h dulfsm.h dulprotocol.h dulsnoop.h \
-@@ -34,8 +34,9 @@
+@@ -34,8 +34,9 @@ icon.h idb.h lst.h manage.h mut.h snp.h
tbl_msql.h tbl_psql.h tbl_sqlserver.h tbl_sybase.h tbl_ufs.h \
utility.h xutl.h
@@ -204,9 +204,9 @@
HEADER_FILES_MBCTN = $(BASE_HEADER_FILES) dicom_chr.h idbmb.h tblmb.h tblmb_psql.h
---- ctn-3.0.6/libsrc/Makefile.psql 2002-04-17 19:22:22.000000000 +0200
-+++ ctn-3.0.6/libsrc/Makefile.psql 2008-07-25 17:10:01.000000000 +0200
-@@ -24,7 +24,7 @@
+--- a/libsrc/Makefile.psql
++++ b/libsrc/Makefile.psql
+@@ -24,7 +24,7 @@ BASE_OBJS = \
OBJS = $(BASE_OBJS) tbl_psql.o tblcond.o idb.o idbcond.o
OBJS_MBCTN = $(BASE_OBJS) dicom_chr.o tblmb_psql.o tblmbcond.o idbmb.o idbmbcond.o xutl_mb.o
Modified: trunk/packages/ctn/trunk/debian/patches/11_csh-to-bash.patch
===================================================================
--- trunk/packages/ctn/trunk/debian/patches/11_csh-to-bash.patch 2013-11-07 14:11:38 UTC (rev 15139)
+++ trunk/packages/ctn/trunk/debian/patches/11_csh-to-bash.patch 2013-11-07 14:14:28 UTC (rev 15140)
@@ -1,7 +1,8 @@
-Change csh scripts to bash scripts, by Kevin M. Rosenberg
+Author: Kevin M. Rosenberg
+Description: Change csh scripts to bash scripts
---- ctn-3.0.6.orig/cfg_scripts/mysql/PrintTables
-+++ ctn-3.0.6/cfg_scripts/mysql/PrintTables
+--- a/cfg_scripts/mysql/PrintTables
++++ b/cfg_scripts/mysql/PrintTables
@@ -1,11 +1,12 @@
-#!/bin/csh
+#!/bin/bash
@@ -19,8 +20,8 @@
+fi
+
+mysql -uctn -pctn $2 < Print${1}Tables.script
---- ctn-3.0.6.orig/cfg_scripts/mysql/ListTables
-+++ ctn-3.0.6/cfg_scripts/mysql/ListTables
+--- a/cfg_scripts/mysql/ListTables
++++ b/cfg_scripts/mysql/ListTables
@@ -1,16 +1,16 @@
-#!/bin/csh
+#!/bin/bash
@@ -42,7 +43,7 @@
mysqlshow -pctn -uctn $2 ApplicationEntity
mysqlshow -pctn -uctn $2 GroupNames
mysqlshow -pctn -uctn $2 StorageAccess
-@@ -19,15 +19,15 @@
+@@ -19,15 +19,15 @@ mysqlshow -pctn -uctn $2 InstanceTable
mysqlshow -pctn -uctn $2 FISAccess
mysqlshow -pctn -uctn $2 PrintServerCFG
mysqlshow -pctn -uctn $2 VideoImageDest
@@ -61,8 +62,8 @@
mysqlshow -pctn -uctn $2 InstanceTable
-endif
+fi
---- ctn-3.0.6.orig/cfg_scripts/mysql/ClearTables
-+++ ctn-3.0.6/cfg_scripts/mysql/ClearTables
+--- a/cfg_scripts/mysql/ClearTables
++++ b/cfg_scripts/mysql/ClearTables
@@ -1,11 +1,12 @@
-#!/bin/csh
+#!/bin/bash
@@ -80,8 +81,8 @@
+fi
+
+mysql $2 < Clear${1}Tables.script
---- ctn-3.0.6.orig/cfg_scripts/mysql/FillTables
-+++ ctn-3.0.6/cfg_scripts/mysql/FillTables
+--- a/cfg_scripts/mysql/FillTables
++++ b/cfg_scripts/mysql/FillTables
@@ -1,15 +1,17 @@
-#!/bin/csh
+#!/bin/bash
@@ -106,8 +107,8 @@
exit 1
-endif
+fi
---- ctn-3.0.6.orig/cfg_scripts/mysql/CreateTables
-+++ ctn-3.0.6/cfg_scripts/mysql/CreateTables
+--- a/cfg_scripts/mysql/CreateTables
++++ b/cfg_scripts/mysql/CreateTables
@@ -1,11 +1,12 @@
-#!/bin/csh
+#!/bin/bash
@@ -125,8 +126,8 @@
+fi
+
+mysql -uctn -pctn $2 < Create${1}Tables.script
---- ctn-3.0.6.orig/cfg_scripts/mysql/DropTables
-+++ ctn-3.0.6/cfg_scripts/mysql/DropTables
+--- a/cfg_scripts/mysql/DropTables
++++ b/cfg_scripts/mysql/DropTables
@@ -1,15 +1,16 @@
-#!/bin/csh
+#!/bin/bash
@@ -150,8 +151,8 @@
exit 1
-endif
+fi
---- ctn-3.0.6.orig/cfg_scripts/mysql/DropDB
-+++ ctn-3.0.6/cfg_scripts/mysql/DropDB
+--- a/cfg_scripts/mysql/DropDB
++++ b/cfg_scripts/mysql/DropDB
@@ -1,15 +1,16 @@
-#!/bin/csh
+#!/bin/bash
@@ -174,8 +175,8 @@
exit 1
-endif
+fi
---- ctn-3.0.6.orig/cfg_scripts/mysql/CreateDB
-+++ ctn-3.0.6/cfg_scripts/mysql/CreateDB
+--- a/cfg_scripts/mysql/CreateDB
++++ b/cfg_scripts/mysql/CreateDB
@@ -1,15 +1,16 @@
-#!/bin/csh
+#!/bin/bash
Modified: trunk/packages/ctn/trunk/debian/patches/20_mysql_4.2.patch
===================================================================
--- trunk/packages/ctn/trunk/debian/patches/20_mysql_4.2.patch 2013-11-07 14:11:38 UTC (rev 15139)
+++ trunk/packages/ctn/trunk/debian/patches/20_mysql_4.2.patch 2013-11-07 14:14:28 UTC (rev 15140)
@@ -1,11 +1,10 @@
-# This patch was provided by Pablo Sau <psau at cadpet.es>
-# on Wed, 28 May 2008 19:38:32 +0200
-# to make the ctn working properly with the mysql server > 4.2.
-# Thanks to Pablo ...
+Author: Pablo Sau <psau at cadpet.es>
+LastChanged: Wed, 28 May 2008 19:38:32 +0200
+Description: make the ctn working properly with the mysql server > 4.2.
---- ctn-3.0.6.orig/cfg_scripts/mysql/CreateDIMTables.script
-+++ ctn-3.0.6/cfg_scripts/mysql/CreateDIMTables.script
-@@ -49,7 +49,7 @@
+--- a/cfg_scripts/mysql/CreateDIMTables.script
++++ b/cfg_scripts/mysql/CreateDIMTables.script
+@@ -49,7 +49,7 @@ ALTER TABLE StudyLevel ADD INDEX SL_PatP
\g
CREATE TABLE SeriesLevel
(
@@ -14,9 +13,9 @@
SerNum char(12) not null,
SerInsUID char(64) not null,
ProNam char(64),
---- ctn-3.0.6.orig/cfg_scripts/mysql/CreateFISTables.script
-+++ ctn-3.0.6/cfg_scripts/mysql/CreateFISTables.script
-@@ -62,7 +62,7 @@
+--- a/cfg_scripts/mysql/CreateFISTables.script
++++ b/cfg_scripts/mysql/CreateFISTables.script
+@@ -62,7 +62,7 @@ ALTER TABLE InterpretationTable ADD UNIQ
CREATE TABLE StudyCmpTable (
StuComUID char(64) not null,
StuInsUID char(64) not null,
@@ -25,9 +24,9 @@
ProCodVal char(16),
ProCodSchDes char(16),
ProCodMea char(64),
---- ctn-3.0.6.orig/cfg_scripts/mysql/FillDIMTables.script
-+++ ctn-3.0.6/cfg_scripts/mysql/FillDIMTables.script
-@@ -140,7 +140,7 @@
+--- a/cfg_scripts/mysql/FillDIMTables.script
++++ b/cfg_scripts/mysql/FillDIMTables.script
+@@ -140,7 +140,7 @@ INSERT INTO StudyLevel(
'P0001')
\g
INSERT INTO SeriesLevel(
@@ -36,7 +35,7 @@
SerNum,
SerInsUID,
ProNam,
-@@ -169,7 +169,7 @@
+@@ -169,7 +169,7 @@ INSERT INTO SeriesLevel(
'STUDY1.1')
\g
INSERT INTO SeriesLevel(
@@ -45,7 +44,7 @@
SerNum,
SerInsUID,
ProNam,
-@@ -198,7 +198,7 @@
+@@ -198,7 +198,7 @@ INSERT INTO SeriesLevel(
'STUDY1.2')
\g
INSERT INTO SeriesLevel(
@@ -54,9 +53,9 @@
SerNum,
SerInsUID,
ProNam,
---- ctn-3.0.6.orig/facilities/idb/idb.c
-+++ ctn-3.0.6/facilities/idb/idb.c
-@@ -319,7 +319,7 @@
+--- a/facilities/idb/idb.c
++++ b/facilities/idb/idb.c
+@@ -319,7 +319,7 @@ static TBL_FIELD
static TBL_FIELD
GS_SERSEL_Field[] =
{
@@ -65,7 +64,7 @@
"SerNum", TBL_STRING, DICOM_IS_LENGTH + 1, DICOM_IS_LENGTH + 1, 0, GS_SERSEL_SerNum,
"SerInsUID", TBL_STRING, DICOM_UI_LENGTH + 1, DICOM_UI_LENGTH + 1, 0, GS_SERSEL_SerInsUID,
"ProNam", TBL_STRING, DICOM_LO_LENGTH + 1, DICOM_LO_LENGTH + 1, 0, GS_SERSEL_ProNam,
-@@ -3541,7 +3541,7 @@
+@@ -3541,7 +3541,7 @@ CBSel_CollectSeries(TBL_FIELD * fp, int
i = GS_NumSerNodes - 1;
GS_NullSerFlag[i] = 0;
while (fp->FieldName != 0) {
@@ -74,7 +73,7 @@
if (fp->Value.IsNull)
GS_NullSerFlag[i] |= QF_SER_Mod;
else
-@@ -4682,7 +4682,7 @@
+@@ -4682,7 +4682,7 @@ IDB_ConvertDicomQuerytoSQL(IDB_Query * p
return (0);
}
op = likeOrEqualOperator(pssi->series.Mod);
@@ -83,7 +82,7 @@
i++;
}
}
-@@ -5433,7 +5433,7 @@
+@@ -5433,7 +5433,7 @@ IDB_InsertImage(IDB_HANDLE ** handle, ID
} else { /* Need Series Insertion */
i = 0;
More information about the debian-med-commit
mailing list