[med-svn] r2308 - in trunk/packages/ctn/trunk/debian: . patches

[thijs at alioth.debian.org]

Author: thijs
Date: 2008-07-25 15:25:59 +0000 (Fri, 25 Jul 2008)
New Revision: 2308

Modified:
   trunk/packages/ctn/trunk/debian/changelog
   trunk/packages/ctn/trunk/debian/patches/10_all_patches.patch
Log:
add missing hunks of the patch, it now builds


Modified: trunk/packages/ctn/trunk/debian/changelog
===================================================================
--- trunk/packages/ctn/trunk/debian/changelog	2008-07-25 14:59:56 UTC (rev 2307)
+++ trunk/packages/ctn/trunk/debian/changelog	2008-07-25 15:25:59 UTC (rev 2308)
@@ -8,7 +8,7 @@
   * Moved Homepage from long description to separate field
     (Closes: #466671).
   * Patch to make the ctn working properly with mysql server > 4.2.
-    Thanks to Pablo Sau <psau at cadpet.es>
+    Thanks to Pablo Sau <psau at cadpet.es> (Closes: #326916).
 
   [ Steve M. Robbins ]
   * Remove self from uploaders.
@@ -21,7 +21,7 @@
     which needs to be split out over time.
   * Checked for policy version 3.8.0, add README.source.
 
- -- Thijs Kinkhorst <thijs at debian.org>  Fri, 25 Jul 2008 16:52:01 +0200
+ -- Thijs Kinkhorst <thijs at debian.org>  Fri, 25 Jul 2008 17:25:09 +0200
 
 ctn (3.0.6-12) unstable; urgency=low
 

Modified: trunk/packages/ctn/trunk/debian/patches/10_all_patches.patch
===================================================================
--- trunk/packages/ctn/trunk/debian/patches/10_all_patches.patch	2008-07-25 14:59:56 UTC (rev 2307)
+++ trunk/packages/ctn/trunk/debian/patches/10_all_patches.patch	2008-07-25 15:25:59 UTC (rev 2308)
@@ -378,3 +378,37 @@
  
  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 @@
+ 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/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 @@
+ 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 \