[med-svn] r12856 - in trunk/packages/ginkgocadx/trunk/debian: . patches
Dmitry Smirnov
onlyjob-guest at alioth.debian.org
Mon Jan 28 08:52:02 UTC 2013
Author: onlyjob-guest
Date: 2013-01-28 08:52:01 +0000 (Mon, 28 Jan 2013)
New Revision: 12856
Added:
trunk/packages/ginkgocadx/trunk/debian/docs
trunk/packages/ginkgocadx/trunk/debian/links
trunk/packages/ginkgocadx/trunk/debian/lintian-overrides
Removed:
trunk/packages/ginkgocadx/trunk/debian/ginkgocadx.lintian-overrides
trunk/packages/ginkgocadx/trunk/debian/patches/fix-path.patch
trunk/packages/ginkgocadx/trunk/debian/patches/fixwhatis.patch
Modified:
trunk/packages/ginkgocadx/trunk/debian/changelog
trunk/packages/ginkgocadx/trunk/debian/control
trunk/packages/ginkgocadx/trunk/debian/copyright
trunk/packages/ginkgocadx/trunk/debian/install
trunk/packages/ginkgocadx/trunk/debian/manpages
trunk/packages/ginkgocadx/trunk/debian/patches/fix-desktop.patch
trunk/packages/ginkgocadx/trunk/debian/patches/fix-spelling.patch
trunk/packages/ginkgocadx/trunk/debian/patches/series
trunk/packages/ginkgocadx/trunk/debian/rules
Log:
New upstream version [3.1.0.498.20]
Modified: trunk/packages/ginkgocadx/trunk/debian/changelog
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/changelog 2013-01-28 08:51:43 UTC (rev 12855)
+++ trunk/packages/ginkgocadx/trunk/debian/changelog 2013-01-28 08:52:01 UTC (rev 12856)
@@ -1,3 +1,23 @@
+ginkgocadx (3.1.0.498.20-1~exp0) experimental; urgency=low
+
+ * New upstream release [December 2012].
+ - "New version available" (Closes: #686376).
+ - "Unable to close application" (Closes: #684990).
+ - "Package appears to be non-free" (Closes: #688952).
+ * new build-dependency: libfreetype6-dev
+ * install upstream changelog.
+ * install DICOM_Conformance-GinkgoCADx.pdf (docs).
+ * disabled chrpath invocation, it is no longer needed.
+ * patchworks:
+ + fix-desktop.patch is updated to use "Graphics" as main cathegory.
+ + fix-spelling.patch is updated.
+ - fix-path.patch is dropped (applied-upstream).
+ - fixwhatis.patch is dropped (applied-upstream).
+ * updated lintian-overrides.
+ * dropped obsolete "DM-Upload-Allowed: yes".
+
+ -- Dmitry Smirnov <onlyjob at member.fsf.org> Mon, 28 Jan 2013 04:56:27 +1100
+
ginkgocadx (2.14.0.4972-1) UNRELEASED; urgency=low
* New upstream release.
Modified: trunk/packages/ginkgocadx/trunk/debian/control
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/control 2013-01-28 08:51:43 UTC (rev 12855)
+++ trunk/packages/ginkgocadx/trunk/debian/control 2013-01-28 08:52:01 UTC (rev 12856)
@@ -11,8 +11,9 @@
,cmake (>= 2.8)
,libcairo2-dev (>= 1.8.10)
,libdcmtk2-dev (>= 3.6.0)
+ ,libfftw3-dev
+ ,libfreetype6-dev
,libgdcm2-dev
- ,libfftw3-dev
,libgtk2.0-dev
,libinsighttoolkit3-dev (>= 3.20.0)
,libmysqlclient-dev (>= 5.1.57)
@@ -23,6 +24,11 @@
,libwrap0-dev
,libwxgtk2.8-dev (>= 2.8.10)
,libxml2-dev
+# upstream build system also checking for presence of the following packages
+# that apparently are not used:
+# ,libgdcm-tools
+# ,libvtk5-qt4-dev
+# ,libvtkgdcm2-dev
Standards-Version: 3.9.4
Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/ginkgocadx/trunk/
Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/ginkgocadx/trunk/
Modified: trunk/packages/ginkgocadx/trunk/debian/copyright
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/copyright 2013-01-28 08:51:43 UTC (rev 12855)
+++ trunk/packages/ginkgocadx/trunk/debian/copyright 2013-01-28 08:52:01 UTC (rev 12856)
@@ -5,10 +5,10 @@
Files: *
Copyright: 2011 MetaEmotion Healthcare. http://healthcare.metaemotion.com
- 2008-2010 MetaEmotion S. L.
+ 2008-2012 MetaEmotion S. L. http://ginkgo-cadx.com
License: LGPL-3+
-Files: src/cadxcore/yasper/yasper.h
+Files: src/cadxcore/api/autoptr.h
Copyright: 2005-2007 Alex Rubinsteyn
License: zlib-license
This software is provided 'as-is', without any express or implied
@@ -58,7 +58,7 @@
src/cadxcore/sqlite/sqlite3ext.h
src/cadxcore/sqlite/sqlite3.h
Copyright: Copyright (C) 2001-2011 Hwaci
-License: public domain
+License: public-domain
For a definition of public domain see:
http://www.gnu.org/philosophy/categories.html#PublicDomainSoftware
@@ -66,7 +66,35 @@
src/cadxcore/vtk/command/*
src/cadxcore/vtk/interactor/*
Copyright: 2007 INRIA - Asclepios Project
-License: BSD license
+License: BSD-like
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ .
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ .
+ * Neither the name of INRIA or ASCLEPIOS, nor the names of any contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+ .
+ * Modified source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS ``AS IS''
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
+ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+Comment:
See text of license at https://gforge.inria.fr/projects/vtkinria3d/
Files: src/cadxcore/VTKInria3D/wxVTK/*
@@ -76,7 +104,7 @@
src/cadxcore/vtk/vtkSmartVolumeMapper.cxx
src/cadxcore/vtk/vtkSmartVolumeMapper.h
Copyright: Copyright (c) 1993-2008 Ken Martin, Will Schroeder, Bill Lorensen
-License: open source
+License: open-source
This is an open-source copyright as follows:
.
Copyright (c) 1993-2008 Ken Martin, Will Schroeder, Bill Lorensen
@@ -109,7 +137,7 @@
Files: src/cadxcore/itk/*
Copyright: 2002 Insight Consortium.
-License: BSD-like license
+License: BSD-like
Copyright (c) 1999-2008 Insight Software Consortium All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
@@ -137,22 +165,10 @@
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-Files: src/cadxcore/xmlrpc/base64.h
-Copyright: Konstantin Pilipchuk
-License: LGPL-2.1
-Comment:
- There is no explicit license mentioned in this file.
- As other projects, that use this file, are under LGPL license, one could
- assume the same here.
-
-Files: src/cadxcore/xmlrpc/*
-Copyright: 2002-2003 by Chris Morley
-License: LGPL-2.1+
-
Files: src/cadxcore/endpoint/inet_ntop.c
Copyright: 1996 by Internet Software Consortium.
Modified 2003-03-27 Jeff Connelly to compile under C++
-License: public domain
+License: public-domain
Permission to use, copy, modify, and distribute this software for any
purpose with or without fee is hereby granted, provided that the above
copyright notice and this permission notice appear in all copies.
@@ -166,27 +182,31 @@
ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
-Files: src/cadxcore/wx/wxsqlite3/*
-Copyright: Ulrich Telle
-License: wxWindows licence
-
-Files: src/cadxcore/wx/thumbnailctrl/thumbnailctrl.*
-Copyright: Julian Smart
-License: wxWindows licence
-
Files: src/cadxcore/wx/maxskedtextctrl/*
Copyright: Thomas Härtel
-License: wxWindows licence
+License: wxWindows
Files: src/cadxcore/wx/propgrid/*
-Copyright: Jaakko Salli
-License: wxWindows licence
+Copyright: 2005 Jaakko Salli
+License: wxWindows
+Files: src/cadxcore/wx/thumbnailctrl/thumbnailctrl.*
+Copyright: Julian Smart
+License: wxWindows
+
Files: src/cadxcore/wx/treelistctrl/*
Copyright: 2004-2011 Robert Roebling, Julian Smart,
Alberto Griggio, Vadim Zeitlin, Otto Wyss, Ronan Chartois
-License: wxWindows licence
+License: wxWindows
+Files: src/cadxcore/wx/wxhttpengine/*
+Copyright: 2001-2005 Angelo Mandato (http://www.spaceblue.com)
+License: wxWindows
+
+Files: src/cadxcore/wx/wxsqlite3/*
+Copyright: Ulrich Telle
+License: wxWindows
+
Files: lang/de/*.po
lang/ja/*.po
lang/pt/*.po
@@ -217,34 +237,6 @@
The complete text of the GNU General Public License version 2
can be found in "/usr/share/common-licenses/GPL-2".
-License: LGPL-2.1+
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
- .
- This library 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
- Lesser General Public License for more details.
- .
- The complete text fo the GNU Lesser General Public License
- version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1"
-
-License: LGPL-2.1
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation;
- version 2.1 of the License.
- .
- This library 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
- Lesser General Public License for more details.
- .
- The complete text fo the GNU Lesser General Public License
- version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1"
-
License: LGPL-3+
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License version 3
@@ -261,7 +253,7 @@
The complete text fo the GNU Lesser General Public License version 3
can be found in "/usr/share/common-licenses/LGPL-3"
-License: wxWindows licence
+License: wxWindows
wxWindows Library Licence, Version 3.1
======================================
.
@@ -272,12 +264,12 @@
.
WXWINDOWS LIBRARY LICENCE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- .
+ .
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public Licence as published by
the Free Software Foundation; either version 2 of the Licence, or (at
your option) any later version.
- .
+ .
This library 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 Library
@@ -310,6 +302,6 @@
accordingly.
.
4. If you write modifications of your own for this library, it is your
- choice whether to permit this exception to apply to your modifications.
+ choice whether to permit this exception to apply to your modifications.
If you do not wish that, you must delete the exception notice from such
code and/or adjust the licensing conditions notice accordingly.
Added: trunk/packages/ginkgocadx/trunk/debian/docs
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/docs (rev 0)
+++ trunk/packages/ginkgocadx/trunk/debian/docs 2013-01-28 08:52:01 UTC (rev 12856)
@@ -0,0 +1 @@
+doc/DICOM_Conformance-GinkgoCADx.pdf
Deleted: trunk/packages/ginkgocadx/trunk/debian/ginkgocadx.lintian-overrides
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/ginkgocadx.lintian-overrides 2013-01-28 08:51:43 UTC (rev 12855)
+++ trunk/packages/ginkgocadx/trunk/debian/ginkgocadx.lintian-overrides 2013-01-28 08:52:01 UTC (rev 12856)
@@ -1,7 +0,0 @@
-# the software has been developed in Spain, and this error corresponds to
-# some spanish text within the code
-spelling-error-in-binary usr/lib/ginkgocadx/libCADxCore.so.2.* Posible Possible
-
-# Hardening false-positives:
-hardening-no-fortify-functions usr/lib/ginkgocadx/Plugins/liblightvisualizator.so.2.*
-hardening-no-fortify-functions usr/lib/ginkgocadx/Plugins/libvisualizator.so.2.*
Modified: trunk/packages/ginkgocadx/trunk/debian/install
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/install 2013-01-28 08:51:43 UTC (rev 12855)
+++ trunk/packages/ginkgocadx/trunk/debian/install 2013-01-28 08:52:01 UTC (rev 12856)
@@ -1,2 +1,3 @@
-src/cadxcore/resources/*.xml usr/lib/ginkgocadx
-*.desktop usr/share/applications
+src/ginkgocadx/*.desktop usr/share/applications
+usr/share/ginkgocadx
+usr/bin
Added: trunk/packages/ginkgocadx/trunk/debian/links
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/links (rev 0)
+++ trunk/packages/ginkgocadx/trunk/debian/links 2013-01-28 08:52:01 UTC (rev 12856)
@@ -0,0 +1 @@
+/usr/share/ginkgocadx/resources/cadxcore/logos/ginkgo48x48.png /usr/share/pixmaps/ginkgocadx.png
Added: trunk/packages/ginkgocadx/trunk/debian/lintian-overrides
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/lintian-overrides (rev 0)
+++ trunk/packages/ginkgocadx/trunk/debian/lintian-overrides 2013-01-28 08:52:01 UTC (rev 12856)
@@ -0,0 +1,6 @@
+# the software has been developed in Spain, and this error corresponds to
+# some spanish text within the code
+spelling-error-in-binary usr/bin/ginkgocadx Posible Possible
+
+# Acknowledged
+data.tar.xz-member-without-dpkg-pre-depends
Modified: trunk/packages/ginkgocadx/trunk/debian/manpages
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/manpages 2013-01-28 08:51:43 UTC (rev 12855)
+++ trunk/packages/ginkgocadx/trunk/debian/manpages 2013-01-28 08:52:01 UTC (rev 12856)
@@ -1 +1 @@
-man/*.1
+src/ginkgocadx/*.1
Modified: trunk/packages/ginkgocadx/trunk/debian/patches/fix-desktop.patch
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/patches/fix-desktop.patch 2013-01-28 08:51:43 UTC (rev 12855)
+++ trunk/packages/ginkgocadx/trunk/debian/patches/fix-desktop.patch 2013-01-28 08:52:01 UTC (rev 12856)
@@ -1,17 +1,19 @@
-Last-Update: 2012-08-18
+Last-Update: 2013-01-28
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
-Forwarded: 2012-08-18
+Forwarded: no
Description: minor .desktop file cleanup (lintianisation)
This patch fixes the following problem identified by 'desktop-file-validate':
- value "MedicalSoftware" in key "Categories" in group "Desktop Entry" requires
- another category to be present among the following categories: Education;Science
+ "Office;MedicalSoftware;Education;Science;" for key "Categories" in
+ group "Desktop Entry" contains more than one main category; application
+ might appear more than once in the application menu
---- a/ginkgocadx.desktop
-+++ b/ginkgocadx.desktop
-@@ -11,5 +11,5 @@
+--- a/src/ginkgocadx/ginkgocadx.desktop
++++ b/src/ginkgocadx/ginkgocadx.desktop
+@@ -10,6 +10,6 @@
+ Icon=ginkgocadx
TryExec=ginkgocadx
Exec=/usr/bin/ginkgocadx %F
Terminal=false
--Categories=Office;MedicalSoftware;
-+Categories=Office;MedicalSoftware;Education;Science;
+-Categories=Office;MedicalSoftware;Education;Science;
++Categories=Graphics;MedicalSoftware;Science;
MimeType=application/dicom;
Deleted: trunk/packages/ginkgocadx/trunk/debian/patches/fix-path.patch
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/patches/fix-path.patch 2013-01-28 08:51:43 UTC (rev 12855)
+++ trunk/packages/ginkgocadx/trunk/debian/patches/fix-path.patch 2013-01-28 08:52:01 UTC (rev 12856)
@@ -1,22 +0,0 @@
-Last-Update: 2012-08-18
-Author: Dmitry Smirnov <onlyjob at member.fsf.org>
-Forwarded: 2012-08-18
-Description: fix FTBFS due to renamed files
-
---- a/src/cadxcore/CMakeLists.txt
-+++ b/src/cadxcore/CMakeLists.txt
-@@ -209,10 +209,10 @@
- LINK_INTERFACE_LIBRARIES ""
- INSTALL_RPATH_USE_LINK_PATH FALSE )
- INSTALL(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/ginkgocadx)
--INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/es/ginkgocadxcore.mo DESTINATION share/ginkgocadx/lang/es)
--INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/ja/ginkgocadxcore.mo DESTINATION share/ginkgocadx/lang/ja)
--INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/de/ginkgocadxcore.mo DESTINATION share/ginkgocadx/lang/de)
--INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/tr/ginkgocadxcore.mo DESTINATION share/ginkgocadx/lang/tr)
-+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/es/cadxcore.mo DESTINATION share/ginkgocadx/lang/es)
-+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/ja/cadxcore.mo DESTINATION share/ginkgocadx/lang/ja)
-+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/de/cadxcore.mo DESTINATION share/ginkgocadx/lang/de)
-+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/tr/cadxcore.mo DESTINATION share/ginkgocadx/lang/tr)
- INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/conformance.xml DESTINATION share/ginkgocadx)
- ################ LIBS ################
-
Modified: trunk/packages/ginkgocadx/trunk/debian/patches/fix-spelling.patch
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/patches/fix-spelling.patch 2013-01-28 08:51:43 UTC (rev 12855)
+++ trunk/packages/ginkgocadx/trunk/debian/patches/fix-spelling.patch 2013-01-28 08:52:01 UTC (rev 12856)
@@ -1,43 +1,31 @@
-Last-Update: 2012-08-18
+Last-Update: 2013-01-28
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
-Forwarded: 2012-08-18
+Forwarded: no
Description: minor spelling corrections (lintianisation)
---- a/src/cadxcore/main/controllers/pacscontroller.cpp
-+++ b/src/cadxcore/main/controllers/pacscontroller.cpp
-@@ -136,7 +136,7 @@
- GetRutaImagenTemp(PacienteUId,EstudioUId,SerieUId,ImagenUId, GNC::GCS::ControladorHistorial::Instance()->GetGinkgoDicomDir(),rutaStd);
-
- if (!wxRenameFile(FROMPATH(fileName), FROMPATH(rutaStd))) {
-- LOG_ERROR("PACSCONTROLLER-STORE", "Error writting file to temp dir");
-+ LOG_ERROR("PACSCONTROLLER-STORE", "Error writing file to temp dir");
+--- a/src/cadxcore/api/icommand.cpp
++++ b/src/cadxcore/api/icommand.cpp
+@@ -190,9 +190,9 @@
}
- }
---- a/src/cadxcore/commands/dicomizecommand.cpp
-+++ b/src/cadxcore/commands/dicomizecommand.cpp
-@@ -368,7 +368,7 @@
- }
+ std::string IPersistentCommand::getClassUID()
+ {
+- throw new GNC::GCS::IException("Method has to be overriden");
++ throw new GNC::GCS::IException("Method has to be overridden");
}
- catch (...) {
-- m_pIntegracionParams->m_mensajeError = _Std("Unkown error in dicomization process");
-+ m_pIntegracionParams->m_mensajeError = _Std("Unknown error in dicomization process");
- LOG_ERROR("Internal error in dicomization process", "DICOMIZATION");
- if (pI2D != NULL) {
- pCI->LiberarInstanciaDeImportacion(pI2D);
---- a/src/cadxcore/main/controllers/dcmtk/dicommoveassociation.cpp
-+++ b/src/cadxcore/main/controllers/dcmtk/dicommoveassociation.cpp
-@@ -382,11 +382,11 @@
- GNC::GCS::Permisos::EstadoPermiso estado = GNC::GCS::ControladorPermisos::Instance()->Get("core.pacs.limits", "study_size");
- if (estado) {
- if (estado.ObtenerValor<long>() < (caller->m_bytesDescargados / 1024) ) {
-- caller->m_errorMessage = _Std("Study download size limit exceded");
-+ caller->m_errorMessage = _Std("Study download size limit exceeded");
- cbdata->pCaller->Stop();
- rsp->DimseStatus = STATUS_MOVE_Cancel_SubOperationsTerminatedDueToCancelIndication;
- ASC_releaseAssociation(cbdata->assoc);
-- LOG_INFO(caller->ambitolog, "Study download size limit exceded");
-+ LOG_INFO(caller->ambitolog, "Study download size limit exceeded");
- return;
- }
- }
+
+ long IPersistentCommand::getIdBBDD()
+ {
+--- a/src/cadxcore/sqlite/sqlite3.c
++++ b/src/cadxcore/sqlite/sqlite3.c
+@@ -34840,9 +34840,9 @@
+ **
+ ** This file implements the default page cache implementation (the
+ ** sqlite3_pcache interface). It also contains part of the implementation
+ ** of the SQLITE_CONFIG_PAGECACHE and sqlite3_release_memory() features.
+-** If the default page cache implementation is overriden, then neither of
++** If the default page cache implementation is overridden, then neither of
+ ** these two features are available.
+ */
+
+
Deleted: trunk/packages/ginkgocadx/trunk/debian/patches/fixwhatis.patch
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/patches/fixwhatis.patch 2013-01-28 08:51:43 UTC (rev 12855)
+++ trunk/packages/ginkgocadx/trunk/debian/patches/fixwhatis.patch 2013-01-28 08:52:01 UTC (rev 12856)
@@ -1,15 +0,0 @@
-Last-Update: 2012-08-18
-Forwarded: 2012-08-18
-Description: minor man file correction
-
---- ginkgocadx-2.12.0.4889.orig/man/ginkgocadx.1
-+++ ginkgocadx-2.12.0.4889/man/ginkgocadx.1
-@@ -5,7 +5,7 @@
- .TH Ginkgo\ CADx 1 "2011 June 22nd" "Manual for Ginkgo CADx"
-
- .SH NAME
--Ginkgo CADx \- a medical image (DICOM) viewer
-+ginkgocadx \- a medical image (DICOM) viewer
-
- .SH SYNOPSIS
- .B ginkgocadx
Modified: trunk/packages/ginkgocadx/trunk/debian/patches/series
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/patches/series 2013-01-28 08:51:43 UTC (rev 12855)
+++ trunk/packages/ginkgocadx/trunk/debian/patches/series 2013-01-28 08:52:01 UTC (rev 12856)
@@ -1,4 +1,2 @@
fix-desktop.patch
-fix-path.patch
fix-spelling.patch
-fixwhatis.patch
Modified: trunk/packages/ginkgocadx/trunk/debian/rules
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/rules 2013-01-28 08:51:43 UTC (rev 12855)
+++ trunk/packages/ginkgocadx/trunk/debian/rules 2013-01-28 08:52:01 UTC (rev 12856)
@@ -5,24 +5,28 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+# minimise needless linking
+export DEB_LDFLAGS_MAINT_APPEND= -Wl,--as-needed
+
pkg=ginkgocadx
-
+DH=--buildsystem=cmake --sourcedirectory=src --parallel
%:
- dh $@ --buildsystem=cmake --parallel
+ dh $@ $(DH)
override_dh_auto_configure:
- dh_auto_configure -- \
- -DCMAKE_BUILD_TYPE:STRING=RELEASE \
- -DCMAKE_CXX_FLAGS_RELEASE="$(CXXFLAGS) $(CPPFLAGS)" \
- -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed $(LDFLAGS)"
+ dh_auto_configure $(DH) -- \
+ -DCMAKE_BUILD_TYPE:STRING=RELEASE \
+ -DCMAKE_CXX_FLAGS_RELEASE="$(CXXFLAGS) $(CPPFLAGS)"
override_dh_auto_install:
- # install icon
- install -m644 -D src/cadxcore/resources/logos/ginkgo48x48.png debian/$(pkg)/usr/share/pixmaps/ginkgocadx.png
- dh_auto_install
- # Hack around useless rpath definitions
- /usr/bin/chrpath -r /usr/lib/ginkgocadx debian/$(pkg)/usr/bin/$(pkg)
+ dh_auto_install $(DH) --destdir=$(CURDIR)/debian/tmp
+
+ ## Hack around useless rpath definitions
+ #/usr/bin/chrpath -r /usr/lib/ginkgocadx debian/$(pkg)/usr/bin/$(pkg)
+override_dh_installchangelogs:
+ dh_installchangelogs changelog_opensource.txt
+
## avoid post{inst|rm}-useless-call-to-ldconfig
override_dh_makeshlibs:
dh_makeshlibs --noscripts
More information about the debian-med-commit
mailing list