Author: malat Date: 2013-10-28 13:12:28 +0000 (Mon, 28 Oct 2013) New Revision: 15013
Added: trunk/packages/papyrus/trunk/debian/patches/more2.patch Modified: trunk/packages/papyrus/trunk/debian/patches/more.patch trunk/packages/papyrus/trunk/debian/patches/series Log: fix case insencitive issues Modified: trunk/packages/papyrus/trunk/debian/patches/more.patch =================================================================== --- trunk/packages/papyrus/trunk/debian/patches/more.patch 2013-10-28 13:07:26 UTC (rev 15012) +++ trunk/packages/papyrus/trunk/debian/patches/more.patch 2013-10-28 13:12:28 UTC (rev 15013) @@ -23,9 +23,11 @@ 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 @@ +Index: Papyrus3/CMakeLists.txt +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ Papyrus3/CMakeLists.txt 2013-10-28 13:17:12.810299208 +0100 +@@ -0,0 +1,71 @@ +cmake_minimum_required(VERSION 2.8) +project(Papyrus3) + @@ -33,6 +35,8 @@ +set(JPEGDIRLY JpegDir/JpgLossy) +set(DICOMDIR DicomDir) + ++set(BUILD_SHARED_LIBS ON) ++ +include_directories( + ${JPEGDIRLL} + ${JPEGDIRLY} @@ -66,8 +70,39 @@ + +add_library(Papyrus3 ${SOURCES}) +target_link_libraries(Papyrus3 JpgLless) ---- /dev/null -+++ papyrus-3.7.1/JpegDir/JpgLossy/CMakeLists.txt ++ ++install(TARGETS Papyrus3 ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib ++ ) ++ ++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 ++ DESTINATION include/Papyrus3 ++ ) +Index: Papyrus3/JpegDir/JpgLossy/CMakeLists.txt +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ Papyrus3/JpegDir/JpgLossy/CMakeLists.txt 2013-10-28 13:06:47.798307580 +0100 @@ -0,0 +1,51 @@ +# Jpglossy +set(SOURCES @@ -120,8 +155,10 @@ + +add_library(Jpglossy ${SOURCES}) + ---- papyrus-3.7.1.orig/JpegDir/JpgLless/MCU.C -+++ papyrus-3.7.1/JpegDir/JpgLless/MCU.C +Index: Papyrus3/JpegDir/JpgLless/MCU.C +=================================================================== +--- Papyrus3.orig/JpegDir/JpgLless/MCU.C 2013-10-28 13:06:16.058308006 +0100 ++++ Papyrus3/JpegDir/JpgLless/MCU.C 2013-10-28 13:06:47.798307580 +0100 @@ -32,9 +32,9 @@ #include <stdlib.h> /* #include <malloc.h> */ @@ -135,8 +172,10 @@ /* Papyrus 3 redefined basic types */ ---- papyrus-3.7.1.orig/JpegDir/JpgLless/WRITE.C -+++ papyrus-3.7.1/JpegDir/JpgLless/WRITE.C +Index: Papyrus3/JpegDir/JpgLless/WRITE.C +=================================================================== +--- Papyrus3.orig/JpegDir/JpgLless/WRITE.C 2013-10-28 13:06:16.098308008 +0100 ++++ Papyrus3/JpegDir/JpgLless/WRITE.C 2013-10-28 13:06:47.798307580 +0100 @@ -38,10 +38,10 @@ #include <malloc.h> */ @@ -152,8 +191,10 @@ /* Papyrus 3 redefined basic types */ #ifndef FILENAME83 /* this is for the normal machines ... */ ---- /dev/null -+++ papyrus-3.7.1/JpegDir/JpgLless/CMakeLists.txt +Index: Papyrus3/JpegDir/JpgLless/CMakeLists.txt +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ Papyrus3/JpegDir/JpgLless/CMakeLists.txt 2013-10-28 13:06:47.798307580 +0100 @@ -0,0 +1,15 @@ +# Jpglless +set(SOURCES @@ -170,8 +211,10 @@ + ) + +add_library(Jpglless ${SOURCES}) ---- papyrus-3.7.1.orig/JpegDir/JpgLless/READ.C -+++ papyrus-3.7.1/JpegDir/JpgLless/READ.C +Index: Papyrus3/JpegDir/JpgLless/READ.C +=================================================================== +--- Papyrus3.orig/JpegDir/JpgLless/READ.C 2013-10-28 13:06:16.074308007 +0100 ++++ Papyrus3/JpegDir/JpgLless/READ.C 2013-10-28 13:06:47.798307580 +0100 @@ -36,10 +36,10 @@ #include <stdio.h> #include <stdlib.h> @@ -187,8 +230,10 @@ /* * 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 +Index: Papyrus3/JpegDir/JpgLless/pnmtoljpoptimisebug.c +=================================================================== +--- Papyrus3.orig/JpegDir/JpgLless/pnmtoljpoptimisebug.c 2013-10-28 13:06:16.110308006 +0100 ++++ Papyrus3/JpegDir/JpgLless/pnmtoljpoptimisebug.c 2013-10-28 13:06:47.798307580 +0100 @@ -42,10 +42,10 @@ #include <errno.h> @@ -204,8 +249,10 @@ /* 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 +Index: Papyrus3/JpegDir/JpgLless/pmreadoptimise.c +=================================================================== +--- Papyrus3.orig/JpegDir/JpgLless/pmreadoptimise.c 2013-10-28 13:06:16.082308002 +0100 ++++ Papyrus3/JpegDir/JpgLless/pmreadoptimise.c 2013-10-28 13:06:47.802307580 +0100 @@ -30,11 +30,11 @@ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. */ @@ -223,8 +270,10 @@ /* Papyrus 3 redefined basic types */ ---- papyrus-3.7.1.orig/JpegDir/JpgLless/PREDICT.C -+++ papyrus-3.7.1/JpegDir/JpgLless/PREDICT.C +Index: Papyrus3/JpegDir/JpgLless/PREDICT.C +=================================================================== +--- Papyrus3.orig/JpegDir/JpgLless/PREDICT.C 2013-10-28 13:06:16.090308005 +0100 ++++ Papyrus3/JpegDir/JpgLless/PREDICT.C 2013-10-28 13:06:47.802307580 +0100 @@ -26,7 +26,7 @@ */ Added: trunk/packages/papyrus/trunk/debian/patches/more2.patch =================================================================== --- trunk/packages/papyrus/trunk/debian/patches/more2.patch (rev 0) +++ trunk/packages/papyrus/trunk/debian/patches/more2.patch 2013-10-28 13:12:28 UTC (rev 15013) @@ -0,0 +1,968 @@ +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 <ma...@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 +@@ -1,5 +1,5 @@ + cmake_minimum_required(VERSION 2.8) +-project(Papyrus3) ++project(Papyrus3 C) + + set(JPEGDIRLL JpegDir/JpgLless) + set(JPEGDIRLY JpegDir/JpgLossy) +@@ -15,31 +15,65 @@ include_directories( + ) + + add_subdirectory(${JPEGDIRLL}) +-#add_subdirectory(${JPEGDIRLY}) ++add_subdirectory(${JPEGDIRLY}) ++add_subdirectory(${DICOMDIR}) + + 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 ++ PapyVars3.c ++ PapyConvertFile3.c ++ PapyError3.c ++ PapyFiles3.c ++ PapyGetGlobalVar3.c ++ PapyInit3.c ++ PapyInitGroups3.c ++ PapyInitModules3.c ++ PapyRead3.c ++ PapyDataSetRead3.c ++ PapyList3.c ++ PapyWrite3.c ++ PapyDataSetWrite3.c ++ PapyWild3.c ++ PapyWildexit3.c ++ PapyUtils3.c + ) ++set(HEADERS ++ PapyEalloc3.h ++ PapyEnumGroups3.h ++ PapyEnumImageGroups3.h ++ PapyEnumImagesModules3.h ++ PapyEnumMiscGroups3.h ++ PapyEnumMiscModules3.h ++ PapyEnumModules3.h ++ PapyError3.h ++ PapyErrorMacros3.h ++ PapyFileSystem3.h ++ PapyGlobalVar3.h ++ PapyInitModules3.h ++ PapyPrivFunctionDef3.h ++ PapyPubFunctionDef3.h ++ Papyrus3.h ++ PapyTypeDef3.h ++ PapyWild3.h ++ ) ++if(UNIX) ++ set(SOURCES ++ ${SOURCES} ++ PapyFileSystemUnix3.c PapyEallocUnix3.c ++ ) ++endif() ++if(WIN32) ++ set(SOURCES ++ ${SOURCES} ++ PapyFileSystemPC3.c PapyEallocPC3.c ++ ) ++endif() + + add_library(Papyrus3 ${SOURCES}) +-target_link_libraries(Papyrus3 JpgLless) ++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) + + install(TARGETS Papyrus3 + RUNTIME DESTINATION bin +--- /dev/null ++++ papyrus-3.7.1/DicomDir/CMakeLists.txt +@@ -0,0 +1,35 @@ ++# DicomDir ++set(SOURCES ++ DicomDirDataSetRead.c ++ DicomDirDataSetWrite.c ++ DicomDirFiles.c ++ DicomDirInit.c ++ DicomDirInitRecords.c ++ OGlobalDicomFunc.cpp ++ ) ++#set_source_files_properties(OGlobalDicomFunc.cpp PROPERTIES LANGUAGE "C") ++ ++set(HEADERS ++ DicomDir.h ++ DicomDirEnumRecords.h ++ DicomDirGlobalVar3.h ++ DicomDirInitRecords.h ++ DicomDirPrivFunctionDef3.h ++ DicomDirPubFunctionDef3.h ++ DicomDirTypeDef3.h ++ OGlobalDicomFunc.h ++ ) ++ ++add_library(DicomDir ${SOURCES}) ++set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE C) ++set_target_properties(DicomDir PROPERTIES LINKER_LANGUAGE C) ++ ++#install(TARGETS Papyrus3 ++# RUNTIME DESTINATION bin ++# LIBRARY DESTINATION lib ++# ARCHIVE DESTINATION lib ++# ) ++# ++#install(FILES ++# DESTINATION include/Papyrus3 ++# ) +--- /dev/null ++++ papyrus-3.7.1/TESTS/CMakeLists.txt +@@ -0,0 +1,6 @@ ++# Tests ++add_executable(TestRead TestRead.c) ++target_link_libraries(TestRead Papyrus3) ++ ++add_executable(TestWrite TestWrite.c) ++target_link_libraries(TestWrite Papyrus3) +--- papyrus-3.7.1.orig/TESTS/TestRead.c ++++ papyrus-3.7.1/TESTS/TestRead.c +@@ -53,6 +53,7 @@ + #define MAIN + + #include <stdio.h> ++#include <stdlib.h> /* exit */ + #include "Papyrus3.h" + + +--- papyrus-3.7.1.orig/JpegDir/JpgLless/CMakeLists.txt ++++ papyrus-3.7.1/JpegDir/JpgLless/CMakeLists.txt +@@ -1,4 +1,4 @@ +-# Jpglless ++# JpgLless + set(SOURCES + decompoptimise.c + huffcoptimisebug.c +@@ -12,4 +12,6 @@ set(SOURCES + WRITE.C + ) + +-add_library(Jpglless ${SOURCES}) ++add_library(JpgLless ${SOURCES}) ++set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE C) ++set_target_properties(JpgLless PROPERTIES LINKER_LANGUAGE C) +--- papyrus-3.7.1.orig/JpegDir/JpgLossy/JCSAMPLE.C ++++ papyrus-3.7.1/JpegDir/JpgLossy/JCSAMPLE.C +@@ -46,8 +46,8 @@ + */ + + #define JPEG_INTERNALS +-#include "jinclude.h" +-#include "jpeglib.h" ++#include "JINCLUDE.H" ++#include "JPEGLIB.H" + + + /* Pointer to routine to downsample a single component */ +--- papyrus-3.7.1.orig/JpegDir/JpgLossy/JDPHUFF.C ++++ papyrus-3.7.1/JpegDir/JpgLossy/JDPHUFF.C +@@ -15,9 +15,9 @@ + */ + + #define JPEG_INTERNALS +-#include "jinclude.h" +-#include "jpeglib.h" +-#include "jdhuff.h" /* Declarations shared with jdhuff.c */ ++#include "JINCLUDE.H" ++#include "JPEGLIB.H" ++#include "JDHUFF.H" /* Declarations shared with jdhuff.c */ + + + #ifdef D_PROGRESSIVE_SUPPORTED +--- papyrus-3.7.1.orig/JpegDir/JpgLossy/JDMASTER.C ++++ papyrus-3.7.1/JpegDir/JpgLossy/JDMASTER.C +@@ -12,8 +12,8 @@ + */ + + #define JPEG_INTERNALS +-#include "jinclude.h" +-#include "jpeglib.h" ++#include "JINCLUDE.H" ++#include "JPEGLIB.H" + + + /* Private state */ +--- papyrus-3.7.1.orig/JpegDir/JpgLossy/JCHUFF.C ++++ papyrus-3.7.1/JpegDir/JpgLossy/JCHUFF.C +@@ -15,9 +15,9 @@ + */ + + #define JPEG_INTERNALS +-#include "jinclude.h" +-#include "jpeglib.h" +-#include "jchuff.h" /* Declarations shared with jcphuff.c */ ++#include "JINCLUDE.H" ++#include "JPEGLIB.H" ++#include "JCHUFF.H" /* Declarations shared with jcphuff.c */ + + + /* Expanded entropy encoder object for Huffman encoding. +--- papyrus-3.7.1.orig/JpegDir/JpgLossy/JCCOLOR.C ++++ papyrus-3.7.1/JpegDir/JpgLossy/JCCOLOR.C +@@ -9,8 +9,8 @@ + */ + + #define JPEG_INTERNALS +-#include "jinclude.h" +-#include "jpeglib.h" ++#include "JINCLUDE.H" ++#include "JPEGLIB.H" + + + /* Private subobject */ +--- papyrus-3.7.1.orig/JpegDir/JpgLossy/JDMARKER.C ++++ papyrus-3.7.1/JpegDir/JpgLossy/JDMARKER.C +@@ -13,8 +13,8 @@ + */ + + #define JPEG_INTERNALS +-#include "jinclude.h" +-#include "jpeglib.h" ++#include "JINCLUDE.H" ++#include "JPEGLIB.H" + + + typedef enum { /* JPEG marker codes */ +--- papyrus-3.7.1.orig/JpegDir/JpgLossy/JCDCTMGR.C ++++ papyrus-3.7.1/JpegDir/JpgLossy/JCDCTMGR.C +@@ -12,9 +12,9 @@ + */ + + #define JPEG_INTERNALS +-#include "jinclude.h" +-#include "jpeglib.h" +-#include "jdct.h" /* Private declarations for DCT subsystem */ ++#include "JINCLUDE.H" ++#include "JPEGLIB.H" ++#include "JDCT.H" /* Private declarations for DCT subsystem */ + + + /* Private subobject for this module */ +--- papyrus-3.7.1.orig/JpegDir/JpgLossy/CDJPEG.H ++++ papyrus-3.7.1/JpegDir/JpgLossy/CDJPEG.H +@@ -11,10 +11,10 @@ + + #define JPEG_CJPEG_DJPEG /* define proper options in jconfig.h */ + #define JPEG_INTERNAL_OPTIONS /* cjpeg.c,djpeg.c need to see xxx_SUPPORTED */ +-#include "jinclude.h" +-#include "jpeglib.h" +-#include "jerror.h" /* get library error codes too */ +-#include "cderror.h" /* get application-specific error codes */ ++#include "JINCLUDE.H" ++#include "JPEGLIB.H" ++#include "JERROR.H" /* get library error codes too */ ++#include "CDERROR.H" /* get application-specific error codes */ + + + /* +--- papyrus-3.7.1.orig/JpegDir/JpgLossy/JCMAINCT.C ++++ papyrus-3.7.1/JpegDir/JpgLossy/JCMAINCT.C +@@ -11,8 +11,8 @@ + */ + + #define JPEG_INTERNALS +-#include "jinclude.h" +-#include "jpeglib.h" ++#include "JINCLUDE.H" ++#include "JPEGLIB.H" + + + /* Note: currently, there is no operating mode in which a full-image buffer +--- papyrus-3.7.1.orig/JpegDir/JpgLossy/JUTILS.C ++++ papyrus-3.7.1/JpegDir/JpgLossy/JUTILS.C +@@ -12,8 +12,8 @@ + */ + + #define JPEG_INTERNALS +-#include "jinclude.h" +-#include "jpeglib.h" ++#include "JINCLUDE.H" ++#include "JPEGLIB.H" + + + /* +--- papyrus-3.7.1.orig/JpegDir/JpgLossy/JERROR.C ++++ papyrus-3.7.1/JpegDir/JpgLossy/JERROR.C +@@ -19,10 +19,10 @@ + */ + + /* this is not a core library module, so it doesn't define JPEG_INTERNALS */ +-#include "jinclude.h" +-#include "jpeglib.h" +-#include "jversion.h" +-#include "jerror.h" ++#include "JINCLUDE.H" ++#include "JPEGLIB.H" ++#include "JVERSION.H" ++#include "JERROR.H" + + #ifdef USE_WINDOWS_MESSAGEBOX + #include <windows.h> +@@ -48,7 +48,7 @@ + #define JMESSAGE(code,string) string , + + const char * const jpeg_std_message_table[] = { +-#include "jerror.h" ++#include "JERROR.H" + NULL + }; + +--- papyrus-3.7.1.orig/JpegDir/JpgLossy/JMEMNOBS.C ++++ papyrus-3.7.1/JpegDir/JpgLossy/JMEMNOBS.C +@@ -16,9 +16,9 @@ + */ + + #define JPEG_INTERNALS +-#include "jinclude.h" +-#include "jpeglib.h" +-#include "jmemsys.h" /* import the system-dependent declarations */ ++#include "JINCLUDE.H" ++#include "JPEGLIB.H" ++#include "JMEMSYS.H" /* import the system-dependent declarations */ + + /* the PAPYRUS3 memory manager */ + /* Papyrus 3 redefined basic types */ +--- papyrus-3.7.1.orig/JpegDir/JpgLossy/JDAPISTD.C ++++ papyrus-3.7.1/JpegDir/JpgLossy/JDAPISTD.C +@@ -15,8 +15,8 @@ + */ + + #define JPEG_INTERNALS +-#include "jinclude.h" +-#include "jpeglib.h" ++#include "JINCLUDE.H" ++#include "JPEGLIB.H" + + + /* Forward declarations */ +--- papyrus-3.7.1.orig/JpegDir/JpgLossy/JCOMAPI.C ++++ papyrus-3.7.1/JpegDir/JpgLossy/JCOMAPI.C +@@ -10,8 +10,8 @@ + */ + + #define JPEG_INTERNALS +-#include "jinclude.h" +-#include "jpeglib.h" ++#include "JINCLUDE.H" ++#include "JPEGLIB.H" + + + /* +--- papyrus-3.7.1.orig/JpegDir/JpgLossy/JCMASTER.C ++++ papyrus-3.7.1/JpegDir/JpgLossy/JCMASTER.C +@@ -12,8 +12,8 @@ + */ + + #define JPEG_INTERNALS +-#include "jinclude.h" +-#include "jpeglib.h" ++#include "JINCLUDE.H" ++#include "JPEGLIB.H" + + + /* Private state */ +--- papyrus-3.7.1.orig/JpegDir/JpgLossy/JINCLUDE.H ++++ papyrus-3.7.1/JpegDir/JpgLossy/JINCLUDE.H +@@ -17,7 +17,7 @@ + + /* Include auto-config file to find out which system include files we need. */ + +-#include "jconfig.h" /* auto configuration options */ ++#include "JCONFIG.H" /* auto configuration options */ + #define JCONFIG_INCLUDED /* so that jpeglib.h doesn't do it again */ + + /* +--- papyrus-3.7.1.orig/JpegDir/JpgLossy/CMakeLists.txt ++++ papyrus-3.7.1/JpegDir/JpgLossy/CMakeLists.txt +@@ -1,51 +1,52 @@ +-# Jpglossy ++# 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}) ++ 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}) ++set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE C) ++set_target_properties(JpgLossy PROPERTIES LINKER_LANGUAGE C) +--- papyrus-3.7.1.orig/JpegDir/JpgLossy/JCPHUFF.C ++++ papyrus-3.7.1/JpegDir/JpgLossy/JCPHUFF.C +@@ -13,9 +13,9 @@ + */ + + #define JPEG_INTERNALS +-#include "jinclude.h" +-#include "jpeglib.h" +-#include "jchuff.h" /* Declarations shared with jchuff.c */ ++#include "JINCLUDE.H" ++#include "JPEGLIB.H" ++#include "JCHUFF.H" /* Declarations shared with jchuff.c */ + + #ifdef C_PROGRESSIVE_SUPPORTED + +--- papyrus-3.7.1.orig/JpegDir/JpgLossy/JDMAINCT.C ++++ papyrus-3.7.1/JpegDir/JpgLossy/JDMAINCT.C +@@ -14,8 +14,8 @@ + */ + + #define JPEG_INTERNALS +-#include "jinclude.h" +-#include "jpeglib.h" ++#include "JINCLUDE.H" ++#include "JPEGLIB.H" + + + /* +--- papyrus-3.7.1.orig/JpegDir/JpgLossy/JCPARAM.C ++++ papyrus-3.7.1/JpegDir/JpgLossy/JCPARAM.C +@@ -11,8 +11,8 @@ + */ + + #define JPEG_INTERNALS +-#include "jinclude.h" +-#include "jpeglib.h" ++#include "JINCLUDE.H" ++#include "JPEGLIB.H" + + + /* +--- papyrus-3.7.1.orig/JpegDir/JpgLossy/JFDCTINT.C ++++ papyrus-3.7.1/JpegDir/JpgLossy/JFDCTINT.C +@@ -24,9 +24,9 @@ + */ + + #define JPEG_INTERNALS +-#include "jinclude.h" +-#include "jpeglib.h" +-#include "jdct.h" /* Private declarations for DCT subsystem */ ++#include "JINCLUDE.H" ++#include "JPEGLIB.H" ++#include "JDCT.H" /* Private declarations for DCT subsystem */ + + #ifdef DCT_ISLOW_SUPPORTED + +--- papyrus-3.7.1.orig/JpegDir/JpgLossy/JCPREPCT.C ++++ papyrus-3.7.1/JpegDir/JpgLossy/JCPREPCT.C +@@ -15,8 +15,8 @@ + */ + + #define JPEG_INTERNALS +-#include "jinclude.h" +-#include "jpeglib.h" ++#include "JINCLUDE.H" ++#include "JPEGLIB.H" + + + /* At present, jcsample.c can request context rows only for smoothing. +--- papyrus-3.7.1.orig/JpegDir/JpgLossy/JDDCTMGR.C ++++ papyrus-3.7.1/JpegDir/JpgLossy/JDDCTMGR.C +@@ -16,9 +16,9 @@ + */ + + #define JPEG_INTERNALS +-#include "jinclude.h" +-#include "jpeglib.h" +-#include "jdct.h" /* Private declarations for DCT subsystem */ ++#include "JINCLUDE.H" ++#include "JPEGLIB.H" ++#include "JDCT.H" /* Private declarations for DCT subsystem */ + + + /* +--- papyrus-3.7.1.orig/JpegDir/JpgLossy/jmemmgr.c ++++ papyrus-3.7.1/JpegDir/JpgLossy/jmemmgr.c +@@ -26,9 +26,9 @@ + + #define JPEG_INTERNALS + #define AM_MEMORY_MANAGER /* we define jvirt_Xarray_control structs */ +-#include "jinclude.h" +-#include "jpeglib.h" +-#include "jmemsys.h" /* import the system-dependent declarations */ ++#include "JINCLUDE.H" ++#include "JPEGLIB.H" ++#include "JMEMSYS.H" /* import the system-dependent declarations */ + + #ifndef NO_GETENV + #ifndef HAVE_STDLIB_H /* <stdlib.h> should declare getenv() */ +--- papyrus-3.7.1.orig/JpegDir/JpgLossy/JIDCTFST.C ++++ papyrus-3.7.1/JpegDir/JpgLossy/JIDCTFST.C +@@ -33,9 +33,9 @@ + */ + + #define JPEG_INTERNALS +-#include "jinclude.h" +-#include "jpeglib.h" +-#include "jdct.h" /* Private declarations for DCT subsystem */ ++#include "JINCLUDE.H" ++#include "JPEGLIB.H" ++#include "JDCT.H" /* Private declarations for DCT subsystem */ + + #ifdef DCT_IFAST_SUPPORTED + +--- papyrus-3.7.1.orig/JpegDir/JpgLossy/JIDCTINT.C ++++ papyrus-3.7.1/JpegDir/JpgLossy/JIDCTINT.C +@@ -26,9 +26,9 @@ + */ + + #define JPEG_INTERNALS +-#include "jinclude.h" +-#include "jpeglib.h" +-#include "jdct.h" /* Private declarations for DCT subsystem */ ++#include "JINCLUDE.H" ++#include "JPEGLIB.H" ++#include "JDCT.H" /* Private declarations for DCT subsystem */ + + #ifdef DCT_ISLOW_SUPPORTED + +--- papyrus-3.7.1.orig/JpegDir/JpgLossy/JDATADST.C ++++ papyrus-3.7.1/JpegDir/JpgLossy/JDATADST.C +@@ -15,9 +15,9 @@ + */ + + /* this is not a core library module, so it doesn't define JPEG_INTERNALS */ +-#include "jinclude.h" +-#include "jpeglib.h" +-#include "jerror.h" ++#include "JINCLUDE.H" ++#include "JPEGLIB.H" ++#include "JERROR.H" + + + /* Expanded data destination object for stdio output */ +--- papyrus-3.7.1.orig/JpegDir/JpgLossy/JDINPUT.C ++++ papyrus-3.7.1/JpegDir/JpgLossy/JDINPUT.C +@@ -12,8 +12,8 @@ + */ + + #define JPEG_INTERNALS +-#include "jinclude.h" +-#include "jpeglib.h" ++#include "JINCLUDE.H" ++#include "JPEGLIB.H" + + + /* Private state */ +--- papyrus-3.7.1.orig/JpegDir/JpgLossy/JPEGLIB.H ++++ papyrus-3.7.1/JpegDir/JpgLossy/JPEGLIB.H +@@ -1128,8 +1128,8 @@ struct jpeg_color_quantizer { long dummy + */ + + #ifdef JPEG_INTERNALS +-#include "jpegint.h" /* fetch private declarations */ +-#include "jerror.h" /* fetch error codes too */ ++#include "JPEGINT.H" /* fetch private declarations */ ++#include "JERROR.H" /* fetch error codes too */ + #endif + + #endif /* JPEGLIB_H */ +--- papyrus-3.7.1.orig/JpegDir/JpgLossy/JDCOLOR.C ++++ papyrus-3.7.1/JpegDir/JpgLossy/JDCOLOR.C +@@ -9,8 +9,8 @@ + */ + + #define JPEG_INTERNALS +-#include "jinclude.h" +-#include "jpeglib.h" ++#include "JINCLUDE.H" ++#include "JPEGLIB.H" + + + /* Private subobject */ +--- papyrus-3.7.1.orig/JpegDir/JpgLossy/JDAPIMIN.C ++++ papyrus-3.7.1/JpegDir/JpgLossy/JDAPIMIN.C +@@ -17,8 +17,8 @@ + */ + + #define JPEG_INTERNALS +-#include "jinclude.h" +-#include "jpeglib.h" ++#include "JINCLUDE.H" ++#include "JPEGLIB.H" + + + /* +--- papyrus-3.7.1.orig/JpegDir/JpgLossy/JFDCTFST.C ++++ papyrus-3.7.1/JpegDir/JpgLossy/JFDCTFST.C +@@ -31,9 +31,9 @@ + */ + + #define JPEG_INTERNALS +-#include "jinclude.h" +-#include "jpeglib.h" +-#include "jdct.h" /* Private declarations for DCT subsystem */ ++#include "JINCLUDE.H" ++#include "JPEGLIB.H" ++#include "JDCT.H" /* Private declarations for DCT subsystem */ + + #ifdef DCT_IFAST_SUPPORTED + +--- papyrus-3.7.1.orig/JpegDir/JpgLossy/JDSAMPLE.C ++++ papyrus-3.7.1/JpegDir/JpgLossy/JDSAMPLE.C +@@ -19,8 +19,8 @@ + */ + + #define JPEG_INTERNALS +-#include "jinclude.h" +-#include "jpeglib.h" ++#include "JINCLUDE.H" ++#include "JPEGLIB.H" + + + /* Pointer to routine to upsample a single component */ +--- papyrus-3.7.1.orig/JpegDir/JpgLossy/JDPOSTCT.C ++++ papyrus-3.7.1/JpegDir/JpgLossy/JDPOSTCT.C +@@ -17,8 +17,8 @@ + */ + + #define JPEG_INTERNALS +-#include "jinclude.h" +-#include "jpeglib.h" ++#include "JINCLUDE.H" ++#include "JPEGLIB.H" + + + /* Private buffer controller object */ +--- papyrus-3.7.1.orig/JpegDir/JpgLossy/JQUANT2.C ++++ papyrus-3.7.1/JpegDir/JpgLossy/JQUANT2.C +@@ -18,8 +18,8 @@ + */ + + #define JPEG_INTERNALS +-#include "jinclude.h" +-#include "jpeglib.h" ++#include "JINCLUDE.H" ++#include "JPEGLIB.H" + + #ifdef QUANT_2PASS_SUPPORTED + +--- papyrus-3.7.1.orig/JpegDir/JpgLossy/JDATASRC.C ++++ papyrus-3.7.1/JpegDir/JpgLossy/JDATASRC.C +@@ -15,9 +15,9 @@ + */ + + /* this is not a core library module, so it doesn't define JPEG_INTERNALS */ +-#include "jinclude.h" +-#include "jpeglib.h" +-#include "jerror.h" ++#include "JINCLUDE.H" ++#include "JPEGLIB.H" ++#include "JERROR.H" + + + /* Expanded data source object for stdio input */ +--- papyrus-3.7.1.orig/JpegDir/JpgLossy/JIDCTFLT.C ++++ papyrus-3.7.1/JpegDir/JpgLossy/JIDCTFLT.C +@@ -37,9 +37,9 @@ + */ + + #define JPEG_INTERNALS +-#include "jinclude.h" +-#include "jpeglib.h" +-#include "jdct.h" /* Private declarations for DCT subsystem */ ++#include "JINCLUDE.H" ++#include "JPEGLIB.H" ++#include "JDCT.H" /* Private declarations for DCT subsystem */ + + #ifdef DCT_FLOAT_SUPPORTED + +--- papyrus-3.7.1.orig/JpegDir/JpgLossy/JCINIT.C ++++ papyrus-3.7.1/JpegDir/JpgLossy/JCINIT.C +@@ -16,8 +16,8 @@ + */ + + #define JPEG_INTERNALS +-#include "jinclude.h" +-#include "jpeglib.h" ++#include "JINCLUDE.H" ++#include "JPEGLIB.H" + + + /* +--- papyrus-3.7.1.orig/JpegDir/JpgLossy/RDCOLMAP.C ++++ papyrus-3.7.1/JpegDir/JpgLossy/RDCOLMAP.C +@@ -21,7 +21,7 @@ + * currently implemented. + */ + +-#include "cdjpeg.h" /* Common decls for cjpeg/djpeg applications */ ++#include "CDJPEG.H" /* Common decls for cjpeg/djpeg applications */ + + /* Papyrus 3 redefined basic types */ + #ifndef FILENAME83 /* this is for the normal machines ... */ +--- papyrus-3.7.1.orig/JpegDir/JpgLossy/JCAPIMIN.C ++++ papyrus-3.7.1/JpegDir/JpgLossy/JCAPIMIN.C +@@ -17,8 +17,8 @@ + */ + + #define JPEG_INTERNALS +-#include "jinclude.h" +-#include "jpeglib.h" ++#include "JINCLUDE.H" ++#include "JPEGLIB.H" + + + /* +--- papyrus-3.7.1.orig/JpegDir/JpgLossy/JCMARKER.C ++++ papyrus-3.7.1/JpegDir/JpgLossy/JCMARKER.C +@@ -9,8 +9,8 @@ + */ + + #define JPEG_INTERNALS +-#include "jinclude.h" +-#include "jpeglib.h" ++#include "JINCLUDE.H" ++#include "JPEGLIB.H" + + + typedef enum { /* JPEG marker codes */ +--- papyrus-3.7.1.orig/JpegDir/JpgLossy/JIDCTRED.C ++++ papyrus-3.7.1/JpegDir/JpgLossy/JIDCTRED.C +@@ -21,9 +21,9 @@ + */ + + #define JPEG_INTERNALS +-#include "jinclude.h" +-#include "jpeglib.h" +-#include "jdct.h" /* Private declarations for DCT subsystem */ ++#include "JINCLUDE.H" ++#include "JPEGLIB.H" ++#include "JDCT.H" /* Private declarations for DCT subsystem */ + + #ifdef IDCT_SCALING_SUPPORTED + +--- papyrus-3.7.1.orig/JpegDir/JpgLossy/JDHUFF.C ++++ papyrus-3.7.1/JpegDir/JpgLossy/JDHUFF.C +@@ -15,9 +15,9 @@ + */ + + #define JPEG_INTERNALS +-#include "jinclude.h" +-#include "jpeglib.h" +-#include "jdhuff.h" /* Declarations shared with jdphuff.c */ ++#include "JINCLUDE.H" ++#include "JPEGLIB.H" ++#include "JDHUFF.H" /* Declarations shared with jdphuff.c */ + + + /* +--- papyrus-3.7.1.orig/JpegDir/JpgLossy/JCCOEFCT.C ++++ papyrus-3.7.1/JpegDir/JpgLossy/JCCOEFCT.C +@@ -11,8 +11,8 @@ + */ + + #define JPEG_INTERNALS +-#include "jinclude.h" +-#include "jpeglib.h" ++#include "JINCLUDE.H" ++#include "JPEGLIB.H" + + + /* We use a full-image coefficient buffer when doing Huffman optimization, +--- papyrus-3.7.1.orig/JpegDir/JpgLossy/JFDCTFLT.C ++++ papyrus-3.7.1/JpegDir/JpgLossy/JFDCTFLT.C +@@ -35,9 +35,9 @@ + */ + + #define JPEG_INTERNALS +-#include "jinclude.h" +-#include "jpeglib.h" +-#include "jdct.h" /* Private declarations for DCT subsystem */ ++#include "JINCLUDE.H" ++#include "JPEGLIB.H" ++#include "JDCT.H" /* Private declarations for DCT subsystem */ + + #ifdef DCT_FLOAT_SUPPORTED + +--- papyrus-3.7.1.orig/JpegDir/JpgLossy/JDCOEFCT.C ++++ papyrus-3.7.1/JpegDir/JpgLossy/JDCOEFCT.C +@@ -15,8 +15,8 @@ + */ + + #define JPEG_INTERNALS +-#include "jinclude.h" +-#include "jpeglib.h" ++#include "JINCLUDE.H" ++#include "JPEGLIB.H" + + /* Block smoothing is only applicable for progressive JPEG, so: */ + #ifndef D_PROGRESSIVE_SUPPORTED +--- papyrus-3.7.1.orig/JpegDir/JpgLossy/JDMERGE.C ++++ papyrus-3.7.1/JpegDir/JpgLossy/JDMERGE.C +@@ -33,8 +33,8 @@ + */ + + #define JPEG_INTERNALS +-#include "jinclude.h" +-#include "jpeglib.h" ++#include "JINCLUDE.H" ++#include "JPEGLIB.H" + + #ifdef UPSAMPLE_MERGING_SUPPORTED + +--- papyrus-3.7.1.orig/JpegDir/JpgLossy/JCAPISTD.C ++++ papyrus-3.7.1/JpegDir/JpgLossy/JCAPISTD.C +@@ -15,8 +15,8 @@ + */ + + #define JPEG_INTERNALS +-#include "jinclude.h" +-#include "jpeglib.h" ++#include "JINCLUDE.H" ++#include "JPEGLIB.H" + + + /* +--- papyrus-3.7.1.orig/JpegDir/JpgLossy/JQUANT1.C ++++ papyrus-3.7.1/JpegDir/JpgLossy/JQUANT1.C +@@ -11,8 +11,8 @@ + */ + + #define JPEG_INTERNALS +-#include "jinclude.h" +-#include "jpeglib.h" ++#include "JINCLUDE.H" ++#include "JPEGLIB.H" + + #ifdef QUANT_1PASS_SUPPORTED + Modified: trunk/packages/papyrus/trunk/debian/patches/series =================================================================== --- trunk/packages/papyrus/trunk/debian/patches/series 2013-10-28 13:07:26 UTC (rev 15012) +++ trunk/packages/papyrus/trunk/debian/patches/series 2013-10-28 13:12:28 UTC (rev 15013) @@ -1,2 +1,3 @@ all.patch more.patch +more2.patch _______________________________________________ debian-med-commit mailing list debian-med-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit