[med-svn] [conquest-dicom-server] 01/01: Update d/watch, cme fix dpkg-control, commit other local changes
Andreas Tille
tille at debian.org
Sat Dec 31 19:57:37 UTC 2016
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository conquest-dicom-server.
commit cb38b572769663994b54a97a56b3a1c10e02a7d8
Author: Andreas Tille <tille at debian.org>
Date: Sat Dec 31 20:56:45 2016 +0100
Update d/watch, cme fix dpkg-control, commit other local changes
---
debian/README.cgi | 21 ++++--
debian/changelog | 2 +-
debian/compat | 2 +-
debian/control | 52 ++++++++++-----
...standard-debian-location-for-config-files.patch | 10 +--
...te-option-and-description-in-PrintOptions.patch | 2 +-
.../0003-Add-DebianBaseDir-at-dgate.cpp.patch | 2 +-
...ange-port-for-CONQUESTSRV1-in-acrnema.map.patch | 2 +-
...05-Fix-mismatched-new-delete-in-dbsql.cpp.patch | 2 +-
...0006-Fix-mismatched-new-delete-in-rtc.cxx.patch | 2 +-
...7-Fix-mismatched-new-delete-in-farray.thh.patch | 2 +-
...8-Fix-mismatched-new-delete-in-device.cpp.patch | 2 +-
...9-Fix-mismatched-new-delete-in-buffer.cxx.patch | 2 +-
...-assorted-misspellings-pointed-by-lintian.patch | 77 ++++++++++++++++++++--
debian/rules | 9 ++-
debian/watch | 6 +-
16 files changed, 146 insertions(+), 49 deletions(-)
diff --git a/debian/README.cgi b/debian/README.cgi
index 5c805bf..60fa3fd 100644
--- a/debian/README.cgi
+++ b/debian/README.cgi
@@ -2,13 +2,22 @@ CGI Interface
-------------
The main software can act as a CGI behind a webserver and it's the only
"friendly" interface provided in GNU/Linux version (Windows version has a
-GUI). It still can be used as such, but you'll have to copy/move the binary
-to the proper place yourself. This package only provides it as a DICOM server
+GUI). For the browser-embedded viewer part it requires an ActiveX-enabled
+browser and ships with code I can't really understand, so I've left the CGI
+packaging as a wishlist item. This package only provides it as a DICOM server
out-of-the-box.
-I recommend against running it as a CGI interface since it is not very
-secure. If anytime in the future I (or upstream) am able to patch the
-obvious vulnerabilities, I will prepare the package to act as a CGI interface
-as well, but that is just not the case righ now.
+The dgate binary shipped with this package can still be used as CGI, but
+you'll have to copy/move the binary to the proper place yourself. If you have
+a CGI-capable webserver installed on the same machine as ConQuest, it's as
+easy as:
+ bash# ln -s /usr/bin/dgate /usr/lib/cgi-bin
+Then you can point your browser to:
+
+ http://localhost/cgi-bin/dgate?port=11112&address=127.0.0.1
+
+But please note that the embedded viewer will not work. You'll be able to
+browse studies and view thumbs and individual images, but nothing compared to
+a DICOM viewer.
diff --git a/debian/changelog b/debian/changelog
index ab30aef..fd30bf8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-conquest-dicom-server (1.4.17d-1) unstable; urgency=low
+conquest-dicom-server (1.4.17d-1) UNRELEASED; urgency=low
[ Mathieu Malaterre ]
* Debianization
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index d20db75..87ccdc7 100644
--- a/debian/control
+++ b/debian/control
@@ -1,19 +1,31 @@
Source: conquest-dicom-server
-Section: science
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
-Uploaders: Pablo Lorenzzoni <spectra at debian.org>, Mathieu Malaterre <malat at debian.org>
+Uploaders: Pablo Lorenzzoni <spectra at debian.org>,
+ Mathieu Malaterre <malat at debian.org>
+Section: science
Priority: optional
-Build-Depends: debhelper (>= 9), dh-exec, liblua5.1-dev, autotools-dev, dh-autoreconf, help2man (>= 1.40.10), libsqlite3-dev, libmysqlclient-dev, libpq-dev
-Standards-Version: 3.9.5
+Build-Depends: debhelper (>= 10),
+ dh-exec,
+ liblua5.1-dev,
+ autotools-dev,
+ dh-autoreconf,
+ help2man,
+ libsqlite3-dev,
+ libmysqlclient-dev,
+ libpq-dev
+Standards-Version: 3.9.8
Vcs-Browser: http://anonscm.debian.org/tweb/?p=debian-med/conquest-dicom-server.git
-Vcs-Git: git://anonscm.debian.org/debian-med/conquest-dicom-server.git
+Vcs-Git: https://anonscm.debian.org/git/debian-med/conquest-dicom-server.git
Homepage: http://ingenium.home.xs4all.nl/dicom.html
Package: conquest-sqlite
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser (>= 3.11), conquest-common
-Provides: conquest-dicom-server
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ adduser,
+ conquest-common
Conflicts: conquest-dicom-server
+Provides: conquest-dicom-server
Replaces: conquest-dicom-server
Description: ConQuest DICOM Server - SQLite backend
A full featured DICOM server that has been developed based on and heavily
@@ -33,9 +45,12 @@ Description: ConQuest DICOM Server - SQLite backend
Package: conquest-dbase
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser (>= 3.11), conquest-common
-Provides: conquest-dicom-server
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ adduser,
+ conquest-common
Conflicts: conquest-dicom-server
+Provides: conquest-dicom-server
Replaces: conquest-dicom-server
Description: ConQuest DICOM Server - DBaseIII backend
A full featured DICOM server that has been developed based on and heavily
@@ -55,9 +70,12 @@ Description: ConQuest DICOM Server - DBaseIII backend
Package: conquest-postgres
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser (>= 3.11), conquest-common
-Provides: conquest-dicom-server
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ adduser,
+ conquest-common
Conflicts: conquest-dicom-server
+Provides: conquest-dicom-server
Replaces: conquest-dicom-server
Description: ConQuest DICOM Server - PostgreSQL backend
A full featured DICOM server that has been developed based on and heavily
@@ -77,9 +95,12 @@ Description: ConQuest DICOM Server - PostgreSQL backend
Package: conquest-mysql
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser (>= 3.11), conquest-common
-Provides: conquest-dicom-server
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ adduser,
+ conquest-common
Conflicts: conquest-dicom-server
+Provides: conquest-dicom-server
Replaces: conquest-dicom-server
Description: ConQuest DICOM Server - MySQL backend
A full featured DICOM server that has been developed based on and heavily
@@ -98,8 +119,9 @@ Description: ConQuest DICOM Server - MySQL backend
This package uses MySQL as database backend.
Package: conquest-common
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Architecture: all
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
Suggests: conquest-dicom-server
Description: ConQuest DICOM Server - common files
A full featured DICOM server that has been developed based on and heavily
diff --git a/debian/patches/0001-Use-standard-debian-location-for-config-files.patch b/debian/patches/0001-Use-standard-debian-location-for-config-files.patch
index 7d637a2..8cb96fe 100644
--- a/debian/patches/0001-Use-standard-debian-location-for-config-files.patch
+++ b/debian/patches/0001-Use-standard-debian-location-for-config-files.patch
@@ -3,14 +3,14 @@ Date: Thu, 5 Jul 2012 00:00:01 +0000
Subject: Use standard debian location for config files
---
- dicom.ini.dbase | 21 +++++++++++++--------
- dicom.ini.mysql | 19 ++++++++++++-------
- dicom.ini.postgres | 15 ++++++++++-----
- dicom.ini.sqlite | 17 +++++++++++------
+ dicom.ini.dbase | 21 +++++++++++++--------
+ dicom.ini.mysql | 19 ++++++++++++-------
+ dicom.ini.postgres | 15 ++++++++++-----
+ dicom.ini.sqlite | 17 +++++++++++------
4 files changed, 46 insertions(+), 26 deletions(-)
diff --git a/dicom.ini.dbase b/dicom.ini.dbase
-index 44ca5d0..a810fec 100644
+index 44ca5d0..973662d 100644
--- a/dicom.ini.dbase
+++ b/dicom.ini.dbase
@@ -10,18 +10,19 @@ Edition = Personal
diff --git a/debian/patches/0002-Separate-option-and-description-in-PrintOptions.patch b/debian/patches/0002-Separate-option-and-description-in-PrintOptions.patch
index 834ae9c..7548c34 100644
--- a/debian/patches/0002-Separate-option-and-description-in-PrintOptions.patch
+++ b/debian/patches/0002-Separate-option-and-description-in-PrintOptions.patch
@@ -3,7 +3,7 @@ Date: Sat, 1 Feb 2014 15:03:04 +0000
Subject: Separate option and description in PrintOptions
---
- dgate.cpp | 58 +++++++++++++++++++++++++++++-----------------------------
+ dgate.cpp | 58 +++++++++++++++++++++++++++++-----------------------------
1 file changed, 29 insertions(+), 29 deletions(-)
diff --git a/dgate.cpp b/dgate.cpp
diff --git a/debian/patches/0003-Add-DebianBaseDir-at-dgate.cpp.patch b/debian/patches/0003-Add-DebianBaseDir-at-dgate.cpp.patch
index 4ec0d40..2e6d2fe 100644
--- a/debian/patches/0003-Add-DebianBaseDir-at-dgate.cpp.patch
+++ b/debian/patches/0003-Add-DebianBaseDir-at-dgate.cpp.patch
@@ -3,7 +3,7 @@ Date: Sat, 1 Feb 2014 18:50:39 +0000
Subject: Add DebianBaseDir at dgate.cpp
---
- dgate.cpp | 16 +++++++---------
+ dgate.cpp | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/dgate.cpp b/dgate.cpp
diff --git a/debian/patches/0004-Change-port-for-CONQUESTSRV1-in-acrnema.map.patch b/debian/patches/0004-Change-port-for-CONQUESTSRV1-in-acrnema.map.patch
index 492df43..505fa6a 100644
--- a/debian/patches/0004-Change-port-for-CONQUESTSRV1-in-acrnema.map.patch
+++ b/debian/patches/0004-Change-port-for-CONQUESTSRV1-in-acrnema.map.patch
@@ -3,7 +3,7 @@ Date: Sun, 2 Feb 2014 11:21:47 +0000
Subject: Change port for CONQUESTSRV1 in acrnema.map
---
- acrnema.map | 13 +++++++------
+ acrnema.map | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/acrnema.map b/acrnema.map
diff --git a/debian/patches/0005-Fix-mismatched-new-delete-in-dbsql.cpp.patch b/debian/patches/0005-Fix-mismatched-new-delete-in-dbsql.cpp.patch
index 71e6947..675a2f7 100644
--- a/debian/patches/0005-Fix-mismatched-new-delete-in-dbsql.cpp.patch
+++ b/debian/patches/0005-Fix-mismatched-new-delete-in-dbsql.cpp.patch
@@ -3,7 +3,7 @@ Date: Thu, 6 Mar 2014 15:34:35 -0300
Subject: Fix mismatched new/delete in dbsql.cpp
---
- dbsql.cpp | 2 +-
+ dbsql.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dbsql.cpp b/dbsql.cpp
diff --git a/debian/patches/0006-Fix-mismatched-new-delete-in-rtc.cxx.patch b/debian/patches/0006-Fix-mismatched-new-delete-in-rtc.cxx.patch
index 9456065..7b76664 100644
--- a/debian/patches/0006-Fix-mismatched-new-delete-in-rtc.cxx.patch
+++ b/debian/patches/0006-Fix-mismatched-new-delete-in-rtc.cxx.patch
@@ -3,7 +3,7 @@ Date: Thu, 6 Mar 2014 15:36:06 -0300
Subject: Fix mismatched new/delete in rtc.cxx
---
- rtc.cxx | 2 +-
+ rtc.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rtc.cxx b/rtc.cxx
diff --git a/debian/patches/0007-Fix-mismatched-new-delete-in-farray.thh.patch b/debian/patches/0007-Fix-mismatched-new-delete-in-farray.thh.patch
index 7e04b74..8a3a164 100644
--- a/debian/patches/0007-Fix-mismatched-new-delete-in-farray.thh.patch
+++ b/debian/patches/0007-Fix-mismatched-new-delete-in-farray.thh.patch
@@ -3,7 +3,7 @@ Date: Thu, 6 Mar 2014 15:37:26 -0300
Subject: Fix mismatched new/delete in farray.thh
---
- farray.thh | 4 ++--
+ farray.thh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/farray.thh b/farray.thh
diff --git a/debian/patches/0008-Fix-mismatched-new-delete-in-device.cpp.patch b/debian/patches/0008-Fix-mismatched-new-delete-in-device.cpp.patch
index 98ec59c..6b7ee4e 100644
--- a/debian/patches/0008-Fix-mismatched-new-delete-in-device.cpp.patch
+++ b/debian/patches/0008-Fix-mismatched-new-delete-in-device.cpp.patch
@@ -3,7 +3,7 @@ Date: Thu, 6 Mar 2014 15:43:54 -0300
Subject: Fix mismatched new/delete in device.cpp
---
- device.cpp | 20 ++++++++++----------
+ device.cpp | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/device.cpp b/device.cpp
diff --git a/debian/patches/0009-Fix-mismatched-new-delete-in-buffer.cxx.patch b/debian/patches/0009-Fix-mismatched-new-delete-in-buffer.cxx.patch
index e2f2a92..16042bf 100644
--- a/debian/patches/0009-Fix-mismatched-new-delete-in-buffer.cxx.patch
+++ b/debian/patches/0009-Fix-mismatched-new-delete-in-buffer.cxx.patch
@@ -3,7 +3,7 @@ Date: Thu, 6 Mar 2014 17:02:42 -0300
Subject: Fix mismatched new/delete in buffer.cxx
---
- buffer.cxx | 2 +-
+ buffer.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/buffer.cxx b/buffer.cxx
diff --git a/debian/patches/0010-Fixed-assorted-misspellings-pointed-by-lintian.patch b/debian/patches/0010-Fixed-assorted-misspellings-pointed-by-lintian.patch
index c5a2fde..ed7ad0e 100644
--- a/debian/patches/0010-Fixed-assorted-misspellings-pointed-by-lintian.patch
+++ b/debian/patches/0010-Fixed-assorted-misspellings-pointed-by-lintian.patch
@@ -3,12 +3,12 @@ Date: Thu, 20 Mar 2014 16:00:52 -0300
Subject: Fixed assorted misspellings pointed by lintian.
---
- acrnema.map | 4 ++--
- dgate.cpp | 24 ++++++++++++------------
- lua/ChangeReturnIPAddress.lua | 4 ++--
- nkiqrsop.cpp | 2 +-
- socket.cxx | 2 +-
- 5 files changed, 18 insertions(+), 18 deletions(-)
+ acrnema.map | 4 ++--
+ dgate.cpp | 38 +++++++++++++++++++-------------------
+ lua/ChangeReturnIPAddress.lua | 4 ++--
+ nkiqrsop.cpp | 2 +-
+ socket.cxx | 2 +-
+ 5 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/acrnema.map b/acrnema.map
index 4cda61a..562b06a 100644
@@ -30,9 +30,18 @@ index 4cda61a..562b06a 100644
* For compression see manual. Values are un=uncompressed; *
* j1,j2=lossless jpeg;j3..j6=lossy jpeg;n1..n4=nki private *
diff --git a/dgate.cpp b/dgate.cpp
-index 30581d1..59633fe 100644
+index 30581d1..cf54e56 100644
--- a/dgate.cpp
+++ b/dgate.cpp
+@@ -485,7 +485,7 @@ mvh 20071124: Added [sop xxx] clause to [forward|get]
+ Real life example (must all be one one line, max 512 characters):
+ ifnotequal "%m", "RTPLAN"; stop; nop "tests modality = RTPLAN";
+ ifnotequal "%V*300a,00b2[0,1]", "A2"; stop; nop "test machine name = A2"
+- forward to XVI_A2; nop "forwards the current recieved RTPLAN";
++ forward to XVI_A2; nop "forwards the current received RTPLAN";
+ get study modality CT from NKIPACS; nop "collects associated CT";
+ get study modality RTSTRUCT sop %V/300c,0060.0/0008,1155 from NKIPACS; nop "collects associated RTSTRUCT";
+ forward study modality CT imagetype *AXIAL* to XVI_A2; nop "forwards associated CT";
@@ -535,7 +535,7 @@ mvh 20080819: Added code by map but kept original get_param for old web cgi clie
Version to 1.4.14
mvh 20080820: Solaris 10 fixes, and general UNIX fixes (map): configfiles may not be in current dir
@@ -42,6 +51,33 @@ index 30581d1..59633fe 100644
Added rudimentary query/move web pages
mvh 20080825: query/move looks better; added "thumbs" column to local series lister; config patched to readonly
added background color and display of icon (to be placed in WebCodeBase)
+@@ -1183,7 +1183,7 @@ int ProcessTime=0; // total time processing (downsize)
+ int SaveTime=0; // total time saving
+
+ int ImagesSent=0; // how many images were sent
+-int ImagesReceived=0; // idem recieved
++int ImagesReceived=0; // idem received
+ int ImagesSaved=0; // idem saved
+ int ImagesForwarded=0; // idem forwarded
+ int ImagesExported=0; // executable as export converted
+@@ -1473,7 +1473,7 @@ void StatusDisplay(FILE *f)
+ fprintf(f, "Old JPEG decoder=%d, JPEGLIB jpeg codec=%d, LIBJASPER jpeg2000 codec=%d\n", intjpeg, libjpeg, libjasper);
+
+ fprintf(f, "Run time (s) total %d, query %d, load %d, save %d, compress %d, process %d, gpps %d\n", TotalTime, QueryTime/1000, LoadTime, SaveTime, RecompressTime, ProcessTime, gppstime);
+- fprintf(f, "Associations=%d; Threads=%d (%d open); Images sent=%d, recieved=%d, forwarded=%d\n", IncomingAssociations, ThreadCount, OpenThreadCount, ImagesSent, ImagesReceived, ImagesForwarded);
++ fprintf(f, "Associations=%d; Threads=%d (%d open); Images sent=%d, received=%d, forwarded=%d\n", IncomingAssociations, ThreadCount, OpenThreadCount, ImagesSent, ImagesReceived, ImagesForwarded);
+ fprintf(f, "Images printed=%d, in color=%d\n", SetBasicGrayScaleImageBox+SetBasicColorImageBox, SetBasicColorImageBox);
+ fprintf(f, "Activity: Echo:%d, Find:%d, Move:%d, Unknown:%d, gpps:%d\n", EchoRequest, C_Find_PatientRoot+C_Find_StudyRoot+C_Find_PatientStudyOnly+C_Find_ModalityWorkList,
+ C_Move_PatientRootNKI+C_Move_PatientRoot+C_Move_StudyRootNKI+C_Move_StudyRoot+C_Move_PatientStudyOnlyNKI+C_Move_PatientStudyOnly, UnknownRequest, gpps);
+@@ -2348,7 +2348,7 @@ void SaveDICOMDataObject(char *Filename, DICOMDataObject* pDDO);
+ int SearchDICOMObject(DICOMObject *DDO, const char *desc, char *result, Array < DICOMDataObject * > **A = NULL, DICOMDataObject **O = NULL);
+ #endif
+
+-// This class handles temporary storage of a recieved object named with SOP
++// This class handles temporary storage of a received object named with SOP
+ class MyBridgeStorage : public UnknownStorage
+ {
+ public:
@@ -11670,7 +11670,7 @@ ParseArgs (int argc, char *argv[], ExtendedPDU_Service *PDU)
OperatorConsole.printf("If you can read this, the console communication is OK\n");
SystemDebug.printf("This is systemdebug output; can you read this ?\n");
@@ -83,6 +119,33 @@ index 30581d1..59633fe 100644
}
OperatorConsole.printf(" ----------------------------------\n");
exit(0);
+@@ -13281,7 +13281,7 @@ int VirtualQuery(DICOMDataObject *DDO, const char *Level, int N, Array < DICOMDa
+
+ PDU.Close();
+
+- // anything recieved ?
++ // anything received ?
+ if (pADDO->GetSize() != s)
+ {
+ DBENTRY *dum;
+@@ -15611,7 +15611,7 @@ struct ReadAheadThreadData
+ #define NULLHANDLE 0
+ #endif
+
+-// to process any recieved data during virtual server operation
++// to process any received data during virtual server operation
+ // call once in a while during virtual reception of data
+
+ static int ProcessRATData(struct ReadAheadThreadData *ratd, int maxfiles)
+@@ -18058,7 +18058,7 @@ BOOL StorageApp :: StorageCommitmentSupport( CheckedPDU_Service *PDU, DICOMComma
+ *CommitData = new DICOMDataObject;
+ if (ActionStorageCommitmentPushRequest.Read(DCO, PDU, *CommitData))
+ {
+- OperatorConsole.printf("Storage commitment request recieved\n");
++ OperatorConsole.printf("Storage commitment request received\n");
+ if (!ActionStorageCommitmentPushResponse.Write(PDU, DCO, &StorageCommitmentPushModelInstanceUID, 1, 0, NULL))
+ return FALSE;
+
@@ -19661,12 +19661,12 @@ BOOL StorageApp :: ServerChild (int theArg )
fprintf(f, " * *\n");
fprintf(f, " * All DICOM systems that want to retrieve images from the *\n");
diff --git a/debian/rules b/debian/rules
index d0155d1..db2fd0c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,6 +56,12 @@ jasper-1.900.1-6ct/src/libjasper/.libs/libjasper.a:
jpeg-6c/libjpeg.a:
$(MAKE) -C jpeg-6c
+dgate.1: dgate-sqlite dgate-mysql dgate-postgres dgate-dbase
+ ./debian/make-manpage
+
+dgate-cgi:
+ $(CPP) $(CPPFLAGS) $(CXXFLAGS) -I/usr/include/lua5.1 -DUNIX -DNATIVE_ENDIAN=1 -DNOINTJPEG -Wno-write-strings total.cpp -o dgate-cgi -lpthread -llua5.1 -Wno-multichar $(LDFLAGS)
+
dgate-sqlite: jpeg-6c/libjpeg.a jasper-1.900.1-6ct/src/libjasper/.libs/libjasper.a
$(CPP) $(CPPFLAGS) $(CXXFLAGS) -Ijasper-1.900.1-6ct/src/libjasper/include -Ijpeg-6c -I/usr/include/lua5.1 -DUNIX -DNATIVE_ENDIAN=1 -DHAVE_LIBJASPER -DHAVE_LIBJPEG -DUSESQLITE -Wno-write-strings total.cpp -o dgate-sqlite -lpthread -llua5.1 -lsqlite3 jpeg-6c/libjpeg.a jasper-1.900.1-6ct/src/libjasper/.libs/libjasper.a -Wno-multichar $(LDFLAGS)
@@ -67,6 +73,3 @@ dgate-postgres: jpeg-6c/libjpeg.a jasper-1.900.1-6ct/src/libjasper/.libs/libjasp
dgate-mysql: jpeg-6c/libjpeg.a jasper-1.900.1-6ct/src/libjasper/.libs/libjasper.a
$(CPP) $(CPPFLAGS) $(CXXFLAGS) -Ijasper-1.900.1-6ct/src/libjasper/include -Ijpeg-6c -I/usr/include/lua5.1 -I/usr/include/mysql -DUNIX -DNATIVE_ENDIAN=1 -DHAVE_LIBJASPER -DHAVE_LIBJPEG -DUSEMYSQL -Wno-write-strings total.cpp -o dgate-mysql -lpthread -llua5.1 -lmysqlclient jpeg-6c/libjpeg.a jasper-1.900.1-6ct/src/libjasper/.libs/libjasper.a -Wno-multichar $(LDFLAGS)
-
-dgate.1: dgate-sqlite dgate-mysql dgate-postgres dgate-dbase
- ./debian/make-manpage
diff --git a/debian/watch b/debian/watch
index 432e9e2..bfed2bd 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
-version=3
-opts="pasv,uversionmangle=s/^(\d)(\d)(.+)/$1.$2.$3/" \
-ftp://ftp-rt.nki.nl/outbox/MarcelVanHerk/dicomserver/conquestlinux(.*)\.tar\.gz
+version=4
+opts="uversionmangle=s/^(\d)(\d)(.+)/$1.$2.$3/" \
+ http://ingenium.home.xs4all.nl/dicomserver/dicomserver([\d]+)\.zip
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/conquest-dicom-server.git
More information about the debian-med-commit
mailing list