[med-svn] r2310 - trunk/packages/ctn/trunk/debian/patches

[thijs at alioth.debian.org]

Author: thijs
Date: 2008-07-25 15:51:57 +0000 (Fri, 25 Jul 2008)
New Revision: 2310

Added:
   trunk/packages/ctn/trunk/debian/patches/11_csh-to-bash.patch
Modified:
   trunk/packages/ctn/trunk/debian/patches/10_all_patches.patch
   trunk/packages/ctn/trunk/debian/patches/series
Log:
split off one of the patches, the others are left as an exersise to the next
passer-by ;-)


Modified: trunk/packages/ctn/trunk/debian/patches/10_all_patches.patch
===================================================================
--- trunk/packages/ctn/trunk/debian/patches/10_all_patches.patch	2008-07-25 15:46:51 UTC (rev 2309)
+++ trunk/packages/ctn/trunk/debian/patches/10_all_patches.patch	2008-07-25 15:51:57 UTC (rev 2310)
@@ -1,3 +1,9 @@
+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
 @@ -1,22 +1,73 @@
@@ -84,204 +90,6 @@
  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 @@

Added: trunk/packages/ctn/trunk/debian/patches/11_csh-to-bash.patch
===================================================================
--- trunk/packages/ctn/trunk/debian/patches/11_csh-to-bash.patch	                        (rev 0)
+++ trunk/packages/ctn/trunk/debian/patches/11_csh-to-bash.patch	2008-07-25 15:51:57 UTC (rev 2310)
@@ -0,0 +1,200 @@
+Change csh scripts to bash scripts, by Kevin M. Rosenberg
+
+--- 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

Modified: trunk/packages/ctn/trunk/debian/patches/series
===================================================================
--- trunk/packages/ctn/trunk/debian/patches/series	2008-07-25 15:46:51 UTC (rev 2309)
+++ trunk/packages/ctn/trunk/debian/patches/series	2008-07-25 15:51:57 UTC (rev 2310)
@@ -1,2 +1,3 @@
 10_all_patches.patch
+11_csh-to-bash.patch
 20_mysql_4.2.patch