[med-svn] r15508 - in trunk/packages/aeskulap/trunk/debian: . patches

Thu Dec 12 09:04:25 UTC 2013

Author: tille
Date: 2013-12-12 09:04:25 +0000 (Thu, 12 Dec 2013)
New Revision: 15508

Modified:
   trunk/packages/aeskulap/trunk/debian/changelog
   trunk/packages/aeskulap/trunk/debian/patches/10_desktop.patch
   trunk/packages/aeskulap/trunk/debian/patches/20_gcc4.4.patch
   trunk/packages/aeskulap/trunk/debian/patches/20_i18n_pt.patch
   trunk/packages/aeskulap/trunk/debian/patches/30_as_needed.patch
   trunk/packages/aeskulap/trunk/debian/patches/DcmElement_has_no_member_error.patch
   trunk/packages/aeskulap/trunk/debian/patches/circular_svg_icon.patch
   trunk/packages/aeskulap/trunk/debian/patches/dcmdata_debug.patch
   trunk/packages/aeskulap/trunk/debian/patches/findAndCopyElement.patch
   trunk/packages/aeskulap/trunk/debian/patches/oflog.patch
   trunk/packages/aeskulap/trunk/debian/patches/patientsname.patch
Log:
Refreshed patches; DEP3


Modified: trunk/packages/aeskulap/trunk/debian/changelog
===================================================================

--- trunk/packages/aeskulap/trunk/debian/changelog	2013-12-12 08:40:32 UTC (rev 15507)
+++ trunk/packages/aeskulap/trunk/debian/changelog	2013-12-12 09:04:25 UTC (rev 15508)
@@ -8,6 +8,9 @@
   * debian/control:
      - cme fix dpkg-control
      - canonical Vcs fields
+  * debian/patches/10_desktop.patch: Add Keywords entry
+  * Refreshed patches (DEP3 headers ... admittedly weak comments since
+    there is not even documentation in d/changelog)
 
  -- Andreas Tille <tille at debian.org>  Thu, 12 Dec 2013 09:43:10 +0100
 

Modified: trunk/packages/aeskulap/trunk/debian/patches/10_desktop.patch
===================================================================
--- trunk/packages/aeskulap/trunk/debian/patches/10_desktop.patch	2013-12-12 08:40:32 UTC (rev 15507)
+++ trunk/packages/aeskulap/trunk/debian/patches/10_desktop.patch	2013-12-12 09:04:25 UTC (rev 15508)
@@ -2,13 +2,14 @@
 Forwarded: https://savannah.nongnu.org/bugs/index.php?23958
 Description: Corrects the FreeDesktop menu entry.
  Application is not a valid category, see:
- http://standards.freedesktop.org/menu-spec/menu-spec-1.0.html
+   http://standards.freedesktop.org/menu-spec/menu-spec-1.0.html
+ Add Keywords entry
 Lisense: same as aeskulap itself.
-Index: aeskulap/src/aeskulap.desktop
-===================================================================
---- aeskulap.orig/src/aeskulap.desktop
-+++ aeskulap/src/aeskulap.desktop
-@@ -1,11 +1,10 @@
+Last-Update: Thu, 12 Dec 2013 09:43:10 +0100
+
+--- a/src/aeskulap.desktop
++++ b/src/aeskulap.desktop
+@@ -1,11 +1,12 @@
  [Desktop Entry]
 -Encoding=UTF-8
  Name=Aeskulap Viewer
@@ -22,3 +23,5 @@
  StartupNotify=true
 -MimeType=image/dicom
 +MimeType=image/dicom;
++Keywords=Medical Record;Practice Management System;Medical Practice;Surgery
++

Modified: trunk/packages/aeskulap/trunk/debian/patches/20_gcc4.4.patch
===================================================================
--- trunk/packages/aeskulap/trunk/debian/patches/20_gcc4.4.patch	2013-12-12 08:40:32 UTC (rev 15507)
+++ trunk/packages/aeskulap/trunk/debian/patches/20_gcc4.4.patch	2013-12-12 09:04:25 UTC (rev 15508)
@@ -3,8 +3,8 @@
 Date: Fri, 7 Nov 2008 20:06:01 UTC
 Description: Add missing include for gcc4.4
 
---- aeskulap-0.2.2-beta1.orig/configuration/aconfiguration-gconf.cpp
-+++ aeskulap-0.2.2-beta1/configuration/aconfiguration-gconf.cpp
+--- a/configuration/aconfiguration-gconf.cpp
++++ b/configuration/aconfiguration-gconf.cpp
 @@ -27,6 +27,7 @@
  */
  

