[med-svn] r15021 - in trunk/packages/papyrus/trunk/debian: . patches
Mathieu Malaterre
malat at alioth.debian.org
Mon Oct 28 15:07:42 UTC 2013
Author: malat
Date: 2013-10-28 15:07:42 +0000 (Mon, 28 Oct 2013)
New Revision: 15021
Added:
trunk/packages/papyrus/trunk/debian/patches/installheader.patch
Modified:
trunk/packages/papyrus/trunk/debian/control
trunk/packages/papyrus/trunk/debian/copyright
trunk/packages/papyrus/trunk/debian/patches/more.patch
trunk/packages/papyrus/trunk/debian/patches/series
trunk/packages/papyrus/trunk/debian/rules
Log:
Add missing copyright
Modified: trunk/packages/papyrus/trunk/debian/control
===================================================================
--- trunk/packages/papyrus/trunk/debian/control 2013-10-28 14:38:19 UTC (rev 15020)
+++ trunk/packages/papyrus/trunk/debian/control 2013-10-28 15:07:42 UTC (rev 15021)
@@ -9,10 +9,10 @@
Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/papyrus/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/papyrus/trunk/
-Package: libpapyrus30
+Package: libpapyrus3-dev
Architecture: any
Depends: ${misc:Depends}
-Description: DICOM compatible file format
+Description: DICOM compatible file format library
PAPYRUS 3.0 file format based on the new DICOM 3.0 Standard addresses the open
interchange of medical images in files or on removable storage media. This
specific implementation of the DICOM standard is intended as a generic solution
@@ -22,4 +22,4 @@
be used for storage and archival of medical image data in a DICOM compatible
format.
.
- This package contains the libraries needed to run papyrus 3.0 applications.
+ This package contains the libraries needed to run PAPYRUS 3.0 applications.
Modified: trunk/packages/papyrus/trunk/debian/copyright
===================================================================
--- trunk/packages/papyrus/trunk/debian/copyright 2013-10-28 14:38:19 UTC (rev 15020)
+++ trunk/packages/papyrus/trunk/debian/copyright 2013-10-28 15:07:42 UTC (rev 15021)
@@ -1,5 +1,68 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: Papyrus
+Upstream-Name: PAPYRUS Toolkit
Upstream-Contact: GIRARD Christian <Christian.Girard at hcuge.ch>
Source: http://www.expasy.ch/UIN/html1/projects/papyrus/papyrus.html
+Files: *
+Copyright: © 2004 - Service of Medical Informatics -
+ University Hospitals of Geneva (HUG), Geneva, Switzerland
+License: LGPL-2.1
+
+Files: JpegDir/JpgLossy/*
+Copyright: © 1995-1997, Thomas G. Lane.
+License:
+ Permission is hereby granted to use, copy, modify, and distribute this
+ software (or portions thereof) for any purpose, without fee, subject to these
+ conditions:
+ (1) If any part of the source code for this software is distributed, then this
+ README file must be included, with this copyright and no-warranty notice
+ unaltered; and any additions, deletions, or changes to the original files
+ must be clearly indicated in accompanying documentation.
+ (2) If only executable code is distributed, then the accompanying
+ documentation must state that "this software is based in part on the work of
+ the Independent JPEG Group".
+ (3) Permission for use of this software is granted only if the user accepts
+ full responsibility for any undesirable consequences; the authors accept
+ NO LIABILITY for damages of any kind.
+
+Files: JpegDir/JpgLless/*
+Copyright: © 1994 Kongji Huang and Brian C. Smith.
+ Cornell University
+License:
+ Permission to use, copy, modify, and distribute this software and its
+ documentation for any purpose, without fee, and without written agreement is
+ hereby granted, provided that the above copyright notice and the following
+ two paragraphs appear in all copies of this software.
+ .
+ IN NO EVENT SHALL CORNELL UNIVERSITY BE LIABLE TO ANY PARTY FOR
+ DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF CORNELL
+ UNIVERSITY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ .
+ CORNELL UNIVERSITY SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
+ ON AN "AS IS" BASIS, AND CORNELL UNIVERSITY HAS NO OBLIGATION TO
+ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+
+Files: debian/*
+Copyright: 2013; Mathieu Malaterre <malat at debian.org>
+License: 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.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ .
+ On Debian systems the full text of the GNU Library General Public License can
+ be found in the `/usr/share/common-licenses/LGPL-2.1' file.
Added: trunk/packages/papyrus/trunk/debian/patches/installheader.patch
===================================================================
--- trunk/packages/papyrus/trunk/debian/patches/installheader.patch (rev 0)
+++ trunk/packages/papyrus/trunk/debian/patches/installheader.patch 2013-10-28 15:07:42 UTC (rev 15021)
@@ -0,0 +1,262 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ papyrus (3.7.1-1) unstable; urgency=low
+ .
+ * Initial release. (Closes: #)
+Author: Mathieu Malaterre <malat at debian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- papyrus-3.7.1.orig/CMakeLists.txt
++++ papyrus-3.7.1/CMakeLists.txt
+@@ -14,20 +14,6 @@ include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ )
+
+-#add_subdirectory(${JPEGDIRLL})
+-#add_subdirectory(${JPEGDIRLY})
+-#add_subdirectory(${DICOMDIR})
+-
+-#add_definitions(
+-# -DPapyrus3H
+-# -DDicomdirH
+-# -DDicomdirEnumRecordsH
+-# -DDicomdirTypeDef3H
+-# -DDicomdirPrivFunctionDef3H
+-# -DDicomdirPubFunctionDef3H
+-# -DDicomdirGlobalVar3H
+-# )
+-
+ set(SOURCES
+ PapyVars3.c
+ PapyConvertFile3.c
+@@ -73,96 +59,105 @@ if(WIN32)
+ endif()
+
+ list(APPEND SOURCES
+- DicomDir/DicomDirDataSetRead.c
+- DicomDir/DicomDirDataSetWrite.c
+- DicomDir/DicomDirFiles.c
+- DicomDir/DicomDirInit.c
+- DicomDir/DicomDirInitRecords.c
+- DicomDir/OGlobalDicomFunc.cpp
+- )
++ DicomDir/DicomDirDataSetRead.c
++ DicomDir/DicomDirDataSetWrite.c
++ DicomDir/DicomDirFiles.c
++ DicomDir/DicomDirInit.c
++ DicomDir/DicomDirInitRecords.c
++ DicomDir/OGlobalDicomFunc.cpp
++ )
++list(APPEND HEADERS
++ DicomDir/DicomDir.h
++ DicomDir/DicomDirEnumRecords.h
++ DicomDir/DicomdirGlobalVar3.h
++ DicomDir/DicomDirInitRecords.h
++ DicomDir/DicomdirPrivFunctionDef3.h
++ DicomDir/DicomdirPubFunctionDef3.h
++ DicomDir/DicomdirTypeDef3.h
++ DicomDir/OGlobalDicomFunc.h
++ )
+ list(APPEND SOURCES
+- JpegDir/JpgLless/decompoptimise.c
+- JpegDir/JpgLless/huffcoptimisebug.c
+- JpegDir/JpgLless/huffdoptimise.c
+- JpegDir/JpgLless/JPEGUTIL.C
+- JpegDir/JpgLless/MCU.C
+- JpegDir/JpgLless/pmreadoptimise.c
+- JpegDir/JpgLless/pnmtoljpoptimisebug.c
+- JpegDir/JpgLless/PREDICT.C
+- JpegDir/JpgLless/READ.C
+- JpegDir/JpgLless/WRITE.C
+- )
+- set_source_files_properties(
+- JpegDir/JpgLless/IO.H
+- JpegDir/JpgLless/JPEG.H
+- JpegDir/JpgLless/JPEGLESS.H
+- JpegDir/JpgLless/MCU.H
+- JpegDir/JpgLless/PREDICT.H
+- JpegDir/JpgLless/PROTO.H
+- PROPERTIES LANGUAGE C)
++ JpegDir/JpgLless/decompoptimise.c
++ JpegDir/JpgLless/huffcoptimisebug.c
++ JpegDir/JpgLless/huffdoptimise.c
++ JpegDir/JpgLless/JPEGUTIL.C
++ JpegDir/JpgLless/MCU.C
++ JpegDir/JpgLless/pmreadoptimise.c
++ JpegDir/JpgLless/pnmtoljpoptimisebug.c
++ JpegDir/JpgLless/PREDICT.C
++ JpegDir/JpgLless/READ.C
++ JpegDir/JpgLless/WRITE.C
++ )
++set_source_files_properties(
++ JpegDir/JpgLless/IO.H
++ JpegDir/JpgLless/JPEG.H
++ JpegDir/JpgLless/JPEGLESS.H
++ JpegDir/JpgLless/MCU.H
++ JpegDir/JpgLless/PREDICT.H
++ JpegDir/JpgLless/PROTO.H
++ PROPERTIES LANGUAGE C)
+
+ list(APPEND SOURCES
+- JpegDir/JpgLossy/JCAPIMIN.C
+- JpegDir/JpgLossy/JCAPISTD.C
+- JpegDir/JpgLossy/JCCOEFCT.C
+- JpegDir/JpgLossy/JCCOLOR.C
+- JpegDir/JpgLossy/JCDCTMGR.C
+- JpegDir/JpgLossy/JCHUFF.C
+- JpegDir/JpgLossy/JCINIT.C
+- JpegDir/JpgLossy/JCMAINCT.C
+- JpegDir/JpgLossy/JCMARKER.C
+- JpegDir/JpgLossy/JCMASTER.C
+- JpegDir/JpgLossy/JCOMAPI.C
+- JpegDir/JpgLossy/JCPARAM.C
+- JpegDir/JpgLossy/JCPHUFF.C
+- JpegDir/JpgLossy/JCPREPCT.C
+- JpegDir/JpgLossy/JCSAMPLE.C
+- JpegDir/JpgLossy/JCTRANS.C
+- JpegDir/JpgLossy/JDAPIMIN.C
+- JpegDir/JpgLossy/JDAPISTD.C
+- JpegDir/JpgLossy/JDATADST.C
+- JpegDir/JpgLossy/JDATASRC.C
+- JpegDir/JpgLossy/JDCOEFCT.C
+- JpegDir/JpgLossy/JDCOLOR.C
+- JpegDir/JpgLossy/JDDCTMGR.C
+- JpegDir/JpgLossy/JDHUFF.C
+- JpegDir/JpgLossy/JDINPUT.C
+- JpegDir/JpgLossy/JDMAINCT.C
+- JpegDir/JpgLossy/JDMARKER.C
+- JpegDir/JpgLossy/JDMASTER.C
+- JpegDir/JpgLossy/JDMERGE.C
+- JpegDir/JpgLossy/JDPHUFF.C
+- JpegDir/JpgLossy/JDPOSTCT.C
+- JpegDir/JpgLossy/JDSAMPLE.C
+- JpegDir/JpgLossy/JDTRANS.C
+- JpegDir/JpgLossy/JERROR.C
+- JpegDir/JpgLossy/JFDCTFLT.C
+- JpegDir/JpgLossy/JFDCTFST.C
+- JpegDir/JpgLossy/JFDCTINT.C
+- JpegDir/JpgLossy/JIDCTFLT.C
+- JpegDir/JpgLossy/JIDCTFST.C
+- JpegDir/JpgLossy/JIDCTINT.C
+- JpegDir/JpgLossy/JIDCTRED.C
+- JpegDir/JpgLossy/jmemmgr.c
+- JpegDir/JpgLossy/JMEMNOBS.C
+- JpegDir/JpgLossy/JQUANT1.C
+- JpegDir/JpgLossy/JQUANT2.C
+- JpegDir/JpgLossy/JUTILS.C
+- JpegDir/JpgLossy/RDBMP.C
+- JpegDir/JpgLossy/RDCOLMAP.C
+- JpegDir/JpgLossy/RDGIF.C
+- JpegDir/JpgLossy/RDPPM.C
+- JpegDir/JpgLossy/RDRLE.C
+- JpegDir/JpgLossy/RDSWITCH.C
+- JpegDir/JpgLossy/RDTARGA.C
+- JpegDir/JpgLossy/WRRLE.C
+- )
++ JpegDir/JpgLossy/JCAPIMIN.C
++ JpegDir/JpgLossy/JCAPISTD.C
++ JpegDir/JpgLossy/JCCOEFCT.C
++ JpegDir/JpgLossy/JCCOLOR.C
++ JpegDir/JpgLossy/JCDCTMGR.C
++ JpegDir/JpgLossy/JCHUFF.C
++ JpegDir/JpgLossy/JCINIT.C
++ JpegDir/JpgLossy/JCMAINCT.C
++ JpegDir/JpgLossy/JCMARKER.C
++ JpegDir/JpgLossy/JCMASTER.C
++ JpegDir/JpgLossy/JCOMAPI.C
++ JpegDir/JpgLossy/JCPARAM.C
++ JpegDir/JpgLossy/JCPHUFF.C
++ JpegDir/JpgLossy/JCPREPCT.C
++ JpegDir/JpgLossy/JCSAMPLE.C
++ JpegDir/JpgLossy/JCTRANS.C
++ JpegDir/JpgLossy/JDAPIMIN.C
++ JpegDir/JpgLossy/JDAPISTD.C
++ JpegDir/JpgLossy/JDATADST.C
++ JpegDir/JpgLossy/JDATASRC.C
++ JpegDir/JpgLossy/JDCOEFCT.C
++ JpegDir/JpgLossy/JDCOLOR.C
++ JpegDir/JpgLossy/JDDCTMGR.C
++ JpegDir/JpgLossy/JDHUFF.C
++ JpegDir/JpgLossy/JDINPUT.C
++ JpegDir/JpgLossy/JDMAINCT.C
++ JpegDir/JpgLossy/JDMARKER.C
++ JpegDir/JpgLossy/JDMASTER.C
++ JpegDir/JpgLossy/JDMERGE.C
++ JpegDir/JpgLossy/JDPHUFF.C
++ JpegDir/JpgLossy/JDPOSTCT.C
++ JpegDir/JpgLossy/JDSAMPLE.C
++ JpegDir/JpgLossy/JDTRANS.C
++ JpegDir/JpgLossy/JERROR.C
++ JpegDir/JpgLossy/JFDCTFLT.C
++ JpegDir/JpgLossy/JFDCTFST.C
++ JpegDir/JpgLossy/JFDCTINT.C
++ JpegDir/JpgLossy/JIDCTFLT.C
++ JpegDir/JpgLossy/JIDCTFST.C
++ JpegDir/JpgLossy/JIDCTINT.C
++ JpegDir/JpgLossy/JIDCTRED.C
++ JpegDir/JpgLossy/jmemmgr.c
++ JpegDir/JpgLossy/JMEMNOBS.C
++ JpegDir/JpgLossy/JQUANT1.C
++ JpegDir/JpgLossy/JQUANT2.C
++ JpegDir/JpgLossy/JUTILS.C
++ JpegDir/JpgLossy/RDBMP.C
++ JpegDir/JpgLossy/RDCOLMAP.C
++ JpegDir/JpgLossy/RDGIF.C
++ JpegDir/JpgLossy/RDPPM.C
++ JpegDir/JpgLossy/RDRLE.C
++ JpegDir/JpgLossy/RDSWITCH.C
++ JpegDir/JpgLossy/RDTARGA.C
++ JpegDir/JpgLossy/WRRLE.C
++ )
+
+ add_library(Papyrus3 ${SOURCES})
+ set_target_properties(Papyrus3 PROPERTIES COMPILE_FLAGS "-x c")
+ set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE C)
+ set_target_properties(Papyrus3 PROPERTIES LINKER_LANGUAGE C)
+-#target_link_libraries(Papyrus3 DicomDir JpgLless JpgLossy)
+
+ add_subdirectory(TESTS)
+
+@@ -173,24 +168,6 @@ install(TARGETS Papyrus3
+ )
+
+ install(FILES
+- Papyrus3.h
+- PapyEnumGroups3.h
+- PapyEnumModules3.h
+- PapyTypeDef3.h
+- PapyGlobalVar3.h
+- PapyPrivFunctionDef3.h
+- PapyPubFunctionDef3.h
+- PapyEalloc3.h
+- PapyFileSystem3.h
+- PapyError3.h
+- PapyWild3.h
+- PapyEnumImageGroups3.h
+- PapyEnumImagesModules3.h
+- DicomDir/DicomDir.h
+- DicomDir/DicomDirEnumRecords.h
+- DicomDir/DicomdirTypeDef3.h
+- DicomDir/DicomdirPrivFunctionDef3.h
+- DicomDir/DicomdirPubFunctionDef3.h
+- DicomDir/DicomdirGlobalVar3.h
++ ${HEADERS}
+ DESTINATION include/Papyrus3
+ )
Modified: trunk/packages/papyrus/trunk/debian/patches/more.patch
===================================================================
--- trunk/packages/papyrus/trunk/debian/patches/more.patch 2013-10-28 14:38:19 UTC (rev 15020)
+++ trunk/packages/papyrus/trunk/debian/patches/more.patch 2013-10-28 15:07:42 UTC (rev 15021)
@@ -35,7 +35,7 @@
+set(JPEGDIRLY JpegDir/JpgLossy)
+set(DICOMDIR DicomDir)
+
-+set(BUILD_SHARED_LIBS ON)
++#set(BUILD_SHARED_LIBS ON)
+
+include_directories(
+ ${JPEGDIRLL}
Modified: trunk/packages/papyrus/trunk/debian/patches/series
===================================================================
--- trunk/packages/papyrus/trunk/debian/patches/series 2013-10-28 14:38:19 UTC (rev 15020)
+++ trunk/packages/papyrus/trunk/debian/patches/series 2013-10-28 15:07:42 UTC (rev 15021)
@@ -6,3 +6,4 @@
ya.patch
fixcxx.patch
fixcmake.patch
+installheader.patch
Modified: trunk/packages/papyrus/trunk/debian/rules
===================================================================
--- trunk/packages/papyrus/trunk/debian/rules 2013-10-28 14:38:19 UTC (rev 15020)
+++ trunk/packages/papyrus/trunk/debian/rules 2013-10-28 15:07:42 UTC (rev 15021)
@@ -3,12 +3,5 @@
%:
dh $@ --buildsystem=cmake
-#override_dh_auto_configure:
-# dh_auto_configure -- -f Makefile.PC
-#
-#override_dh_auto_build:
-# mkdir -p Solaris/lib
-# dh_auto_build -- -f Makefile.PC
-
get-orig-source:
uscan --verbose --force-download --rename
More information about the debian-med-commit
mailing list