[med-svn] r15009 - in trunk/packages/papyrus/trunk/debian: . patches
Mathieu Malaterre
malat at alioth.debian.org
Mon Oct 28 10:14:59 UTC 2013
Author: malat
Date: 2013-10-28 10:14:59 +0000 (Mon, 28 Oct 2013)
New Revision: 15009
Added:
trunk/packages/papyrus/trunk/debian/README.Debian
trunk/packages/papyrus/trunk/debian/README.source
trunk/packages/papyrus/trunk/debian/patches/more.patch
Modified:
trunk/packages/papyrus/trunk/debian/patches/series
trunk/packages/papyrus/trunk/debian/rules
Log:
Add cmake
Added: trunk/packages/papyrus/trunk/debian/README.Debian
===================================================================
--- trunk/packages/papyrus/trunk/debian/README.Debian (rev 0)
+++ trunk/packages/papyrus/trunk/debian/README.Debian 2013-10-28 10:14:59 UTC (rev 15009)
@@ -0,0 +1,2 @@
+The build system has been replaced with a cmake based one. Since maintainer is
+more confortable with it.
Added: trunk/packages/papyrus/trunk/debian/README.source
===================================================================
--- trunk/packages/papyrus/trunk/debian/README.source (rev 0)
+++ trunk/packages/papyrus/trunk/debian/README.source 2013-10-28 10:14:59 UTC (rev 15009)
@@ -0,0 +1,9 @@
+This is an old piece of software (legacy). However since we are dealing with
+medical data, a lot of data are still around since 10 years of archive
+(minimum) is required in most countries.
+
+One should not continue in using this format anymore, but instead should use
+DICOM. This library is provided in Debian for legacy apps that need to deals
+with this old format. It will be provided as a read-only library.
+
+ -- Mathieu Malaterre <malat at debian.org> Sun, 27 Oct 2013 07:08:17 +0100
Added: trunk/packages/papyrus/trunk/debian/patches/more.patch
===================================================================
--- trunk/packages/papyrus/trunk/debian/patches/more.patch (rev 0)
+++ trunk/packages/papyrus/trunk/debian/patches/more.patch 2013-10-28 10:14:59 UTC (rev 15009)
@@ -0,0 +1,236 @@
+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>
+
+--- /dev/null
++++ papyrus-3.7.1/CMakeLists.txt
+@@ -0,0 +1,40 @@
++cmake_minimum_required(VERSION 2.8)
++project(Papyrus3)
++
++set(JPEGDIRLL JpegDir/JpgLless)
++set(JPEGDIRLY JpegDir/JpgLossy)
++set(DICOMDIR DicomDir)
++
++include_directories(
++ ${JPEGDIRLL}
++ ${JPEGDIRLY}
++ ${DICOMDIR}
++ ${CMAKE_CURRENT_SOURCE_DIR}
++ )
++
++add_subdirectory(${JPEGDIRLL})
++#add_subdirectory(${JPEGDIRLY})
++
++set(SOURCES
++ PapyConvertFile3.c
++ PapyError3.c
++ PapyFileSystemUnix3.c
++ PapyFiles3.c
++ PapyGetGlobalVar3.c
++ PapyInit3.c
++ PapyInitGroups3.c
++ PapyInitModules3.c
++ PapyRead3.c
++ PapyDataSetRead3.c
++ PapyList3.c
++ PapyVars3.c
++ PapyWrite3.c
++ PapyDataSetWrite3.c
++ PapyEallocUnix3.c
++ PapyWild3.c
++ PapyWildexit3.c
++ PapyUtils3.c
++ )
++
++add_library(Papyrus3 ${SOURCES})
++target_link_libraries(Papyrus3 JpgLless)
+--- /dev/null
++++ papyrus-3.7.1/JpegDir/JpgLossy/CMakeLists.txt
+@@ -0,0 +1,51 @@
++# Jpglossy
++set(SOURCES
++ jcapimin.c
++ jcapistd.c
++ jccoefct.c
++ jccolor.c
++ jcdctmgr.c
++ jchuff.c
++ jcinit.c
++ jcmainct.c
++ jcmaster.c
++ jcmarker.c
++ jcomapi.c
++ jcparam.c
++ jcphuff.c
++ jcprepct.c
++ jcsample.c
++ jdapimin.c
++ jdapistd.c
++ jdatadst.c
++ jdatasrc.c
++ jdcoefct.c
++ jdcolor.c
++ jddctmgr.c
++ jdhuff.c
++ jdinput.c
++ jdmainct.c
++ jdmarker.c
++ jdmaster.c
++ jdmerge.c
++ jdphuff.c
++ jdpostct.c
++ jdsample.c
++ jerror.c
++ jfdctint.c
++ jfdctflt.c
++ jfdctfst.c
++ jidctflt.c
++ jidctfst.c
++ jidctint.c
++ jidctred.c
++ jmemmgr.c
++ jmemnobs.c
++ jquant1.c
++ jquant2.c
++ jutils.c
++ rdcolmap.c
++ )
++
++add_library(Jpglossy ${SOURCES})
++
+--- papyrus-3.7.1.orig/JpegDir/JpgLless/MCU.C
++++ papyrus-3.7.1/JpegDir/JpgLless/MCU.C
+@@ -32,9 +32,9 @@
+ #include <stdlib.h>
+ /* #include <malloc.h> */
+ #include <string.h>
+-#include "jpeg.h"
+-#include "mcu.h"
+-#include "proto.h"
++#include "JPEG.H"
++#include "MCU.H"
++#include "PROTO.H"
+
+
+ /* Papyrus 3 redefined basic types */
+--- papyrus-3.7.1.orig/JpegDir/JpgLless/WRITE.C
++++ papyrus-3.7.1/JpegDir/JpgLless/WRITE.C
+@@ -38,10 +38,10 @@
+ #include <malloc.h>
+ */
+ #include <string.h>
+-#include "jpeg.h"
+-#include "mcu.h"
+-#include "io.h"
+-#include "proto.h"
++#include "JPEG.H"
++#include "MCU.H"
++#include "IO.H"
++#include "PROTO.H"
+
+ /* Papyrus 3 redefined basic types */
+ #ifndef FILENAME83 /* this is for the normal machines ... */
+--- /dev/null
++++ papyrus-3.7.1/JpegDir/JpgLless/CMakeLists.txt
+@@ -0,0 +1,15 @@
++# Jpglless
++set(SOURCES
++ decompoptimise.c
++ huffcoptimisebug.c
++ huffdoptimise.c
++ #jpegutil.c
++ MCU.C
++ pmreadoptimise.c
++ pnmtoljpoptimisebug.c
++ PREDICT.C
++ READ.C
++ WRITE.C
++ )
++
++add_library(Jpglless ${SOURCES})
+--- papyrus-3.7.1.orig/JpegDir/JpgLless/READ.C
++++ papyrus-3.7.1/JpegDir/JpgLless/READ.C
+@@ -36,10 +36,10 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include "jpeg.h"
+-#include "mcu.h"
+-#include "io.h"
+-#include "proto.h"
++#include "JPEG.H"
++#include "MCU.H"
++#include "IO.H"
++#include "PROTO.H"
+
+ /*
+ * To fix a memory leak (memory malloc'd then never freed) in the original
+--- papyrus-3.7.1.orig/JpegDir/JpgLless/pnmtoljpoptimisebug.c
++++ papyrus-3.7.1/JpegDir/JpgLless/pnmtoljpoptimisebug.c
+@@ -42,10 +42,10 @@
+ #include <errno.h>
+
+ #include <string.h>
+-#include "jpeg.h"
+-#include "mcu.h"
+-#include "proto.h"
+-#include "jpegless.h"
++#include "JPEG.H"
++#include "MCU.H"
++#include "PROTO.H"
++#include "JPEGLESS.H"
+
+ /* Papyrus 3 redefined basic types */
+ #ifndef FILENAME83 /* this is for the normal machines ... */
+--- papyrus-3.7.1.orig/JpegDir/JpgLless/pmreadoptimise.c
++++ papyrus-3.7.1/JpegDir/JpgLless/pmreadoptimise.c
+@@ -30,11 +30,11 @@
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ */
+ #include <stdio.h>
+-#include "jpeg.h"
+-#include "mcu.h"
+-#include "proto.h"
+-#include "jpegless.h"
+-#include "io.h"
++#include "JPEG.H"
++#include "MCU.H"
++#include "PROTO.H"
++#include "JPEGLESS.H"
++#include "IO.H"
+
+
+ /* Papyrus 3 redefined basic types */
+--- papyrus-3.7.1.orig/JpegDir/JpgLless/PREDICT.C
++++ papyrus-3.7.1/JpegDir/JpgLless/PREDICT.C
+@@ -26,7 +26,7 @@
+ */
+
+ #include <stdio.h>
+-#include "mcu.h"
++#include "MCU.H"
+
+ #ifdef DEBUG
+ /*
Modified: trunk/packages/papyrus/trunk/debian/patches/series
===================================================================
--- trunk/packages/papyrus/trunk/debian/patches/series 2013-10-28 10:02:16 UTC (rev 15008)
+++ trunk/packages/papyrus/trunk/debian/patches/series 2013-10-28 10:14:59 UTC (rev 15009)
@@ -1 +1,2 @@
all.patch
+more.patch
Modified: trunk/packages/papyrus/trunk/debian/rules
===================================================================
--- trunk/packages/papyrus/trunk/debian/rules 2013-10-28 10:02:16 UTC (rev 15008)
+++ trunk/packages/papyrus/trunk/debian/rules 2013-10-28 10:14:59 UTC (rev 15009)
@@ -1,14 +1,14 @@
#!/usr/bin/make -f
%:
- dh $@
+ 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
-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