[med-svn] r2306 - in trunk/packages/ctn/trunk/debian: . patches
thijs at alioth.debian.org
thijs at alioth.debian.org
Fri Jul 25 14:54:28 UTC 2008
Author: thijs
Date: 2008-07-25 14:54:27 +0000 (Fri, 25 Jul 2008)
New Revision: 2306
Added:
trunk/packages/ctn/trunk/debian/patches/10_all_patches.patch
Removed:
trunk/packages/ctn/trunk/debian/patches/00_previous_patches_for_debian.patch
trunk/packages/ctn/trunk/debian/patches/10_mysql_4.2.patch
Modified:
trunk/packages/ctn/trunk/debian/changelog
trunk/packages/ctn/trunk/debian/control
trunk/packages/ctn/trunk/debian/patches/series
trunk/packages/ctn/trunk/debian/rules
Log:
work on the ctn patching a bit:
- add the necessary quilt magic to actually apply them;
- the 10_mysql_4.2 patch also contained the previous Debian
patches. For now, rename that one to be the one monolithic
patch so it can at least be applied. We may want to split
out the individual parts later.
build doesn't entirely work yet, but at least the patches apply.
Modified: trunk/packages/ctn/trunk/debian/changelog
===================================================================
--- trunk/packages/ctn/trunk/debian/changelog 2008-07-24 16:02:10 UTC (rev 2305)
+++ trunk/packages/ctn/trunk/debian/changelog 2008-07-25 14:54:27 UTC (rev 2306)
@@ -17,8 +17,11 @@
[ Thijs Kinkhorst ]
* Drop empty prerm/postinst scripts.
* Replace obsolete x-dev with x11-proto-core-dev
+ * Use quilt to manage patches, add proper dependencies and
+ targets in debian/rules. All patches are still in one file,
+ which needs to be split out over time.
- -- Thijs Kinkhorst <thijs at debian.org> Thu, 24 Jul 2008 18:01:54 +0200
+ -- Thijs Kinkhorst <thijs at debian.org> Fri, 25 Jul 2008 16:52:01 +0200
ctn (3.0.6-12) unstable; urgency=low
Modified: trunk/packages/ctn/trunk/debian/control
===================================================================
--- trunk/packages/ctn/trunk/debian/control 2008-07-24 16:02:10 UTC (rev 2305)
+++ trunk/packages/ctn/trunk/debian/control 2008-07-25 14:54:27 UTC (rev 2306)
@@ -5,7 +5,9 @@
DM-Upload-Allowed: yes
Uploaders: Andreas Tille <tille at debian.org>,
Thijs Kinkhorst <thijs at debian.org>
-Build-Depends: debhelper (>= 5), lesstif2-dev, libxaw7-dev, flex, bison, zlib1g-dev, libmysqlclient15-dev, libx11-dev, libxt-dev, x11proto-core-dev, csh | c-shell
+Build-Depends: debhelper (>= 5), lesstif2-dev, libxaw7-dev, flex, bison,
+ zlib1g-dev, libmysqlclient15-dev, libx11-dev, libxt-dev, x11proto-core-dev,
+ csh | c-shell, quilt
Standards-Version: 3.7.3
Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/ctn/trunk/?rev=0&sc=0
Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/ctn/trunk/
Deleted: trunk/packages/ctn/trunk/debian/patches/00_previous_patches_for_debian.patch
===================================================================
--- trunk/packages/ctn/trunk/debian/patches/00_previous_patches_for_debian.patch 2008-07-24 16:02:10 UTC (rev 2305)
+++ trunk/packages/ctn/trunk/debian/patches/00_previous_patches_for_debian.patch 2008-07-25 14:54:27 UTC (rev 2306)
@@ -1,506 +0,0 @@
-# This is a conglomerate patch of all changes to upstream
-# that were done by Debian maintainers up to version
-# 3.0.6-12 of the ctn package
-#
-# It would be better to split this up into several patches
-# for better overview - but this is left for later work on
-# this package when it is time for polishing
-
---- ctn-3.0.6.orig/apps/dcm_modify_object/gram.h
-+++ ctn-3.0.6/apps/dcm_modify_object/gram.h
-@@ -1,22 +1,73 @@
--#ifndef BISON_Y_TAB_H
--# define BISON_Y_TAB_H
-+/* A Bison parser, made by GNU Bison 2.3. */
-
--#ifndef YYSTYPE
--typedef union{
-+/* Skeleton interface for Bison's Yacc-like parsers in C
-+
-+ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-+ Free Software Foundation, Inc.
-+
-+ This program is free software; you can redistribute it and/or modify
-+ it under the terms of the GNU General Public License as published by
-+ the Free Software Foundation; either version 2, or (at your option)
-+ any later version.
-+
-+ This program is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ GNU General Public License for more details.
-+
-+ You should have received a copy of the GNU General Public License
-+ along with this program; if not, write to the Free Software
-+ Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+ Boston, MA 02110-1301, USA. */
-+
-+/* As a special exception, you may create a larger work that contains
-+ part or all of the Bison parser skeleton and distribute that work
-+ under terms of your choice, so long as that work isn't itself a
-+ parser generator using the skeleton or a modified version thereof
-+ as a parser skeleton. Alternatively, if you modify or redistribute
-+ the parser skeleton itself, you may (at your option) remove this
-+ special exception, which will cause the skeleton and the resulting
-+ Bison output files to be licensed under the GNU General Public
-+ License without this special exception.
-+
-+ This special exception was added by the Free Software Foundation in
-+ version 2.2 of Bison. */
-+
-+/* Tokens. */
-+#ifndef YYTOKENTYPE
-+# define YYTOKENTYPE
-+ /* Put the tokens into the symbol table, so that GDB and other debuggers
-+ know about them. */
-+ enum yytokentype {
-+ NUMBER = 258,
-+ VALUE = 259
-+ };
-+#endif
-+/* Tokens. */
-+#define NUMBER 258
-+#define VALUE 259
-+
-+
-+
-+
-+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-+typedef union YYSTYPE
-+#line 25 "gram.y"
-+{
- unsigned long num;
- char str[DICOM_LO_LENGTH+1];
- char *s;
- DCM_ELEMENT *e;
- LST_HEAD *l;
- void *v;
--} yystype;
--# define YYSTYPE yystype
-+}
-+/* Line 1489 of yacc.c. */
-+#line 66 "y.tab.h"
-+ YYSTYPE;
-+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-+# define YYSTYPE_IS_DECLARED 1
- # define YYSTYPE_IS_TRIVIAL 1
- #endif
--# define NUMBER 257
--# define VALUE 258
--
-
- extern YYSTYPE yylval;
-
--#endif /* not BISON_Y_TAB_H */
---- ctn-3.0.6.orig/facilities/dicom/Makefile
-+++ ctn-3.0.6/facilities/dicom/Makefile
-@@ -8,6 +8,7 @@
- install:
- $(INSTALLINCLUDE) ctn_os.h $(DICOM_INCLUDE)
- $(INSTALLINCLUDE) dicom.h $(DICOM_INCLUDE)
-+ $(INSTALLINCLUDE) intsizes.h $(DICOM_INCLUDE)
- $(INSTALLINCLUDE) dicom_platform.h $(DICOM_INCLUDE)
-
- export:
-@@ -19,9 +20,10 @@
- $(INSTALLINCLUDE) dicom_platform.h $(DICOM_INCLUDE)
- links:
- rm -f $(DICOM_LIBSRC)/dicom.h $(DICOM_LIBSRC)/dicom_platform.h $(DICOM_LIBSRC)/ctn_os.h
-- ln -s ../facilities/dicom/ctn_os.h $(DICOM_LIBSRC)
-- ln -s ../facilities/dicom/dicom.h $(DICOM_LIBSRC)
-- ln -s ../facilities/dicom/dicom_platform.h $(DICOM_LIBSRC)
-+ ln -sf ../facilities/dicom/ctn_os.h $(DICOM_LIBSRC)
-+ ln -sf ../facilities/dicom/dicom.h $(DICOM_LIBSRC)
-+ ln -sf ../facilities/dicom/intsizes.h $(DICOM_LIBSRC)
-+ ln -sf ../facilities/dicom/dicom_platform.h $(DICOM_LIBSRC)
-
- clean:
- rm -f *.a *.o *.BAK *% core
---- ctn-3.0.6.orig/facilities/dicom/dicom.h
-+++ ctn-3.0.6/facilities/dicom/dicom.h
-@@ -57,6 +57,8 @@
-
- #ifdef _MSC_VER
- #include "dicom_platform.h"
-+#else
-+#include "intsizes.h"
- #endif
-
- #ifdef __cplusplus
-@@ -85,14 +87,13 @@
- typedef unsigned short U16; /* unsigned, 16 bit */
- typedef short S16; /* signed, 16 bit */
-
--#if LONGSIZE == 64 && INTSIZE == 32 /* Such as an Alpha */
-+#if LONGSIZE == 64 && INTSIZE == 32 /* Such as an Alpha */
- typedef unsigned int U32;
- typedef int S32;
-
- #elif LONGSIZE == 32 /* Most 32 bit workstations */
- typedef unsigned long U32;
- typedef long S32;
--
- #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/utility/utility.c
-+++ ctn-3.0.6/facilities/utility/utility.c
-@@ -912,7 +912,9 @@
- if (configFile == 0 || configFile[0] == '\0') {
- char* p = getenv("CTN_TARGET");
- if (p == NULL) {
-- return UTL_NO_CTN_TARGET;
-+ /* Debian patch: Can not make operation dependent on Env var */
-+ /* return UTL_NO_CTN_TARGET; */
-+ p = "/etc/ctn";
- }
- 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 @@
-
- c = getenv("CTN_TARGET");
- if (c == NULL)
-- c = "/opt/ctn";
-+ /* Debian patch: conform to debian directory policy */
-+ /* c = "/opt/ctn"; */
-+ c = "/etc/ctn";
-
- sprintf(s->runtime, "%s/runtime/fontmap", c);
- }
---- ctn-3.0.6.orig/facilities/objects/dcmprivate.h
-+++ ctn-3.0.6/facilities/objects/dcmprivate.h
-@@ -117,11 +117,7 @@
- } SHORT_WORD;
-
- typedef union {
--#ifdef __alpha
- unsigned int l;
--#else
-- unsigned long l;
--#endif
- unsigned char u[4];
- } LONG_WORD;
-
---- ctn-3.0.6.orig/facilities/idb/idb.c
-+++ ctn-3.0.6/facilities/idb/idb.c
-@@ -319,7 +319,7 @@
- static TBL_FIELD
- GS_SERSEL_Field[] =
- {
-- "Mod", TBL_STRING, DICOM_CS_LENGTH + 1, DICOM_CS_LENGTH + 1, 0, GS_SERSEL_Mod,
-+ "Modality", TBL_STRING, DICOM_CS_LENGTH + 1, DICOM_CS_LENGTH + 1, 0, GS_SERSEL_Mod,
- "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 @@
- i = GS_NumSerNodes - 1;
- GS_NullSerFlag[i] = 0;
- while (fp->FieldName != 0) {
-- if (strcmp(fp->FieldName, "Mod") == 0) {
-+ if (strcmp(fp->FieldName, "Modality") == 0) {
- if (fp->Value.IsNull)
- GS_NullSerFlag[i] |= QF_SER_Mod;
- else
-@@ -4682,7 +4682,7 @@
- return (0);
- }
- op = likeOrEqualOperator(pssi->series.Mod);
-- TBL_CRITERIA_LOAD_BYTE(GS_sercl[i], "Mod", cs, TBL_STRING, op);
-+ TBL_CRITERIA_LOAD_BYTE(GS_sercl[i], "Modality", cs, TBL_STRING, op);
- i++;
- }
- }
-@@ -5433,7 +5433,7 @@
- } else { /* Need Series Insertion */
-
- i = 0;
-- TBL_FIELD_LOAD_BYTE(serfld[i], "Mod", pssi->series.Mod, TBL_STRING);
-+ TBL_FIELD_LOAD_BYTE(serfld[i], "Modality", pssi->series.Mod, TBL_STRING);
- i++;
- TBL_FIELD_LOAD_BYTE(serfld[i], "SerNum", pssi->series.SerNum, TBL_STRING);
- i++;
---- ctn-3.0.6.orig/cfg_scripts/mysql/PrintTables
-+++ ctn-3.0.6/cfg_scripts/mysql/PrintTables
-@@ -1,11 +1,12 @@
--#!/bin/csh
-+#!/bin/bash
- #
- # PrintTables
- #
--if ($1 == "" || $2 == "" ) then
-+if [ -z $1 -o -z $2 ]; then
- echo " "
- echo Usage: "$0 <DIM|Control|FIS> <Database Name>"
- echo " "
- exit
--endif
--mysql -uctn -pctn $2 < Print$1Tables.script
-+fi
-+
-+mysql -uctn -pctn $2 < Print${1}Tables.script
---- ctn-3.0.6.orig/cfg_scripts/mysql/CreateTables
-+++ ctn-3.0.6/cfg_scripts/mysql/CreateTables
-@@ -1,11 +1,12 @@
--#!/bin/csh
-+#!/bin/bash
- #
- # CreateTables
- #
--if ($1 == "" || $2 == "" ) then
-+if [ -z $1 -o -z $2 ]; then
- echo " "
- echo Usage: "$0 <DIM|Control|TBLTest|FIS> <Database Name>"
- echo " "
- exit
--endif
--mysql -uctn -pctn $2 < Create$1Tables.script
-+fi
-+
-+mysql -uctn -pctn $2 < Create${1}Tables.script
---- ctn-3.0.6.orig/cfg_scripts/mysql/CreateDB
-+++ ctn-3.0.6/cfg_scripts/mysql/CreateDB
-@@ -1,15 +1,16 @@
--#!/bin/csh
-+#!/bin/bash
- #
- # CreateDB
- #
--if ($1 == "") then
-+if [ -z "$1" ]; then
- echo " "
- echo Usage: "$0 <DB Name>"
- echo " "
- exit
--endif
-+fi
-+
- mysqladmin -uctn -pctn create $1
--if ($status != 0) then
-+if [ $? != 0 ]; then
- echo Could not create database: $1
- exit 1
--endif
-+fi
---- ctn-3.0.6.orig/cfg_scripts/mysql/CreateDIMTables.script
-+++ ctn-3.0.6/cfg_scripts/mysql/CreateDIMTables.script
-@@ -49,7 +49,7 @@
- \g
- CREATE TABLE SeriesLevel
- (
-- Mod char(16) not null,
-+ Modality char(16) not null,
- SerNum char(12) not null,
- SerInsUID char(64) not null,
- ProNam char(64),
---- ctn-3.0.6.orig/cfg_scripts/mysql/DropDB
-+++ ctn-3.0.6/cfg_scripts/mysql/DropDB
-@@ -1,15 +1,16 @@
--#!/bin/csh
-+#!/bin/bash
- #
- # DropDB
- #
--if ($1 == "") then
-+if [ -z $1 ]; then
- echo " "
- echo Usage: "$0 <Database Name>"
- echo " "
- exit
--endif
-+fi
-+
- mysqladmin -uctn -pctn drop $1
--if ($status != 0) then
-+if [ $? != 0 ]; then
- echo Could not drop database: $1
- exit 1
--endif
-+fi
---- ctn-3.0.6.orig/cfg_scripts/mysql/FillTables
-+++ ctn-3.0.6/cfg_scripts/mysql/FillTables
-@@ -1,15 +1,17 @@
--#!/bin/csh
-+#!/bin/bash
- #
- # FillTables
- #
--if ($1 == "" || $2 == "" ) then
-+if [ -z $1 -o $2 ]; then
- echo " "
- echo Usage: "$0 <DIM> <Database Name>"
- echo " "
- exit
--endif
--mysql -uctn -pctn $2 < Fill$1Tables.script
--if ($status != 0) then
-+fi
-+
-+mysql -uctn -pctn $2 < Fill${1}Tables.script
-+
-+if [ $? != 0 ]; then
- echo Could not drop database: $1
- exit 1
--endif
-+fi
---- ctn-3.0.6.orig/cfg_scripts/mysql/FillDIMTables.script
-+++ ctn-3.0.6/cfg_scripts/mysql/FillDIMTables.script
-@@ -140,7 +140,7 @@
- 'P0001')
- \g
- INSERT INTO SeriesLevel(
-- Mod,
-+ Modality,
- SerNum,
- SerInsUID,
- ProNam,
-@@ -169,7 +169,7 @@
- 'STUDY1.1')
- \g
- INSERT INTO SeriesLevel(
-- Mod,
-+ Modality,
- SerNum,
- SerInsUID,
- ProNam,
-@@ -198,7 +198,7 @@
- 'STUDY1.2')
- \g
- INSERT INTO SeriesLevel(
-- Mod,
-+ Modality,
- SerNum,
- SerInsUID,
- ProNam,
---- ctn-3.0.6.orig/cfg_scripts/mysql/ClearTables
-+++ ctn-3.0.6/cfg_scripts/mysql/ClearTables
-@@ -1,11 +1,12 @@
--#!/bin/csh
-+#!/bin/bash
- #
- # ClearTables
- #
--if ( $1 == "" || $2 == "" ) then
-+if [ -z $1 -o -z $2 ]; then
- echo " "
- echo Usage: "$0 <DIM|Control|TBLTest|FIS> <Database Name>"
- echo " "
- exit
--endif
--mysql $2 < Clear$1Tables.script
-+fi
-+
-+mysql $2 < Clear${1}Tables.script
---- ctn-3.0.6.orig/cfg_scripts/mysql/CreateFISTables.script
-+++ ctn-3.0.6/cfg_scripts/mysql/CreateFISTables.script
-@@ -62,7 +62,7 @@
- CREATE TABLE StudyCmpTable (
- StuComUID char(64) not null,
- StuInsUID char(64) not null,
-- Mod char(16) not null,
-+ Modality char(16) not null,
- ProCodVal char(16),
- ProCodSchDes char(16),
- ProCodMea char(64),
---- ctn-3.0.6.orig/cfg_scripts/mysql/ListTables
-+++ ctn-3.0.6/cfg_scripts/mysql/ListTables
-@@ -1,16 +1,16 @@
--#!/bin/csh
-+#!/bin/bash
- #
- # ListTables
- #
--if ($1 == "" || $2 == "" ) then
-+if [ -z $1 -o -z $2 ]; then
- echo " "
- echo Usage: "$0 <DIM|Control> <Database Name>"
- echo " "
- exit
--endif
-+fi
- #
- #
--if( $1 == "Control" )then
-+if [ "$1" = "Control" ]; then
- mysqlshow -pctn -uctn $2 ApplicationEntity
- mysqlshow -pctn -uctn $2 GroupNames
- mysqlshow -pctn -uctn $2 StorageAccess
-@@ -19,15 +19,15 @@
- mysqlshow -pctn -uctn $2 FISAccess
- mysqlshow -pctn -uctn $2 PrintServerCFG
- mysqlshow -pctn -uctn $2 VideoImageDest
--endif
-+fi
- #
- #
- #
--if( $1 == "DIM" )then
-+if [ "$1" = "DIM" ]; then
- mysqlshow -pctn -uctn $2 ApplicationEntity
- mysqlshow -pctn -uctn $2 PatientLevel
- mysqlshow -pctn -uctn $2 StudyLevel
- mysqlshow -pctn -uctn $2 SeriesLevel
- mysqlshow -pctn -uctn $2 ImageLevel
- mysqlshow -pctn -uctn $2 InstanceTable
--endif
-+fi
---- ctn-3.0.6.orig/cfg_scripts/mysql/DropTables
-+++ ctn-3.0.6/cfg_scripts/mysql/DropTables
-@@ -1,15 +1,16 @@
--#!/bin/csh
-+#!/bin/bash
- #
- # DropTables
- #
--if ( $1 == "" || $2 == "" ) then
-+if [ -z $1 -o -z $2 ]; then
- echo " "
- echo Usage: "$0 <DIM|Control|TBLTest|FIS> <Database Name>"
- echo " "
- exit
--endif
--mysql -uctn -pctn $2 < Drop$1Tables.script
--if ($status != 0) then
-+fi
-+
-+mysql -uctn -pctn $2 < Drop${1}Tables.script
-+if [ $? != 0 ]; then
- echo Could not drop database: $1
- exit 1
--endif
-+fi
---- ctn-3.0.6.orig/libsrc/Makefile
-+++ ctn-3.0.6/libsrc/Makefile
-@@ -25,7 +25,7 @@
- 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
-
--BASE_HEADER_FILES = cfg.h condition.h ctn_os.h ctnthread.h dbquery.h decode.h dicom.h \
-+BASE_HEADER_FILES = cfg.h condition.h ctn_os.h ctnthread.h dbquery.h decode.h dicom.h intsizes.h \
- 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 @@
- tbl_msql.h tbl_psql.h tbl_sqlserver.h tbl_sybase.h tbl_ufs.h \
- utility.h xutl.h
-
--HEADER_FILES = $(BASE_HEADER_FILES) tbl.h tbl_msql.h tbl_psql.h tbl_sqlserver.h\
--tbl_sybase.h tbl_ufs.h
-+HEADER_FILES = $(BASE_HEADER_FILES)
-+# KMR -- removed these files since BASE_HEADER_FILES has them in their
-+# tbl.h tbl_msql.h tbl_psql.h tbl_sqlserver.h tbl_sybase.h tbl_ufs.h
-
- HEADER_FILES_MBCTN = $(BASE_HEADER_FILES) dicom_chr.h idbmb.h tblmb.h tblmb_psql.h
-
---- ctn-3.0.6.orig/libsrc/Makefile.psql
-+++ ctn-3.0.6/libsrc/Makefile.psql
-@@ -24,7 +24,7 @@
- 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
-
--BASE_HEADER_FILES = cfg.h condition.h ctn_os.h ctnthread.h dbquery.h decode.h dicom.h \
-+BASE_HEADER_FILES = cfg.h condition.h ctn_os.h ctnthread.h dbquery.h decode.h dicom.h intsizes.h \
- 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 \
Copied: trunk/packages/ctn/trunk/debian/patches/10_all_patches.patch (from rev 2303, trunk/packages/ctn/trunk/debian/patches/10_mysql_4.2.patch)
===================================================================
--- trunk/packages/ctn/trunk/debian/patches/10_all_patches.patch (rev 0)
+++ trunk/packages/ctn/trunk/debian/patches/10_all_patches.patch 2008-07-25 14:54:27 UTC (rev 2306)
@@ -0,0 +1,380 @@
+# 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 ...
+
+--- ctn-3.0.6.orig/apps/dcm_modify_object/gram.h
++++ ctn-3.0.6/apps/dcm_modify_object/gram.h
+@@ -1,22 +1,73 @@
+-#ifndef BISON_Y_TAB_H
+-# define BISON_Y_TAB_H
++/* A Bison parser, made by GNU Bison 2.3. */
+
+-#ifndef YYSTYPE
+-typedef union{
++/* Skeleton interface for Bison's Yacc-like parsers in C
++
++ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
++ Free Software Foundation, Inc.
++
++ This program is free software; you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation; either version 2, or (at your option)
++ any later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with this program; if not, write to the Free Software
++ Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA. */
++
++/* As a special exception, you may create a larger work that contains
++ part or all of the Bison parser skeleton and distribute that work
++ under terms of your choice, so long as that work isn't itself a
++ parser generator using the skeleton or a modified version thereof
++ as a parser skeleton. Alternatively, if you modify or redistribute
++ the parser skeleton itself, you may (at your option) remove this
++ special exception, which will cause the skeleton and the resulting
++ Bison output files to be licensed under the GNU General Public
++ License without this special exception.
++
++ This special exception was added by the Free Software Foundation in
++ version 2.2 of Bison. */
++
++/* Tokens. */
++#ifndef YYTOKENTYPE
++# define YYTOKENTYPE
++ /* Put the tokens into the symbol table, so that GDB and other debuggers
++ know about them. */
++ enum yytokentype {
++ NUMBER = 258,
++ VALUE = 259
++ };
++#endif
++/* Tokens. */
++#define NUMBER 258
++#define VALUE 259
++
++
++
++
++#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
++typedef union YYSTYPE
++#line 25 "gram.y"
++{
+ unsigned long num;
+ char str[DICOM_LO_LENGTH+1];
+ char *s;
+ DCM_ELEMENT *e;
+ LST_HEAD *l;
+ void *v;
+-} yystype;
+-# define YYSTYPE yystype
++}
++/* Line 1489 of yacc.c. */
++#line 66 "y.tab.h"
++ YYSTYPE;
++# define yystype YYSTYPE /* obsolescent; will be withdrawn */
++# define YYSTYPE_IS_DECLARED 1
+ # define YYSTYPE_IS_TRIVIAL 1
+ #endif
+-# define NUMBER 257
+-# define VALUE 258
+-
+
+ extern YYSTYPE yylval;
+
+-#endif /* not BISON_Y_TAB_H */
+--- ctn-3.0.6.orig/cfg_scripts/mysql/PrintTables
++++ ctn-3.0.6/cfg_scripts/mysql/PrintTables
+@@ -1,11 +1,12 @@
+-#!/bin/csh
++#!/bin/bash
+ #
+ # PrintTables
+ #
+-if ($1 == "" || $2 == "" ) then
++if [ -z $1 -o -z $2 ]; then
+ echo " "
+ echo Usage: "$0 <DIM|Control|FIS> <Database Name>"
+ echo " "
+ exit
+-endif
+-mysql -uctn -pctn $2 < Print$1Tables.script
++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
+@@ -1,16 +1,16 @@
+-#!/bin/csh
++#!/bin/bash
+ #
+ # ListTables
+ #
+-if ($1 == "" || $2 == "" ) then
++if [ -z $1 -o -z $2 ]; then
+ echo " "
+ echo Usage: "$0 <DIM|Control> <Database Name>"
+ echo " "
+ exit
+-endif
++fi
+ #
+ #
+-if( $1 == "Control" )then
++if [ "$1" = "Control" ]; then
+ mysqlshow -pctn -uctn $2 ApplicationEntity
+ mysqlshow -pctn -uctn $2 GroupNames
+ mysqlshow -pctn -uctn $2 StorageAccess
+@@ -19,15 +19,15 @@
+ mysqlshow -pctn -uctn $2 FISAccess
+ mysqlshow -pctn -uctn $2 PrintServerCFG
+ mysqlshow -pctn -uctn $2 VideoImageDest
+-endif
++fi
+ #
+ #
+ #
+-if( $1 == "DIM" )then
++if [ "$1" = "DIM" ]; then
+ mysqlshow -pctn -uctn $2 ApplicationEntity
+ mysqlshow -pctn -uctn $2 PatientLevel
+ mysqlshow -pctn -uctn $2 StudyLevel
+ mysqlshow -pctn -uctn $2 SeriesLevel
+ mysqlshow -pctn -uctn $2 ImageLevel
+ mysqlshow -pctn -uctn $2 InstanceTable
+-endif
++fi
+--- ctn-3.0.6.orig/cfg_scripts/mysql/ClearTables
++++ ctn-3.0.6/cfg_scripts/mysql/ClearTables
+@@ -1,11 +1,12 @@
+-#!/bin/csh
++#!/bin/bash
+ #
+ # ClearTables
+ #
+-if ( $1 == "" || $2 == "" ) then
++if [ -z $1 -o -z $2 ]; then
+ echo " "
+ echo Usage: "$0 <DIM|Control|TBLTest|FIS> <Database Name>"
+ echo " "
+ exit
+-endif
+-mysql $2 < Clear$1Tables.script
++fi
++
++mysql $2 < Clear${1}Tables.script
+--- ctn-3.0.6.orig/cfg_scripts/mysql/FillTables
++++ ctn-3.0.6/cfg_scripts/mysql/FillTables
+@@ -1,15 +1,17 @@
+-#!/bin/csh
++#!/bin/bash
+ #
+ # FillTables
+ #
+-if ($1 == "" || $2 == "" ) then
++if [ -z $1 -o $2 ]; then
+ echo " "
+ echo Usage: "$0 <DIM> <Database Name>"
+ echo " "
+ exit
+-endif
+-mysql -uctn -pctn $2 < Fill$1Tables.script
+-if ($status != 0) then
++fi
++
++mysql -uctn -pctn $2 < Fill${1}Tables.script
++
++if [ $? != 0 ]; then
+ echo Could not drop database: $1
+ exit 1
+-endif
++fi
+--- ctn-3.0.6.orig/cfg_scripts/mysql/CreateTables
++++ ctn-3.0.6/cfg_scripts/mysql/CreateTables
+@@ -1,11 +1,12 @@
+-#!/bin/csh
++#!/bin/bash
+ #
+ # CreateTables
+ #
+-if ($1 == "" || $2 == "" ) then
++if [ -z $1 -o -z $2 ]; then
+ echo " "
+ echo Usage: "$0 <DIM|Control|TBLTest|FIS> <Database Name>"
+ echo " "
+ exit
+-endif
+-mysql -uctn -pctn $2 < Create$1Tables.script
++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
+@@ -1,15 +1,16 @@
+-#!/bin/csh
++#!/bin/bash
+ #
+ # DropTables
+ #
+-if ( $1 == "" || $2 == "" ) then
++if [ -z $1 -o -z $2 ]; then
+ echo " "
+ echo Usage: "$0 <DIM|Control|TBLTest|FIS> <Database Name>"
+ echo " "
+ exit
+-endif
+-mysql -uctn -pctn $2 < Drop$1Tables.script
+-if ($status != 0) then
++fi
++
++mysql -uctn -pctn $2 < Drop${1}Tables.script
++if [ $? != 0 ]; then
+ echo Could not drop database: $1
+ exit 1
+-endif
++fi
+--- ctn-3.0.6.orig/cfg_scripts/mysql/DropDB
++++ ctn-3.0.6/cfg_scripts/mysql/DropDB
+@@ -1,15 +1,16 @@
+-#!/bin/csh
++#!/bin/bash
+ #
+ # DropDB
+ #
+-if ($1 == "") then
++if [ -z $1 ]; then
+ echo " "
+ echo Usage: "$0 <Database Name>"
+ echo " "
+ exit
+-endif
++fi
++
+ mysqladmin -uctn -pctn drop $1
+-if ($status != 0) then
++if [ $? != 0 ]; then
+ echo Could not drop database: $1
+ exit 1
+-endif
++fi
+--- ctn-3.0.6.orig/cfg_scripts/mysql/CreateDB
++++ ctn-3.0.6/cfg_scripts/mysql/CreateDB
+@@ -1,15 +1,16 @@
+-#!/bin/csh
++#!/bin/bash
+ #
+ # CreateDB
+ #
+-if ($1 == "") then
++if [ -z "$1" ]; then
+ echo " "
+ echo Usage: "$0 <DB Name>"
+ echo " "
+ exit
+-endif
++fi
++
+ mysqladmin -uctn -pctn create $1
+-if ($status != 0) then
++if [ $? != 0 ]; then
+ echo Could not create database: $1
+ exit 1
+-endif
++fi
+--- ctn-3.0.6.orig/facilities/objects/dcmprivate.h
++++ ctn-3.0.6/facilities/objects/dcmprivate.h
+@@ -117,11 +117,7 @@
+ } SHORT_WORD;
+
+ typedef union {
+-#ifdef __alpha
+ unsigned int l;
+-#else
+- unsigned long l;
+-#endif
+ 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 @@
+ if (configFile == 0 || configFile[0] == '\0') {
+ char* p = getenv("CTN_TARGET");
+ if (p == NULL) {
+- return UTL_NO_CTN_TARGET;
++ /* Debian patch: Can not make operation dependent on Env var */
++ /* return UTL_NO_CTN_TARGET; */
++ p = "/etc/ctn";
+ }
+ 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 @@
+
+ c = getenv("CTN_TARGET");
+ if (c == NULL)
+- c = "/opt/ctn";
++ /* Debian patch: conform to debian directory policy */
++ /* c = "/opt/ctn"; */
++ c = "/etc/ctn";
+
+ sprintf(s->runtime, "%s/runtime/fontmap", c);
+ }
+--- ctn-3.0.6.orig/facilities/dicom/dicom.h
++++ ctn-3.0.6/facilities/dicom/dicom.h
+@@ -57,6 +57,8 @@
+
+ #ifdef _MSC_VER
+ #include "dicom_platform.h"
++#else
++#include "intsizes.h"
+ #endif
+
+ #ifdef __cplusplus
+@@ -85,14 +87,13 @@
+ typedef unsigned short U16; /* unsigned, 16 bit */
+ typedef short S16; /* signed, 16 bit */
+
+-#if LONGSIZE == 64 && INTSIZE == 32 /* Such as an Alpha */
++#if LONGSIZE == 64 && INTSIZE == 32 /* Such as an Alpha */
+ typedef unsigned int U32;
+ typedef int S32;
+
+ #elif LONGSIZE == 32 /* Most 32 bit workstations */
+ typedef unsigned long U32;
+ typedef long S32;
+-
+ #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 @@
+ install:
+ $(INSTALLINCLUDE) ctn_os.h $(DICOM_INCLUDE)
+ $(INSTALLINCLUDE) dicom.h $(DICOM_INCLUDE)
++ $(INSTALLINCLUDE) intsizes.h $(DICOM_INCLUDE)
+ $(INSTALLINCLUDE) dicom_platform.h $(DICOM_INCLUDE)
+
+ export:
+@@ -19,9 +20,10 @@
+ $(INSTALLINCLUDE) dicom_platform.h $(DICOM_INCLUDE)
+ links:
+ rm -f $(DICOM_LIBSRC)/dicom.h $(DICOM_LIBSRC)/dicom_platform.h $(DICOM_LIBSRC)/ctn_os.h
+- ln -s ../facilities/dicom/ctn_os.h $(DICOM_LIBSRC)
+- ln -s ../facilities/dicom/dicom.h $(DICOM_LIBSRC)
+- ln -s ../facilities/dicom/dicom_platform.h $(DICOM_LIBSRC)
++ ln -sf ../facilities/dicom/ctn_os.h $(DICOM_LIBSRC)
++ ln -sf ../facilities/dicom/dicom.h $(DICOM_LIBSRC)
++ ln -sf ../facilities/dicom/intsizes.h $(DICOM_LIBSRC)
++ ln -sf ../facilities/dicom/dicom_platform.h $(DICOM_LIBSRC)
+
+ clean:
+ rm -f *.a *.o *.BAK *% core
Property changes on: trunk/packages/ctn/trunk/debian/patches/10_all_patches.patch
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: trunk/packages/ctn/trunk/debian/patches/10_mysql_4.2.patch
===================================================================
--- trunk/packages/ctn/trunk/debian/patches/10_mysql_4.2.patch 2008-07-24 16:02:10 UTC (rev 2305)
+++ trunk/packages/ctn/trunk/debian/patches/10_mysql_4.2.patch 2008-07-25 14:54:27 UTC (rev 2306)
@@ -1,380 +0,0 @@
-# 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 ...
-
---- ctn-3.0.6.orig/apps/dcm_modify_object/gram.h
-+++ ctn-3.0.6/apps/dcm_modify_object/gram.h
-@@ -1,22 +1,73 @@
--#ifndef BISON_Y_TAB_H
--# define BISON_Y_TAB_H
-+/* A Bison parser, made by GNU Bison 2.3. */
-
--#ifndef YYSTYPE
--typedef union{
-+/* Skeleton interface for Bison's Yacc-like parsers in C
-+
-+ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-+ Free Software Foundation, Inc.
-+
-+ This program is free software; you can redistribute it and/or modify
-+ it under the terms of the GNU General Public License as published by
-+ the Free Software Foundation; either version 2, or (at your option)
-+ any later version.
-+
-+ This program is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ GNU General Public License for more details.
-+
-+ You should have received a copy of the GNU General Public License
-+ along with this program; if not, write to the Free Software
-+ Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+ Boston, MA 02110-1301, USA. */
-+
-+/* As a special exception, you may create a larger work that contains
-+ part or all of the Bison parser skeleton and distribute that work
-+ under terms of your choice, so long as that work isn't itself a
-+ parser generator using the skeleton or a modified version thereof
-+ as a parser skeleton. Alternatively, if you modify or redistribute
-+ the parser skeleton itself, you may (at your option) remove this
-+ special exception, which will cause the skeleton and the resulting
-+ Bison output files to be licensed under the GNU General Public
-+ License without this special exception.
-+
-+ This special exception was added by the Free Software Foundation in
-+ version 2.2 of Bison. */
-+
-+/* Tokens. */
-+#ifndef YYTOKENTYPE
-+# define YYTOKENTYPE
-+ /* Put the tokens into the symbol table, so that GDB and other debuggers
-+ know about them. */
-+ enum yytokentype {
-+ NUMBER = 258,
-+ VALUE = 259
-+ };
-+#endif
-+/* Tokens. */
-+#define NUMBER 258
-+#define VALUE 259
-+
-+
-+
-+
-+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-+typedef union YYSTYPE
-+#line 25 "gram.y"
-+{
- unsigned long num;
- char str[DICOM_LO_LENGTH+1];
- char *s;
- DCM_ELEMENT *e;
- LST_HEAD *l;
- void *v;
--} yystype;
--# define YYSTYPE yystype
-+}
-+/* Line 1489 of yacc.c. */
-+#line 66 "y.tab.h"
-+ YYSTYPE;
-+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-+# define YYSTYPE_IS_DECLARED 1
- # define YYSTYPE_IS_TRIVIAL 1
- #endif
--# define NUMBER 257
--# define VALUE 258
--
-
- extern YYSTYPE yylval;
-
--#endif /* not BISON_Y_TAB_H */
---- ctn-3.0.6.orig/cfg_scripts/mysql/PrintTables
-+++ ctn-3.0.6/cfg_scripts/mysql/PrintTables
-@@ -1,11 +1,12 @@
--#!/bin/csh
-+#!/bin/bash
- #
- # PrintTables
- #
--if ($1 == "" || $2 == "" ) then
-+if [ -z $1 -o -z $2 ]; then
- echo " "
- echo Usage: "$0 <DIM|Control|FIS> <Database Name>"
- echo " "
- exit
--endif
--mysql -uctn -pctn $2 < Print$1Tables.script
-+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
-@@ -1,16 +1,16 @@
--#!/bin/csh
-+#!/bin/bash
- #
- # ListTables
- #
--if ($1 == "" || $2 == "" ) then
-+if [ -z $1 -o -z $2 ]; then
- echo " "
- echo Usage: "$0 <DIM|Control> <Database Name>"
- echo " "
- exit
--endif
-+fi
- #
- #
--if( $1 == "Control" )then
-+if [ "$1" = "Control" ]; then
- mysqlshow -pctn -uctn $2 ApplicationEntity
- mysqlshow -pctn -uctn $2 GroupNames
- mysqlshow -pctn -uctn $2 StorageAccess
-@@ -19,15 +19,15 @@
- mysqlshow -pctn -uctn $2 FISAccess
- mysqlshow -pctn -uctn $2 PrintServerCFG
- mysqlshow -pctn -uctn $2 VideoImageDest
--endif
-+fi
- #
- #
- #
--if( $1 == "DIM" )then
-+if [ "$1" = "DIM" ]; then
- mysqlshow -pctn -uctn $2 ApplicationEntity
- mysqlshow -pctn -uctn $2 PatientLevel
- mysqlshow -pctn -uctn $2 StudyLevel
- mysqlshow -pctn -uctn $2 SeriesLevel
- mysqlshow -pctn -uctn $2 ImageLevel
- mysqlshow -pctn -uctn $2 InstanceTable
--endif
-+fi
---- ctn-3.0.6.orig/cfg_scripts/mysql/ClearTables
-+++ ctn-3.0.6/cfg_scripts/mysql/ClearTables
-@@ -1,11 +1,12 @@
--#!/bin/csh
-+#!/bin/bash
- #
- # ClearTables
- #
--if ( $1 == "" || $2 == "" ) then
-+if [ -z $1 -o -z $2 ]; then
- echo " "
- echo Usage: "$0 <DIM|Control|TBLTest|FIS> <Database Name>"
- echo " "
- exit
--endif
--mysql $2 < Clear$1Tables.script
-+fi
-+
-+mysql $2 < Clear${1}Tables.script
---- ctn-3.0.6.orig/cfg_scripts/mysql/FillTables
-+++ ctn-3.0.6/cfg_scripts/mysql/FillTables
-@@ -1,15 +1,17 @@
--#!/bin/csh
-+#!/bin/bash
- #
- # FillTables
- #
--if ($1 == "" || $2 == "" ) then
-+if [ -z $1 -o $2 ]; then
- echo " "
- echo Usage: "$0 <DIM> <Database Name>"
- echo " "
- exit
--endif
--mysql -uctn -pctn $2 < Fill$1Tables.script
--if ($status != 0) then
-+fi
-+
-+mysql -uctn -pctn $2 < Fill${1}Tables.script
-+
-+if [ $? != 0 ]; then
- echo Could not drop database: $1
- exit 1
--endif
-+fi
---- ctn-3.0.6.orig/cfg_scripts/mysql/CreateTables
-+++ ctn-3.0.6/cfg_scripts/mysql/CreateTables
-@@ -1,11 +1,12 @@
--#!/bin/csh
-+#!/bin/bash
- #
- # CreateTables
- #
--if ($1 == "" || $2 == "" ) then
-+if [ -z $1 -o -z $2 ]; then
- echo " "
- echo Usage: "$0 <DIM|Control|TBLTest|FIS> <Database Name>"
- echo " "
- exit
--endif
--mysql -uctn -pctn $2 < Create$1Tables.script
-+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
-@@ -1,15 +1,16 @@
--#!/bin/csh
-+#!/bin/bash
- #
- # DropTables
- #
--if ( $1 == "" || $2 == "" ) then
-+if [ -z $1 -o -z $2 ]; then
- echo " "
- echo Usage: "$0 <DIM|Control|TBLTest|FIS> <Database Name>"
- echo " "
- exit
--endif
--mysql -uctn -pctn $2 < Drop$1Tables.script
--if ($status != 0) then
-+fi
-+
-+mysql -uctn -pctn $2 < Drop${1}Tables.script
-+if [ $? != 0 ]; then
- echo Could not drop database: $1
- exit 1
--endif
-+fi
---- ctn-3.0.6.orig/cfg_scripts/mysql/DropDB
-+++ ctn-3.0.6/cfg_scripts/mysql/DropDB
-@@ -1,15 +1,16 @@
--#!/bin/csh
-+#!/bin/bash
- #
- # DropDB
- #
--if ($1 == "") then
-+if [ -z $1 ]; then
- echo " "
- echo Usage: "$0 <Database Name>"
- echo " "
- exit
--endif
-+fi
-+
- mysqladmin -uctn -pctn drop $1
--if ($status != 0) then
-+if [ $? != 0 ]; then
- echo Could not drop database: $1
- exit 1
--endif
-+fi
---- ctn-3.0.6.orig/cfg_scripts/mysql/CreateDB
-+++ ctn-3.0.6/cfg_scripts/mysql/CreateDB
-@@ -1,15 +1,16 @@
--#!/bin/csh
-+#!/bin/bash
- #
- # CreateDB
- #
--if ($1 == "") then
-+if [ -z "$1" ]; then
- echo " "
- echo Usage: "$0 <DB Name>"
- echo " "
- exit
--endif
-+fi
-+
- mysqladmin -uctn -pctn create $1
--if ($status != 0) then
-+if [ $? != 0 ]; then
- echo Could not create database: $1
- exit 1
--endif
-+fi
---- ctn-3.0.6.orig/facilities/objects/dcmprivate.h
-+++ ctn-3.0.6/facilities/objects/dcmprivate.h
-@@ -117,11 +117,7 @@
- } SHORT_WORD;
-
- typedef union {
--#ifdef __alpha
- unsigned int l;
--#else
-- unsigned long l;
--#endif
- 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 @@
- if (configFile == 0 || configFile[0] == '\0') {
- char* p = getenv("CTN_TARGET");
- if (p == NULL) {
-- return UTL_NO_CTN_TARGET;
-+ /* Debian patch: Can not make operation dependent on Env var */
-+ /* return UTL_NO_CTN_TARGET; */
-+ p = "/etc/ctn";
- }
- 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 @@
-
- c = getenv("CTN_TARGET");
- if (c == NULL)
-- c = "/opt/ctn";
-+ /* Debian patch: conform to debian directory policy */
-+ /* c = "/opt/ctn"; */
-+ c = "/etc/ctn";
-
- sprintf(s->runtime, "%s/runtime/fontmap", c);
- }
---- ctn-3.0.6.orig/facilities/dicom/dicom.h
-+++ ctn-3.0.6/facilities/dicom/dicom.h
-@@ -57,6 +57,8 @@
-
- #ifdef _MSC_VER
- #include "dicom_platform.h"
-+#else
-+#include "intsizes.h"
- #endif
-
- #ifdef __cplusplus
-@@ -85,14 +87,13 @@
- typedef unsigned short U16; /* unsigned, 16 bit */
- typedef short S16; /* signed, 16 bit */
-
--#if LONGSIZE == 64 && INTSIZE == 32 /* Such as an Alpha */
-+#if LONGSIZE == 64 && INTSIZE == 32 /* Such as an Alpha */
- typedef unsigned int U32;
- typedef int S32;
-
- #elif LONGSIZE == 32 /* Most 32 bit workstations */
- typedef unsigned long U32;
- typedef long S32;
--
- #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 @@
- install:
- $(INSTALLINCLUDE) ctn_os.h $(DICOM_INCLUDE)
- $(INSTALLINCLUDE) dicom.h $(DICOM_INCLUDE)
-+ $(INSTALLINCLUDE) intsizes.h $(DICOM_INCLUDE)
- $(INSTALLINCLUDE) dicom_platform.h $(DICOM_INCLUDE)
-
- export:
-@@ -19,9 +20,10 @@
- $(INSTALLINCLUDE) dicom_platform.h $(DICOM_INCLUDE)
- links:
- rm -f $(DICOM_LIBSRC)/dicom.h $(DICOM_LIBSRC)/dicom_platform.h $(DICOM_LIBSRC)/ctn_os.h
-- ln -s ../facilities/dicom/ctn_os.h $(DICOM_LIBSRC)
-- ln -s ../facilities/dicom/dicom.h $(DICOM_LIBSRC)
-- ln -s ../facilities/dicom/dicom_platform.h $(DICOM_LIBSRC)
-+ ln -sf ../facilities/dicom/ctn_os.h $(DICOM_LIBSRC)
-+ ln -sf ../facilities/dicom/dicom.h $(DICOM_LIBSRC)
-+ ln -sf ../facilities/dicom/intsizes.h $(DICOM_LIBSRC)
-+ ln -sf ../facilities/dicom/dicom_platform.h $(DICOM_LIBSRC)
-
- clean:
- rm -f *.a *.o *.BAK *% core
Modified: trunk/packages/ctn/trunk/debian/patches/series
===================================================================
--- trunk/packages/ctn/trunk/debian/patches/series 2008-07-24 16:02:10 UTC (rev 2305)
+++ trunk/packages/ctn/trunk/debian/patches/series 2008-07-25 14:54:27 UTC (rev 2306)
@@ -1,3 +1 @@
-00_fix_blank_in_cshell_scripts.patch
-00_previous_patches_for_debian.patch
-10_mysql_4.2.patch
+10_all_patches.patch
Modified: trunk/packages/ctn/trunk/debian/rules
===================================================================
--- trunk/packages/ctn/trunk/debian/rules 2008-07-24 16:02:10 UTC (rev 2305)
+++ trunk/packages/ctn/trunk/debian/rules 2008-07-25 14:54:27 UTC (rev 2306)
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
+include /usr/share/quilt/quilt.make
+
build := debian/build-tmp
pkg-ctn := debian/ctn
pkg-ctn-dev := debian/ctn-dev
@@ -13,7 +15,7 @@
-build: build-stamp
+build: patch build-stamp
# we must provide *SIZE inside dicom.h or otherwise applications which
# would use ctn might be doomed to get improper U32 types etc
@@ -33,7 +35,7 @@
echo "DEBUG: nach make install"
touch build-stamp
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp
@@ -94,5 +96,5 @@
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: clean binary-indep binary-arch binary install
More information about the debian-med-commit
mailing list