Modified: trunk/packages/aeskulap/trunk/debian/patches/20_i18n_pt.patch
===================================================================
--- trunk/packages/aeskulap/trunk/debian/patches/20_i18n_pt.patch	2013-12-12 08:40:32 UTC (rev 15507)
+++ trunk/packages/aeskulap/trunk/debian/patches/20_i18n_pt.patch	2013-12-12 09:04:25 UTC (rev 15508)
@@ -2,8 +2,8 @@
 Forwarded: https://savannah.nongnu.org/bugs/index.php?23957
 Descripton: Portugese translation update.
 License: Feel free to use it.
---- aeskulap-0.2.2-beta1.orig/po/pt.po
-+++ aeskulap-0.2.2-beta1/po/pt.po
+--- a/po/pt.po
++++ b/po/pt.po
 @@ -1,19 +1,20 @@
 -# SOME DESCRIPTIVE TITLE.
 -# Copyright (C) YEAR Free Software Foundation, Inc.
@@ -35,7 +35,7 @@
  
  #. DEFAULT CT WINDOWLEVELS
  #.
-@@ -27,32 +28,33 @@
+@@ -27,32 +28,33 @@ msgstr ""
  #. Vertebrae   W:  2300 C:  530
  #: ../configuration/aconfiguration.cpp:52
  msgid "Abdomen"
@@ -77,7 +77,7 @@
  
  #: ../widgets/aseriesmenu.cpp:45
  #, c-format
-@@ -60,6 +62,8 @@
+@@ -60,6 +62,8 @@ msgid ""
  "Series %li (%s)\n"
  "%s"
  msgstr ""
@@ -86,7 +86,7 @@
  
  #: ../widgets/aseriesmenu.cpp:48
  #, c-format
-@@ -67,215 +71,227 @@
+@@ -67,215 +71,227 @@ msgid ""
  "Series %li (%s)\n"
  "No description"
  msgstr ""
@@ -374,7 +374,7 @@
  
  #: ../src/mainwindow.cpp:247
  msgid ""
-@@ -284,246 +300,262 @@
+@@ -284,246 +300,262 @@ msgid ""
  "\n"
  "The request was sent to the server but no response has been received."
  msgstr ""
@@ -700,7 +700,7 @@
  
  #: ../src/aeskulap.glade.h:47
  msgid ""
-@@ -538,14 +570,24 @@
+@@ -538,14 +570,24 @@ msgid ""
  "DCMTK - OFFIS DICOM Toolkit:\n"
  "BSD/MIT"
  msgstr ""
@@ -727,7 +727,7 @@
  
  #: ../src/aeskulap.glade.h:59
  msgid ""
-@@ -556,36 +598,43 @@
+@@ -556,36 +598,43 @@ msgid ""
  "MR\n"
  "SC\n"
  msgstr ""

Modified: trunk/packages/aeskulap/trunk/debian/patches/30_as_needed.patch
===================================================================
--- trunk/packages/aeskulap/trunk/debian/patches/30_as_needed.patch	2013-12-12 08:40:32 UTC (rev 15507)
+++ trunk/packages/aeskulap/trunk/debian/patches/30_as_needed.patch	2013-12-12 09:04:25 UTC (rev 15508)
@@ -3,9 +3,9 @@
 Bug-Closed: http://bugs.debian.org/607535
 Description: Enable build with linker flag --as-needed
 
---- aeskulap-0.2.2b1.orig/src/Makefile.am
-+++ aeskulap-0.2.2b1/src/Makefile.am
-@@ -37,12 +37,12 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -37,12 +37,12 @@ icon.o: icon.rc
  
  aeskulap_LDADD = \
  	$(ICONOBJ) \

Modified: trunk/packages/aeskulap/trunk/debian/patches/DcmElement_has_no_member_error.patch
===================================================================
--- trunk/packages/aeskulap/trunk/debian/patches/DcmElement_has_no_member_error.patch	2013-12-12 08:40:32 UTC (rev 15507)
+++ trunk/packages/aeskulap/trunk/debian/patches/DcmElement_has_no_member_error.patch	2013-12-12 09:04:25 UTC (rev 15508)
@@ -3,11 +3,9 @@
 
 According to DCMTK team:
 In the long term, we are trying to get rid of the member variable "errorFlag" in the dcmdata module. All methods should return an OFCondition instead of setting an internal variable for this purpose.
