[med-svn] r12082 - in trunk/packages/ginkgocadx/trunk/debian: . patches source
Dmitry Smirnov
onlyjob-guest at alioth.debian.org
Fri Aug 17 16:19:27 UTC 2012
Author: onlyjob-guest
Date: 2012-08-17 16:19:27 +0000 (Fri, 17 Aug 2012)
New Revision: 12082
Added:
trunk/packages/ginkgocadx/trunk/debian/patches/fix-desktop.patch
trunk/packages/ginkgocadx/trunk/debian/patches/fix-path.patch
trunk/packages/ginkgocadx/trunk/debian/patches/fix-spelling.patch
trunk/packages/ginkgocadx/trunk/debian/source/options
Modified:
trunk/packages/ginkgocadx/trunk/debian/changelog
trunk/packages/ginkgocadx/trunk/debian/control
trunk/packages/ginkgocadx/trunk/debian/copyright
trunk/packages/ginkgocadx/trunk/debian/ginkgocadx.lintian-overrides
trunk/packages/ginkgocadx/trunk/debian/patches/fixwhatis.patch
trunk/packages/ginkgocadx/trunk/debian/patches/series
trunk/packages/ginkgocadx/trunk/debian/rules
Log:
new upstream version [2.14.0.4972] & packaging update
Modified: trunk/packages/ginkgocadx/trunk/debian/changelog
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/changelog 2012-08-17 14:52:47 UTC (rev 12081)
+++ trunk/packages/ginkgocadx/trunk/debian/changelog 2012-08-17 16:19:27 UTC (rev 12082)
@@ -1,3 +1,30 @@
+ginkgocadx (2.14.0.4972-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ * debian/control:
+ + Build-Depends list is re-formatted and alphabetised.
+ + added Dmitry to uploaders.
+ * debian/copyright:
+ + audit & update.
+ + to copyright-format-1.0
+ - removed '©' characters.
+ * debian/rules:
+ + passing CXXFLAGS to fix Hardening.
+ + pass --as-needed to reduce needless linking.
+ + install missing desktop icon.
+ + override dh_makeshlibs to avoid 'useless-call-to-ldconfig'.
+ - removed needless calls to 'dpkg-buildflags' (cleanup).
+ * new patches:
+ + fix-desktop.patch to correct .desktop file validation.
+ + fix-path.patch to fix FTBFS due to renamed files.
+ + fix-spelling.patch to correct spelling (lintianisation).
+ * lintian-overrides:
+ - removed unused and incorrect entries.
+ + added overrides for hardening false positives.
+ * debian source compression to .xz
+
+ -- Dmitry Smirnov <onlyjob at member.fsf.org> Fri, 17 Aug 2012 22:27:02 +1000
+
ginkgocadx (2.12.0.4889-1) unstable; urgency=low
* New upstream version
Modified: trunk/packages/ginkgocadx/trunk/debian/control
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/control 2012-08-17 14:52:47 UTC (rev 12081)
+++ trunk/packages/ginkgocadx/trunk/debian/control 2012-08-17 16:19:27 UTC (rev 12082)
@@ -2,13 +2,28 @@
Section: science
Priority: optional
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
-Uploaders: Andreas Tille <tille at debian.org>, Thorsten Alteholz <debian at alteholz.de>, Mathieu Malaterre <mathieu.malaterre at gmail.com>
+Uploaders: Andreas Tille <tille at debian.org>
+ ,Thorsten Alteholz <debian at alteholz.de>
+ ,Mathieu Malaterre <mathieu.malaterre at gmail.com>
+ ,Dmitry Smirnov <onlyjob at member.fsf.org>
DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 9), cmake (>= 2.8), libgtk2.0-dev, libxml2-dev, libssl-dev, libwrap0-dev,
- libwxgtk2.8-dev (>= 2.8.10), libvtk5-dev (>= 5.6.0), libinsighttoolkit3-dev (>= 3.20.0),
- libdcmtk2-dev (>= 3.6.0), libcairo2-dev (>= 1.8.10),
- libgdcm2-dev, libwrap0, libfftw3-dev, chrpath, libsqlite3-dev,
- libmysqlclient-dev (>= 5.1.57)
+Build-Depends: debhelper (>= 9)
+ ,chrpath
+ ,cmake (>= 2.8)
+ ,libcairo2-dev (>= 1.8.10)
+ ,libdcmtk2-dev (>= 3.6.0)
+ ,libgdcm2-dev
+ ,libfftw3-dev
+ ,libgtk2.0-dev
+ ,libinsighttoolkit3-dev (>= 3.20.0)
+ ,libmysqlclient-dev (>= 5.1.57)
+ ,libsqlite3-dev
+ ,libssl-dev
+ ,libvtk5-dev (>= 5.6.0)
+ ,libwrap0
+ ,libwrap0-dev
+ ,libwxgtk2.8-dev (>= 2.8.10)
+ ,libxml2-dev
Standards-Version: 3.9.3
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 2012-08-17 14:52:47 UTC (rev 12081)
+++ trunk/packages/ginkgocadx/trunk/debian/copyright 2012-08-17 16:19:27 UTC (rev 12082)
@@ -1,29 +1,32 @@
-Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=202
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Ginkgo CADx
Upstream-Contact: Carlos Barrales <carlos.barrales at metaemotion.com>
Source: http://ginkgo-cadx.com
Files: *
-Copyright: © 2011 MetaEmotion Healthcare. http://healthcare.metaemotion.com
+Copyright: 2011 MetaEmotion Healthcare. http://healthcare.metaemotion.com
+ 2008-2010 MetaEmotion S. L.
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
- as published by the Free Software Foundation.
- .
- This package 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 General Public License for more details.
- .
- You should have received a copy of the GNU Lesser General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
- .
- On Debian systems, the complete text fo the GNU Lesser General Public License
- version 3 can be found in "/usr/share/common-licenses/LGPL-3"
Files: src/cadxcore/yasper/yasper.h
-Copyright: © 2005-2007 Alex Rubinsteyn
+Copyright: 2005-2007 Alex Rubinsteyn
License: zlib-license
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+ .
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+ .
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+Comment:
See text of license at http://www.gzip.org/zlib/zlib_license.html
Files: src/cadxcore/main/controllers/dcmtk/libi2d/i2d.cpp
@@ -42,6 +45,12 @@
src/cadxcore/main/controllers/dcmtk/ofstd/*
Copyright: Copyright (C) 2001-2007, OFFIS
License: public domain
+ THIS SOFTWARE IS MADE AVAILABLE, AS IS, AND OFFIS MAKES NO WARRANTY
+ REGARDING THE SOFTWARE, ITS PERFORMANCE, ITS MERCHANTABILITY OR
+ FITNESS FOR ANY PARTICULAR USE, FREEDOM FROM ANY COMPUTER DISEASES OR
+ ITS CONFORMITY TO ANY SPECIFICATION. THE ENTIRE RISK AS TO QUALITY AND
+ PERFORMANCE OF THE SOFTWARE IS WITH THE USER.
+Comment:
For a definition of public domain see:
http://www.gnu.org/philosophy/categories.html#PublicDomainSoftware
@@ -56,7 +65,7 @@
Files: src/cadxcore/VTKInria3D/vtkVISUManagement/*
src/cadxcore/vtk/command/*
src/cadxcore/vtk/interactor/*
-Copyright: © 2007 INRIA - Asclepios Project
+Copyright: 2007 INRIA - Asclepios Project
License: BSD license
See text of license at https://gforge.inria.fr/projects/vtkinria3d/
@@ -73,76 +82,75 @@
Copyright (c) 1993-2008 Ken Martin, Will Schroeder, Bill Lorensen
All rights reserved.
.
- Redistribution and use in source and binary forms, with or without
+ 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,
+ * 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
+ * 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 name of Ken Martin, Will Schroeder, or Bill Lorensen nor the names
- of any contributors may be used to endorse or promote products derived from
+ * Neither name of Ken Martin, Will Schroeder, or Bill Lorensen nor the names
+ of any contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
.
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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,
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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.
Files: src/cadxcore/itk/*
-Copyright: © 2002 Insight Consortium.
+Copyright: 2002 Insight Consortium.
License: BSD-like license
- Copyright (c) 1999-2008 Insight Software Consortium All rights reserved.
- Redistribution and use in source and binary forms, with or without
+ 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:
.
- * Redistributions of source code must retain the above copyright notice, this
+ * 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
+ * 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.
- * The name of the Insight Software Consortium, nor the names of any
- consortium members, nor of any contributors, may be used to endorse or
- promote products derived from this software without specific prior written
+ * The name of the Insight Software Consortium, nor the names of any
+ consortium members, nor 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
+ * 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
+ 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.
+ (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.
Files: src/cadxcore/xmlrpc/base64.h
Copyright: Konstantin Pilipchuk
-License: LGPL 2.1
- There is no explicit license mentioned in this file.
- As other projects, that use this file, are under LGPL license, one could
+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+
- On Debian systems, the complete text fo the GNU Lesser General Public License
- version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1"
+Copyright: 2002-2003 by Chris Morley
+License: LGPL-2.1+
Files: src/cadxcore/endpoint/inet_ntop.c
-Copyright: © 1996 by Internet Software Consortium.
+Copyright: 1996 by Internet Software Consortium.
Modified 2003-03-27 Jeff Connelly to compile under C++
License: public domain
Permission to use, copy, modify, and distribute this software for any
@@ -159,8 +167,101 @@
SOFTWARE.
Files: src/cadxcore/wx/wxsqlite3/*
-Copyright: © Ulrich Telle
+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
+
+Files: src/cadxcore/wx/propgrid/*
+Copyright: Jaakko Salli
+License: wxWindows licence
+
+Files: src/cadxcore/wx/treelistctrl/*
+Copyright: 2004-2011 Robert Roebling, Julian Smart,
+ Alberto Griggio, Vadim Zeitlin, Otto Wyss, Ronan Chartois
+License: wxWindows licence
+
+Files: lang/de/*.po
+ lang/ja/*.po
+ lang/pt/*.po
+ lang/tr/*.po
+Copyright: 2011-2012 Rosetta Contributors
+ 2011-2012 Canonical Ltd
+License: LGPL-3+
+
+Files: debian/*
+Copyright: 2011-2012 Andreas Tille <tille at debian.org>
+ 2011 Carlos Barrales Ruiz <carlos.barrales at metaemotion.com>
+ 2012 Dmitry Smirnov <onlyjob at member.fsf.org>
+ 2011 Thorsten Alteholz <debian at alteholz.de>
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package 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 General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ 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
+ as published by the Free Software Foundation.
+ .
+ This package 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 General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ 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
wxWindows Library Licence, Version 3.1
======================================
.
@@ -212,45 +313,3 @@
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.
-
-Files: src/cadxcore/wx/thumbnailctrl/thumbnailctrl.*
-Copyright: © Julian Smart
-License: wxWindows licence
- For license text please see above.
-
-Files: src/cadxcore/wx/maxskedtextctrl/*
-Copyright: © Thomas Härtel
-License: wxWindows licence
- For license text please see above.
-
-Files: src/cadxcore/wx/propgrid/*
-Copyright: © Jaakko Salli
-License: wxWindows licence
- For license text please see above.
-
-Files: src/cadxcore/wx/treelistctrl/*
-Copyright: © 2004-2011 Robert Roebling, Julian Smart,
- Alberto Griggio, Vadim Zeitlin, Otto Wyss, Ronan Chartois
-License: wxWindows licence
- For license text please see above.
-
-Files: debian/*
-Copyright: © 2011 Carlos Barrales Ruiz <carlos.barrales at metaemotion.com>,
- Andreas Tille <tille at debian.org>
-License: GPL-2+
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- This package 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 General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
- .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-
Modified: trunk/packages/ginkgocadx/trunk/debian/ginkgocadx.lintian-overrides
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/ginkgocadx.lintian-overrides 2012-08-17 14:52:47 UTC (rev 12081)
+++ trunk/packages/ginkgocadx/trunk/debian/ginkgocadx.lintian-overrides 2012-08-17 16:19:27 UTC (rev 12082)
@@ -1,8 +1,7 @@
# the software has been developed in Spain, and this error corresponds to
-# some spanish text within the code
-ginkgocadx: spelling-error-in-binary usr/lib/ginkgocadx/libCADxCore.so.2.5.4.1 Posible Possible
-ginkgocadx: spelling-error-in-binary usr/lib/ginkgocadx/libCADxCore.so.2.5.4.1 posible possible
-#
-# using dh causes useless ldconfig calls to be added to post{inst,rm}
-ginkgocadx: postinst-has-useless-call-to-ldconfig
-ginkgocadx: postrm-has-useless-call-to-ldconfig
+# 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.*
Added: trunk/packages/ginkgocadx/trunk/debian/patches/fix-desktop.patch
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/patches/fix-desktop.patch (rev 0)
+++ trunk/packages/ginkgocadx/trunk/debian/patches/fix-desktop.patch 2012-08-17 16:19:27 UTC (rev 12082)
@@ -0,0 +1,17 @@
+Last-Update: 2012-08-18
+Author: Dmitry Smirnov <onlyjob at member.fsf.org>
+Forwarded: 2012-08-18
+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
+
+--- a/ginkgocadx.desktop
++++ b/ginkgocadx.desktop
+@@ -11,5 +11,5 @@
+ TryExec=ginkgocadx
+ Exec=/usr/bin/ginkgocadx %F
+ Terminal=false
+-Categories=Office;MedicalSoftware;
++Categories=Office;MedicalSoftware;Education;Science;
+ MimeType=application/dicom;
Added: trunk/packages/ginkgocadx/trunk/debian/patches/fix-path.patch
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/patches/fix-path.patch (rev 0)
+++ trunk/packages/ginkgocadx/trunk/debian/patches/fix-path.patch 2012-08-17 16:19:27 UTC (rev 12082)
@@ -0,0 +1,22 @@
+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 ################
+
Added: trunk/packages/ginkgocadx/trunk/debian/patches/fix-spelling.patch
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/patches/fix-spelling.patch (rev 0)
+++ trunk/packages/ginkgocadx/trunk/debian/patches/fix-spelling.patch 2012-08-17 16:19:27 UTC (rev 12082)
@@ -0,0 +1,43 @@
+Last-Update: 2012-08-18
+Author: Dmitry Smirnov <onlyjob at member.fsf.org>
+Forwarded: 2012-08-18
+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/commands/dicomizecommand.cpp
++++ b/src/cadxcore/commands/dicomizecommand.cpp
+@@ -368,7 +368,7 @@
+ }
+ }
+ 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;
+ }
+ }
Modified: trunk/packages/ginkgocadx/trunk/debian/patches/fixwhatis.patch
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/patches/fixwhatis.patch 2012-08-17 14:52:47 UTC (rev 12081)
+++ trunk/packages/ginkgocadx/trunk/debian/patches/fixwhatis.patch 2012-08-17 16:19:27 UTC (rev 12082)
@@ -1,3 +1,7 @@
+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 @@
Modified: trunk/packages/ginkgocadx/trunk/debian/patches/series
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/patches/series 2012-08-17 14:52:47 UTC (rev 12081)
+++ trunk/packages/ginkgocadx/trunk/debian/patches/series 2012-08-17 16:19:27 UTC (rev 12082)
@@ -1 +1,4 @@
+fix-desktop.patch
+fix-path.patch
+fix-spelling.patch
fixwhatis.patch
Modified: trunk/packages/ginkgocadx/trunk/debian/rules
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/rules 2012-08-17 14:52:47 UTC (rev 12081)
+++ trunk/packages/ginkgocadx/trunk/debian/rules 2012-08-17 16:19:27 UTC (rev 12082)
@@ -5,26 +5,27 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
-CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
-CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS)
-LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
+pkg=ginkgocadx
%:
dh $@ --buildsystem=cmake --parallel
-pkg=ginkgocadx
-
-DEB_CMAKE_EXTRA_FLAGS += \
- -DCMAKE_BUILD_TYPE:STRING=RELEASE
-
override_dh_auto_configure:
- dh_auto_configure -- $(DEB_CMAKE_EXTRA_FLAGS)
+ dh_auto_configure -- \
+ -DCMAKE_BUILD_TYPE:STRING=RELEASE \
+ -DCMAKE_CXX_FLAGS_RELEASE="$(CXXFLAGS)" \
+ -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed $(LDFLAGS)"
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)
+## avoid post{inst|rm}-useless-call-to-ldconfig
+override_dh_makeshlibs:
+ dh_makeshlibs --noscripts
+
get-orig-source:
uscan --verbose --force-download --repack
Added: trunk/packages/ginkgocadx/trunk/debian/source/options
===================================================================
--- trunk/packages/ginkgocadx/trunk/debian/source/options (rev 0)
+++ trunk/packages/ginkgocadx/trunk/debian/source/options 2012-08-17 16:19:27 UTC (rev 12082)
@@ -0,0 +1 @@
+compression = "xz"
More information about the debian-med-commit
mailing list