-Index: aeskulap-0.2.2b1/imagepool/poolassociation.h
-===================================================================
---- aeskulap-0.2.2b1.orig/imagepool/poolassociation.h	2011-02-14 11:00:36.000000000 +0100
-+++ aeskulap-0.2.2b1/imagepool/poolassociation.h	2011-02-14 11:00:52.000000000 +0100
-@@ -115,9 +115,7 @@
+--- a/imagepool/poolassociation.h
++++ b/imagepool/poolassociation.h
+@@ -115,9 +115,7 @@ public:
  
  		if(value != NULL) {
  			if (strlen(value) > 0) {

Modified: trunk/packages/aeskulap/trunk/debian/patches/circular_svg_icon.patch
===================================================================
--- trunk/packages/aeskulap/trunk/debian/patches/circular_svg_icon.patch	2013-12-12 08:40:32 UTC (rev 15507)
+++ trunk/packages/aeskulap/trunk/debian/patches/circular_svg_icon.patch	2013-12-12 09:04:25 UTC (rev 15508)
@@ -7,10 +7,8 @@
 Bug: https://savannah.nongnu.org/bugs/index.php?29103
 Author: Charles Plessy <plessy at debian.org>
 
-Index: aeskulap/pixmaps/aeskulap.svg
-===================================================================
---- aeskulap.orig/pixmaps/aeskulap.svg
-+++ aeskulap/pixmaps/aeskulap.svg
+--- a/pixmaps/aeskulap.svg
++++ b/pixmaps/aeskulap.svg
 @@ -1,24 +1,31 @@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"

Modified: trunk/packages/aeskulap/trunk/debian/patches/dcmdata_debug.patch
===================================================================
--- trunk/packages/aeskulap/trunk/debian/patches/dcmdata_debug.patch	2013-12-12 08:40:32 UTC (rev 15507)
+++ trunk/packages/aeskulap/trunk/debian/patches/dcmdata_debug.patch	2013-12-12 09:04:25 UTC (rev 15508)
@@ -1,7 +1,8 @@
-Index: aeskulap-0.2.2b1/imagepool/poolfindassociation.cpp
-===================================================================
---- aeskulap-0.2.2b1.orig/imagepool/poolfindassociation.cpp	2011-02-14 12:20:49.000000000 +0100
-+++ aeskulap-0.2.2b1/imagepool/poolfindassociation.cpp	2011-02-14 12:20:52.000000000 +0100
+Author: ??
+Description: do not include dcdebug.h
+
+--- a/imagepool/poolfindassociation.cpp
++++ b/imagepool/poolfindassociation.cpp
 @@ -26,7 +26,7 @@
      Status:           $State$
  */
@@ -11,10 +12,8 @@
  #include "poolfindassociation.h"
  
  
-Index: aeskulap-0.2.2b1/imagepool/poolmoveassociation.cpp
-===================================================================
---- aeskulap-0.2.2b1.orig/imagepool/poolmoveassociation.cpp	2011-02-14 13:27:51.000000000 +0100
-+++ aeskulap-0.2.2b1/imagepool/poolmoveassociation.cpp	2011-02-14 13:27:59.000000000 +0100
+--- a/imagepool/poolmoveassociation.cpp
++++ b/imagepool/poolmoveassociation.cpp
 @@ -34,7 +34,6 @@
  #include "dcmtk/dcmnet/dimse.h"
  #include "dcmtk/dcmnet/diutil.h"

Modified: trunk/packages/aeskulap/trunk/debian/patches/findAndCopyElement.patch
===================================================================
--- trunk/packages/aeskulap/trunk/debian/patches/findAndCopyElement.patch	2013-12-12 08:40:32 UTC (rev 15507)
+++ trunk/packages/aeskulap/trunk/debian/patches/findAndCopyElement.patch	2013-12-12 09:04:25 UTC (rev 15508)
@@ -3,11 +3,9 @@
 http://git.dcmtk.org/web?p=dcmtk.git;a=commitdiff;h=1d751592ff858b1dcb0f82647c06de779b8e7c32
 
 It allows compilation against DCMTK 3.6.0
-Index: aeskulap-0.2.2b1/imagepool/dicomdir.cpp
-===================================================================
---- aeskulap-0.2.2b1.orig/imagepool/dicomdir.cpp	2011-02-14 10:27:07.000000000 +0100
-+++ aeskulap-0.2.2b1/imagepool/dicomdir.cpp	2011-02-14 10:27:10.000000000 +0100
-@@ -151,21 +151,21 @@
+--- a/imagepool/dicomdir.cpp
++++ b/imagepool/dicomdir.cpp
+@@ -151,21 +151,21 @@ namespace ImagePool {
              DcmDataset study;
              DcmElement *el;
  
@@ -37,7 +35,7 @@
                  study.insert(el);
              resultslot(create_query_study(&study, std::string("DICOMDIR:") + dicomdir));
          }
-@@ -221,21 +221,21 @@
+@@ -221,21 +221,21 @@ namespace ImagePool {
              DcmDataset series;
              DcmElement *el;
  

Modified: trunk/packages/aeskulap/trunk/debian/patches/oflog.patch
===================================================================
--- trunk/packages/aeskulap/trunk/debian/patches/oflog.patch	2013-12-12 08:40:32 UTC (rev 15507)
+++ trunk/packages/aeskulap/trunk/debian/patches/oflog.patch	2013-12-12 09:04:25 UTC (rev 15508)
@@ -1,8 +1,9 @@
-Index: aeskulap-0.2.2b1/configure
-===================================================================
---- aeskulap-0.2.2b1.orig/configure	2011-02-14 13:39:50.000000000 +0100
-+++ aeskulap-0.2.2b1/configure	2011-02-14 13:38:39.000000000 +0100
-@@ -24361,7 +24361,7 @@
+Author: ??
+Description: Do not link against oflog library
+
+--- a/configure
++++ b/configure
+@@ -24361,7 +24361,7 @@ fi
  
  
  DCMTK_CFLAGS="-DHAVE_CONFIG_H -I\$(prefix)/include"
@@ -11,11 +12,9 @@
  
  if test "x${prefix}" = "xNONE"; then
      packageprefix=${ac_default_prefix}
-Index: aeskulap-0.2.2b1/configure.in
-===================================================================
---- aeskulap-0.2.2b1.orig/configure.in	2011-02-14 13:39:50.000000000 +0100
-+++ aeskulap-0.2.2b1/configure.in	2011-02-14 13:38:48.000000000 +0100
-@@ -103,7 +103,7 @@
+--- a/configure.in
++++ b/configure.in
+@@ -103,7 +103,7 @@ AC_SUBST(DCMTK_CFLAGS)
  AC_SUBST(DCMTK_LIBS)
  
  DCMTK_CFLAGS="-DHAVE_CONFIG_H -I\$(prefix)/include"

Modified: trunk/packages/aeskulap/trunk/debian/patches/patientsname.patch
===================================================================
--- trunk/packages/aeskulap/trunk/debian/patches/patientsname.patch	2013-12-12 08:40:32 UTC (rev 15507)
+++ trunk/packages/aeskulap/trunk/debian/patches/patientsname.patch	2013-12-12 09:04:25 UTC (rev 15508)
@@ -1,8 +1,9 @@
-Index: aeskulap-0.2.2b1/imagepool/netloader.cpp
-===================================================================
---- aeskulap-0.2.2b1.orig/imagepool/netloader.cpp	2011-02-14 11:48:44.000000000 +0100
-+++ aeskulap-0.2.2b1/imagepool/netloader.cpp	2011-02-14 11:48:47.000000000 +0100
-@@ -112,7 +112,7 @@
+Author: ??
+Description: Fix Dicom element name "DCM_PatientName"
+
+--- a/imagepool/netloader.cpp
++++ b/imagepool/netloader.cpp
+@@ -112,7 +112,7 @@ bool NetLoader::run() {
  		e->putString("STUDY");
  		query.insert(e);
  
@@ -11,11 +12,9 @@
  		query.insert(e);
  
  		e = newDicomElement(DCM_PatientID);
-Index: aeskulap-0.2.2b1/imagepool/netquery.cpp
-===================================================================
---- aeskulap-0.2.2b1.orig/imagepool/netquery.cpp	2011-02-14 11:48:44.000000000 +0100
-+++ aeskulap-0.2.2b1/imagepool/netquery.cpp	2011-02-14 11:48:47.000000000 +0100
-@@ -210,7 +210,7 @@
+--- a/imagepool/netquery.cpp
++++ b/imagepool/netquery.cpp
+@@ -210,7 +210,7 @@ void query_from_net(
  	e->putString(dicom_enc.c_str());
  	query.insert(e);
  
@@ -24,7 +23,7 @@
  	e->putString(patientsname.c_str());
  	query.insert(e);
  
-@@ -225,10 +225,10 @@
+@@ -225,10 +225,10 @@ void query_from_net(
  	e->putString(modality.c_str());
  	query.insert(e);
  
@@ -37,11 +36,9 @@
  	query.insert(e);
  
  	e = newDicomElement(DCM_StudyDate);
-Index: aeskulap-0.2.2b1/imagepool/poolinstance.cpp
-===================================================================
---- aeskulap-0.2.2b1.orig/imagepool/poolinstance.cpp	2011-02-14 12:10:41.000000000 +0100
-+++ aeskulap-0.2.2b1/imagepool/poolinstance.cpp	2011-02-14 12:11:04.000000000 +0100
-@@ -515,7 +515,7 @@
+--- a/imagepool/poolinstance.cpp
++++ b/imagepool/poolinstance.cpp
+@@ -515,7 +515,7 @@ Glib::RefPtr<ImagePool::Instance> Instan
  	}
  
  	// set ManufacturersModelName
@@ -50,7 +47,7 @@
  		r->m_model = ofstr.c_str();
  	}
  	
-@@ -565,12 +565,12 @@
+@@ -565,12 +565,12 @@ Glib::RefPtr<ImagePool::Instance> Instan
  	//std::cout << "intercept: " << r->m_intercept << std::endl;
  
  	// study params


