[med-svn] r15024 - trunk/packages/papyrus/trunk/debian/patches

Mathieu Malaterre malat at alioth.debian.org
Mon Oct 28 15:54:54 UTC 2013


Author: malat
Date: 2013-10-28 15:54:53 +0000 (Mon, 28 Oct 2013)
New Revision: 15024

Added:
   trunk/packages/papyrus/trunk/debian/patches/addcmake.patch
Removed:
   trunk/packages/papyrus/trunk/debian/patches/installheader.patch
   trunk/packages/papyrus/trunk/debian/patches/more2.patch
   trunk/packages/papyrus/trunk/debian/patches/redo.patch
   trunk/packages/papyrus/trunk/debian/patches/ya.patch
Modified:
   trunk/packages/papyrus/trunk/debian/patches/fixcase.patch
   trunk/packages/papyrus/trunk/debian/patches/fixcmake.patch
   trunk/packages/papyrus/trunk/debian/patches/fixcxx.patch
   trunk/packages/papyrus/trunk/debian/patches/fixmakefiles.patch
   trunk/packages/papyrus/trunk/debian/patches/hardening.patch
   trunk/packages/papyrus/trunk/debian/patches/series
Log:
Add Dep-3 headers

Added: trunk/packages/papyrus/trunk/debian/patches/addcmake.patch
===================================================================
--- trunk/packages/papyrus/trunk/debian/patches/addcmake.patch	                        (rev 0)
+++ trunk/packages/papyrus/trunk/debian/patches/addcmake.patch	2013-10-28 15:54:53 UTC (rev 15024)
@@ -0,0 +1,318 @@
+Description: Prefer a CMake based build system
+Author: Mathieu Malaterre <malat at debian.org>
+Forwarded: no
+
+Index: Papyrus3/JpegDir/JpgLless/CMakeLists.txt
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ Papyrus3/JpegDir/JpgLless/CMakeLists.txt	2013-10-28 16:50:12.000000000 +0100
+@@ -0,0 +1,18 @@
++# JpgLless
++set(SOURCES
++	decompoptimise.c
++	huffcoptimisebug.c
++	huffdoptimise.c
++	JPEGUTIL.C
++	MCU.C
++	pmreadoptimise.c
++	pnmtoljpoptimisebug.c
++	PREDICT.C
++	READ.C
++	WRITE.C
++	)
++set_source_files_properties(PROTO.H PROPERTIES LANGUAGE C)
++
++add_library(JpgLless ${SOURCES})
++set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE C)
++set_target_properties(JpgLless PROPERTIES LINKER_LANGUAGE C)
+Index: Papyrus3/CMakeLists.txt
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ Papyrus3/CMakeLists.txt	2013-10-28 16:51:27.000000000 +0100
+@@ -0,0 +1,176 @@
++# Copyright Mathieu Malaterre <malat at debian.org>
++# LGPL-2.1
++cmake_minimum_required(VERSION 2.8)
++project(Papyrus3 C)
++
++set(JPEGDIRLL JpegDir/JpgLless)
++set(JPEGDIRLY JpegDir/JpgLossy)
++set(DICOMDIR  DicomDir)
++
++#set(BUILD_SHARED_LIBS ON)
++
++include_directories(
++  ${JPEGDIRLL}
++  ${JPEGDIRLY}
++  ${DICOMDIR}
++  ${CMAKE_CURRENT_SOURCE_DIR}
++  )
++
++set(SOURCES
++  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)
++  list(APPEND SOURCES PapyFileSystemUnix3.c PapyEallocUnix3.c)
++endif()
++if(WIN32)
++  list(APPEND SOURCES PapyFileSystemPC3.c PapyEallocPC3.c)
++endif()
++
++list(APPEND SOURCES 
++  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)
++
++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
++  )
++
++add_library(Papyrus3 ${SOURCES})
++# http://bugs.debian.org/728108
++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)
++
++add_subdirectory(TESTS)
++
++install(TARGETS Papyrus3
++  RUNTIME DESTINATION bin
++  LIBRARY DESTINATION lib
++  ARCHIVE DESTINATION lib
++  )
++
++install(FILES
++  ${HEADERS}
++  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 16:50:12.000000000 +0100
+@@ -0,0 +1,52 @@
++# 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})
++set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE C)
++set_target_properties(JpgLossy PROPERTIES LINKER_LANGUAGE C)
+Index: Papyrus3/DicomDir/CMakeLists.txt
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ Papyrus3/DicomDir/CMakeLists.txt	2013-10-28 16:50:12.000000000 +0100
+@@ -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
++#  )
+Index: Papyrus3/TESTS/CMakeLists.txt
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ Papyrus3/TESTS/CMakeLists.txt	2013-10-28 16:51:42.000000000 +0100
+@@ -0,0 +1,8 @@
++# Tests
++add_executable(TestRead TestRead.c)
++target_link_libraries(TestRead Papyrus3)
++set_source_files_properties(TestRead.c PROPERTIES LANGUAGE C)
++
++#add_executable(TestWrite TestWrite.c)
++#target_link_libraries(TestWrite Papyrus3)
++#set_source_files_properties(TestWrite.c PROPERTIES LANGUAGE C)

Modified: trunk/packages/papyrus/trunk/debian/patches/fixcase.patch
===================================================================
--- trunk/packages/papyrus/trunk/debian/patches/fixcase.patch	2013-10-28 15:40:01 UTC (rev 15023)
+++ trunk/packages/papyrus/trunk/debian/patches/fixcase.patch	2013-10-28 15:54:53 UTC (rev 15024)
@@ -4,8 +4,8 @@
 
 Index: Papyrus3/JpegDir/JpgLless/MCU.C
 ===================================================================
---- Papyrus3.orig/JpegDir/JpgLless/MCU.C	2013-10-28 16:36:15.000000000 +0100
-+++ Papyrus3/JpegDir/JpgLless/MCU.C	2013-10-28 16:37:01.000000000 +0100
+--- Papyrus3.orig/JpegDir/JpgLless/MCU.C	2013-10-28 16:47:58.000000000 +0100
++++ Papyrus3/JpegDir/JpgLless/MCU.C	2013-10-28 16:48:31.000000000 +0100
 @@ -32,9 +32,9 @@
  #include <stdlib.h>
  /* #include <malloc.h> */
@@ -21,8 +21,8 @@
  /* Papyrus 3 redefined basic types */
 Index: Papyrus3/JpegDir/JpgLless/WRITE.C
 ===================================================================
---- Papyrus3.orig/JpegDir/JpgLless/WRITE.C	2013-10-28 16:36:15.000000000 +0100
-+++ Papyrus3/JpegDir/JpgLless/WRITE.C	2013-10-28 16:37:01.000000000 +0100
+--- Papyrus3.orig/JpegDir/JpgLless/WRITE.C	2013-10-28 16:47:58.000000000 +0100
++++ Papyrus3/JpegDir/JpgLless/WRITE.C	2013-10-28 16:48:31.000000000 +0100
 @@ -38,10 +38,10 @@
  #include <malloc.h>
  */
@@ -40,8 +40,8 @@
  #ifndef FILENAME83		/* this is for the normal machines ... */
 Index: Papyrus3/JpegDir/JpgLless/READ.C
 ===================================================================
---- Papyrus3.orig/JpegDir/JpgLless/READ.C	2013-10-28 16:36:15.000000000 +0100
-+++ Papyrus3/JpegDir/JpgLless/READ.C	2013-10-28 16:37:01.000000000 +0100
+--- Papyrus3.orig/JpegDir/JpgLless/READ.C	2013-10-28 16:47:58.000000000 +0100
++++ Papyrus3/JpegDir/JpgLless/READ.C	2013-10-28 16:48:31.000000000 +0100
 @@ -36,10 +36,10 @@
  #include <stdio.h>
  #include <stdlib.h>
@@ -59,8 +59,8 @@
   * To fix a memory leak (memory malloc'd then never freed) in the original
 Index: Papyrus3/JpegDir/JpgLless/pnmtoljpoptimisebug.c
 ===================================================================
---- Papyrus3.orig/JpegDir/JpgLless/pnmtoljpoptimisebug.c	2013-10-28 16:36:15.000000000 +0100
-+++ Papyrus3/JpegDir/JpgLless/pnmtoljpoptimisebug.c	2013-10-28 16:37:01.000000000 +0100
+--- Papyrus3.orig/JpegDir/JpgLless/pnmtoljpoptimisebug.c	2013-10-28 16:47:58.000000000 +0100
++++ Papyrus3/JpegDir/JpgLless/pnmtoljpoptimisebug.c	2013-10-28 16:48:31.000000000 +0100
 @@ -42,10 +42,10 @@
  #include <errno.h>
  
@@ -78,8 +78,8 @@
  #ifndef FILENAME83		/* this is for the normal machines ... */
 Index: Papyrus3/JpegDir/JpgLless/pmreadoptimise.c
 ===================================================================
---- Papyrus3.orig/JpegDir/JpgLless/pmreadoptimise.c	2013-10-28 16:36:15.000000000 +0100
-+++ Papyrus3/JpegDir/JpgLless/pmreadoptimise.c	2013-10-28 16:37:01.000000000 +0100
+--- Papyrus3.orig/JpegDir/JpgLless/pmreadoptimise.c	2013-10-28 16:47:58.000000000 +0100
++++ Papyrus3/JpegDir/JpgLless/pmreadoptimise.c	2013-10-28 16:48:31.000000000 +0100
 @@ -30,11 +30,11 @@
   * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
   */
@@ -99,8 +99,8 @@
  /* Papyrus 3 redefined basic types */
 Index: Papyrus3/JpegDir/JpgLless/PREDICT.C
 ===================================================================
---- Papyrus3.orig/JpegDir/JpgLless/PREDICT.C	2013-10-28 16:36:15.000000000 +0100
-+++ Papyrus3/JpegDir/JpgLless/PREDICT.C	2013-10-28 16:37:01.000000000 +0100
+--- Papyrus3.orig/JpegDir/JpgLless/PREDICT.C	2013-10-28 16:47:58.000000000 +0100
++++ Papyrus3/JpegDir/JpgLless/PREDICT.C	2013-10-28 16:48:31.000000000 +0100
 @@ -26,7 +26,7 @@
   */
  
@@ -112,8 +112,8 @@
  /*
 Index: Papyrus3/PapyConvertFile3.c
 ===================================================================
---- Papyrus3.orig/PapyConvertFile3.c	2013-10-28 16:36:16.000000000 +0100
-+++ Papyrus3/PapyConvertFile3.c	2013-10-28 16:37:01.000000000 +0100
+--- Papyrus3.orig/PapyConvertFile3.c	2013-10-28 16:47:58.000000000 +0100
++++ Papyrus3/PapyConvertFile3.c	2013-10-28 16:48:31.000000000 +0100
 @@ -61,8 +61,8 @@
  #define CHECK_MEMORY
  #define HAVE_BOOLEAN
@@ -127,8 +127,8 @@
  #include "Papyrus3.h"
 Index: Papyrus3/JpegDir/JpgLless/JPEGLESS.H
 ===================================================================
---- Papyrus3.orig/JpegDir/JpgLless/JPEGLESS.H	2013-10-28 16:36:16.000000000 +0100
-+++ Papyrus3/JpegDir/JpgLless/JPEGLESS.H	2013-10-28 16:37:01.000000000 +0100
+--- Papyrus3.orig/JpegDir/JpgLless/JPEGLESS.H	2013-10-28 16:47:58.000000000 +0100
++++ Papyrus3/JpegDir/JpgLless/JPEGLESS.H	2013-10-28 16:48:31.000000000 +0100
 @@ -70,7 +70,7 @@
  #endif 				/* FILENAME83 defined */
  
@@ -140,8 +140,8 @@
  /* Global variables for lossless encoding process */
 Index: Papyrus3/JpegDir/JpgLossy/JPEGLIB.H
 ===================================================================
---- Papyrus3.orig/JpegDir/JpgLossy/JPEGLIB.H	2013-10-28 16:36:16.000000000 +0100
-+++ Papyrus3/JpegDir/JpgLossy/JPEGLIB.H	2013-10-28 16:37:01.000000000 +0100
+--- Papyrus3.orig/JpegDir/JpgLossy/JPEGLIB.H	2013-10-28 16:47:57.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/JPEGLIB.H	2013-10-28 16:48:31.000000000 +0100
 @@ -21,9 +21,9 @@
   */
  
@@ -154,10 +154,21 @@
  
  
  /* Papyrus 3 redefined basic types */
+@@ -1128,8 +1128,8 @@
+  */
+ 
+ #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 */
 Index: Papyrus3/DicomDir/DicomDir.h
 ===================================================================
---- Papyrus3.orig/DicomDir/DicomDir.h	2013-10-28 16:36:16.000000000 +0100
-+++ Papyrus3/DicomDir/DicomDir.h	2013-10-28 16:37:01.000000000 +0100
+--- Papyrus3.orig/DicomDir/DicomDir.h	2013-10-28 16:47:58.000000000 +0100
++++ Papyrus3/DicomDir/DicomDir.h	2013-10-28 16:48:31.000000000 +0100
 @@ -68,16 +68,16 @@
  #include "DicomDirEnumRecords.h"
  #endif
@@ -181,8 +192,8 @@
  #else				    /* FILENAME83 defined for the DOS machines */
 Index: Papyrus3/PapyRead3.c
 ===================================================================
---- Papyrus3.orig/PapyRead3.c	2013-10-28 16:36:15.000000000 +0100
-+++ Papyrus3/PapyRead3.c	2013-10-28 16:37:01.000000000 +0100
+--- Papyrus3.orig/PapyRead3.c	2013-10-28 16:47:57.000000000 +0100
++++ Papyrus3/PapyRead3.c	2013-10-28 16:48:31.000000000 +0100
 @@ -72,8 +72,8 @@
  #include <math.h>
  
@@ -196,8 +207,8 @@
  #include "Mayo.h"	/* interface for wavelet decompressor */
 Index: Papyrus3/PapyWrite3.c
 ===================================================================
---- Papyrus3.orig/PapyWrite3.c	2013-10-28 16:36:16.000000000 +0100
-+++ Papyrus3/PapyWrite3.c	2013-10-28 16:37:01.000000000 +0100
+--- Papyrus3.orig/PapyWrite3.c	2013-10-28 16:47:58.000000000 +0100
++++ Papyrus3/PapyWrite3.c	2013-10-28 16:48:31.000000000 +0100
 @@ -78,8 +78,8 @@
  #endif
  
@@ -211,8 +222,8 @@
  #ifdef MAYO_WAVE
 Index: Papyrus3/JpegDir/JpgLless/decompoptimise.c
 ===================================================================
---- Papyrus3.orig/JpegDir/JpgLless/decompoptimise.c	2013-10-28 16:36:16.000000000 +0100
-+++ Papyrus3/JpegDir/JpgLless/decompoptimise.c	2013-10-28 16:37:01.000000000 +0100
+--- Papyrus3.orig/JpegDir/JpgLless/decompoptimise.c	2013-10-28 16:47:58.000000000 +0100
++++ Papyrus3/JpegDir/JpgLless/decompoptimise.c	2013-10-28 16:48:31.000000000 +0100
 @@ -50,10 +50,10 @@
  #include <stdlib.h>
  #include <string.h>  
@@ -230,8 +241,8 @@
  /* Papyrus 3 redefined basic types */
 Index: Papyrus3/JpegDir/JpgLless/PROTO.H
 ===================================================================
---- Papyrus3.orig/JpegDir/JpgLless/PROTO.H	2013-10-28 16:36:16.000000000 +0100
-+++ Papyrus3/JpegDir/JpgLless/PROTO.H	2013-10-28 16:37:01.000000000 +0100
+--- Papyrus3.orig/JpegDir/JpgLless/PROTO.H	2013-10-28 16:47:58.000000000 +0100
++++ Papyrus3/JpegDir/JpgLless/PROTO.H	2013-10-28 16:48:31.000000000 +0100
 @@ -42,7 +42,7 @@
  # define P(s) ()
  #endif
@@ -243,8 +254,8 @@
  
 Index: Papyrus3/JpegDir/JpgLless/IO.H
 ===================================================================
---- Papyrus3.orig/JpegDir/JpgLless/IO.H	2013-10-28 16:36:16.000000000 +0100
-+++ Papyrus3/JpegDir/JpgLless/IO.H	2013-10-28 16:37:01.000000000 +0100
+--- Papyrus3.orig/JpegDir/JpgLless/IO.H	2013-10-28 16:47:58.000000000 +0100
++++ Papyrus3/JpegDir/JpgLless/IO.H	2013-10-28 16:48:31.000000000 +0100
 @@ -52,7 +52,7 @@
  #ifndef _IO
  #define _IO
@@ -256,8 +267,8 @@
  /*
 Index: Papyrus3/JpegDir/JpgLless/huffcoptimisebug.c
 ===================================================================
---- Papyrus3.orig/JpegDir/JpgLless/huffcoptimisebug.c	2013-10-28 16:36:16.000000000 +0100
-+++ Papyrus3/JpegDir/JpgLless/huffcoptimisebug.c	2013-10-28 16:37:01.000000000 +0100
+--- Papyrus3.orig/JpegDir/JpgLless/huffcoptimisebug.c	2013-10-28 16:47:58.000000000 +0100
++++ Papyrus3/JpegDir/JpgLless/huffcoptimisebug.c	2013-10-28 16:48:31.000000000 +0100
 @@ -42,12 +42,12 @@
  #include <stdlib.h>
  #include <string.h>
@@ -279,8 +290,8 @@
  /* Papyrus 3 redefined basic types */
 Index: Papyrus3/JpegDir/JpgLless/huffdoptimise.c
 ===================================================================
---- Papyrus3.orig/JpegDir/JpgLless/huffdoptimise.c	2013-10-28 16:36:16.000000000 +0100
-+++ Papyrus3/JpegDir/JpgLless/huffdoptimise.c	2013-10-28 16:37:01.000000000 +0100
+--- Papyrus3.orig/JpegDir/JpgLless/huffdoptimise.c	2013-10-28 16:47:58.000000000 +0100
++++ Papyrus3/JpegDir/JpgLless/huffdoptimise.c	2013-10-28 16:48:31.000000000 +0100
 @@ -42,11 +42,11 @@
  #include <stdlib.h>
  #include <string.h>
@@ -298,3 +309,905 @@
  
  /* Papyrus 3 redefined basic types */
  #ifndef FILENAME83		/* this is for the normal machines ... */
+Index: Papyrus3/JpegDir/JpgLossy/JCSAMPLE.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/JCSAMPLE.C	2013-10-28 16:47:58.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/JCSAMPLE.C	2013-10-28 16:48:31.000000000 +0100
+@@ -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 */
+Index: Papyrus3/JpegDir/JpgLossy/JDPHUFF.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/JDPHUFF.C	2013-10-28 16:47:57.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/JDPHUFF.C	2013-10-28 16:48:31.000000000 +0100
+@@ -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
+Index: Papyrus3/JpegDir/JpgLossy/JDMASTER.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/JDMASTER.C	2013-10-28 16:47:57.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/JDMASTER.C	2013-10-28 16:48:31.000000000 +0100
+@@ -12,8 +12,8 @@
+  */
+ 
+ #define JPEG_INTERNALS
+-#include "jinclude.h"
+-#include "jpeglib.h"
++#include "JINCLUDE.H"
++#include "JPEGLIB.H"
+ 
+ 
+ /* Private state */
+Index: Papyrus3/JpegDir/JpgLossy/JCHUFF.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/JCHUFF.C	2013-10-28 16:47:57.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/JCHUFF.C	2013-10-28 16:48:31.000000000 +0100
+@@ -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.
+Index: Papyrus3/JpegDir/JpgLossy/JCCOLOR.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/JCCOLOR.C	2013-10-28 16:47:57.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/JCCOLOR.C	2013-10-28 16:48:31.000000000 +0100
+@@ -9,8 +9,8 @@
+  */
+ 
+ #define JPEG_INTERNALS
+-#include "jinclude.h"
+-#include "jpeglib.h"
++#include "JINCLUDE.H"
++#include "JPEGLIB.H"
+ 
+ 
+ /* Private subobject */
+Index: Papyrus3/JpegDir/JpgLossy/JDMARKER.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/JDMARKER.C	2013-10-28 16:47:58.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/JDMARKER.C	2013-10-28 16:48:31.000000000 +0100
+@@ -13,8 +13,8 @@
+  */
+ 
+ #define JPEG_INTERNALS
+-#include "jinclude.h"
+-#include "jpeglib.h"
++#include "JINCLUDE.H"
++#include "JPEGLIB.H"
+ 
+ 
+ typedef enum {			/* JPEG marker codes */
+Index: Papyrus3/JpegDir/JpgLossy/JCDCTMGR.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/JCDCTMGR.C	2013-10-28 16:47:57.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/JCDCTMGR.C	2013-10-28 16:48:31.000000000 +0100
+@@ -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 */
+Index: Papyrus3/JpegDir/JpgLossy/CDJPEG.H
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/CDJPEG.H	2013-10-28 16:47:58.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/CDJPEG.H	2013-10-28 16:48:31.000000000 +0100
+@@ -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 */
+ 
+ 
+ /*
+Index: Papyrus3/JpegDir/JpgLossy/JCMAINCT.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/JCMAINCT.C	2013-10-28 16:47:57.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/JCMAINCT.C	2013-10-28 16:48:31.000000000 +0100
+@@ -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
+Index: Papyrus3/JpegDir/JpgLossy/JUTILS.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/JUTILS.C	2013-10-28 16:47:57.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/JUTILS.C	2013-10-28 16:48:31.000000000 +0100
+@@ -12,8 +12,8 @@
+  */
+ 
+ #define JPEG_INTERNALS
+-#include "jinclude.h"
+-#include "jpeglib.h"
++#include "JINCLUDE.H"
++#include "JPEGLIB.H"
+ 
+ 
+ /*
+Index: Papyrus3/JpegDir/JpgLossy/JERROR.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/JERROR.C	2013-10-28 16:47:57.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/JERROR.C	2013-10-28 16:48:31.000000000 +0100
+@@ -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
+ };
+ 
+Index: Papyrus3/JpegDir/JpgLossy/JMEMNOBS.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/JMEMNOBS.C	2013-10-28 16:47:57.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/JMEMNOBS.C	2013-10-28 16:48:31.000000000 +0100
+@@ -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 */
+Index: Papyrus3/JpegDir/JpgLossy/JDAPISTD.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/JDAPISTD.C	2013-10-28 16:47:57.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/JDAPISTD.C	2013-10-28 16:48:31.000000000 +0100
+@@ -15,8 +15,8 @@
+  */
+ 
+ #define JPEG_INTERNALS
+-#include "jinclude.h"
+-#include "jpeglib.h"
++#include "JINCLUDE.H"
++#include "JPEGLIB.H"
+ 
+ 
+ /* Forward declarations */
+Index: Papyrus3/JpegDir/JpgLossy/JCOMAPI.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/JCOMAPI.C	2013-10-28 16:47:57.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/JCOMAPI.C	2013-10-28 16:48:31.000000000 +0100
+@@ -10,8 +10,8 @@
+  */
+ 
+ #define JPEG_INTERNALS
+-#include "jinclude.h"
+-#include "jpeglib.h"
++#include "JINCLUDE.H"
++#include "JPEGLIB.H"
+ 
+ 
+ /*
+Index: Papyrus3/JpegDir/JpgLossy/JCMASTER.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/JCMASTER.C	2013-10-28 16:47:58.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/JCMASTER.C	2013-10-28 16:48:31.000000000 +0100
+@@ -12,8 +12,8 @@
+  */
+ 
+ #define JPEG_INTERNALS
+-#include "jinclude.h"
+-#include "jpeglib.h"
++#include "JINCLUDE.H"
++#include "JPEGLIB.H"
+ 
+ 
+ /* Private state */
+Index: Papyrus3/JpegDir/JpgLossy/JINCLUDE.H
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/JINCLUDE.H	2013-10-28 16:47:57.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/JINCLUDE.H	2013-10-28 16:48:31.000000000 +0100
+@@ -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 */
+ 
+ /*
+Index: Papyrus3/JpegDir/JpgLossy/JCPHUFF.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/JCPHUFF.C	2013-10-28 16:47:57.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/JCPHUFF.C	2013-10-28 16:48:31.000000000 +0100
+@@ -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
+ 
+Index: Papyrus3/JpegDir/JpgLossy/JDMAINCT.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/JDMAINCT.C	2013-10-28 16:47:58.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/JDMAINCT.C	2013-10-28 16:48:31.000000000 +0100
+@@ -14,8 +14,8 @@
+  */
+ 
+ #define JPEG_INTERNALS
+-#include "jinclude.h"
+-#include "jpeglib.h"
++#include "JINCLUDE.H"
++#include "JPEGLIB.H"
+ 
+ 
+ /*
+Index: Papyrus3/JpegDir/JpgLossy/JCPARAM.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/JCPARAM.C	2013-10-28 16:47:57.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/JCPARAM.C	2013-10-28 16:48:31.000000000 +0100
+@@ -11,8 +11,8 @@
+  */
+ 
+ #define JPEG_INTERNALS
+-#include "jinclude.h"
+-#include "jpeglib.h"
++#include "JINCLUDE.H"
++#include "JPEGLIB.H"
+ 
+ 
+ /*
+Index: Papyrus3/JpegDir/JpgLossy/JFDCTINT.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/JFDCTINT.C	2013-10-28 16:47:57.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/JFDCTINT.C	2013-10-28 16:48:31.000000000 +0100
+@@ -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
+ 
+Index: Papyrus3/JpegDir/JpgLossy/JCPREPCT.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/JCPREPCT.C	2013-10-28 16:47:58.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/JCPREPCT.C	2013-10-28 16:48:31.000000000 +0100
+@@ -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.
+Index: Papyrus3/JpegDir/JpgLossy/JDDCTMGR.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/JDDCTMGR.C	2013-10-28 16:47:57.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/JDDCTMGR.C	2013-10-28 16:48:31.000000000 +0100
+@@ -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 */
+ 
+ 
+ /*
+Index: Papyrus3/JpegDir/JpgLossy/jmemmgr.c
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/jmemmgr.c	2013-10-28 16:47:57.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/jmemmgr.c	2013-10-28 16:48:31.000000000 +0100
+@@ -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() */
+Index: Papyrus3/JpegDir/JpgLossy/JIDCTFST.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/JIDCTFST.C	2013-10-28 16:47:57.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/JIDCTFST.C	2013-10-28 16:48:31.000000000 +0100
+@@ -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
+ 
+Index: Papyrus3/JpegDir/JpgLossy/JIDCTINT.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/JIDCTINT.C	2013-10-28 16:47:57.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/JIDCTINT.C	2013-10-28 16:48:31.000000000 +0100
+@@ -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
+ 
+Index: Papyrus3/JpegDir/JpgLossy/JDATADST.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/JDATADST.C	2013-10-28 16:47:58.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/JDATADST.C	2013-10-28 16:48:31.000000000 +0100
+@@ -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 */
+Index: Papyrus3/JpegDir/JpgLossy/JDINPUT.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/JDINPUT.C	2013-10-28 16:47:57.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/JDINPUT.C	2013-10-28 16:48:31.000000000 +0100
+@@ -12,8 +12,8 @@
+  */
+ 
+ #define JPEG_INTERNALS
+-#include "jinclude.h"
+-#include "jpeglib.h"
++#include "JINCLUDE.H"
++#include "JPEGLIB.H"
+ 
+ 
+ /* Private state */
+Index: Papyrus3/JpegDir/JpgLossy/JDCOLOR.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/JDCOLOR.C	2013-10-28 16:47:57.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/JDCOLOR.C	2013-10-28 16:48:31.000000000 +0100
+@@ -9,8 +9,8 @@
+  */
+ 
+ #define JPEG_INTERNALS
+-#include "jinclude.h"
+-#include "jpeglib.h"
++#include "JINCLUDE.H"
++#include "JPEGLIB.H"
+ 
+ 
+ /* Private subobject */
+Index: Papyrus3/JpegDir/JpgLossy/JDAPIMIN.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/JDAPIMIN.C	2013-10-28 16:47:58.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/JDAPIMIN.C	2013-10-28 16:48:31.000000000 +0100
+@@ -17,8 +17,8 @@
+  */
+ 
+ #define JPEG_INTERNALS
+-#include "jinclude.h"
+-#include "jpeglib.h"
++#include "JINCLUDE.H"
++#include "JPEGLIB.H"
+ 
+ 
+ /*
+Index: Papyrus3/JpegDir/JpgLossy/JFDCTFST.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/JFDCTFST.C	2013-10-28 16:47:57.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/JFDCTFST.C	2013-10-28 16:48:31.000000000 +0100
+@@ -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
+ 
+Index: Papyrus3/JpegDir/JpgLossy/JDSAMPLE.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/JDSAMPLE.C	2013-10-28 16:47:57.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/JDSAMPLE.C	2013-10-28 16:48:31.000000000 +0100
+@@ -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 */
+Index: Papyrus3/JpegDir/JpgLossy/JDPOSTCT.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/JDPOSTCT.C	2013-10-28 16:47:58.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/JDPOSTCT.C	2013-10-28 16:48:31.000000000 +0100
+@@ -17,8 +17,8 @@
+  */
+ 
+ #define JPEG_INTERNALS
+-#include "jinclude.h"
+-#include "jpeglib.h"
++#include "JINCLUDE.H"
++#include "JPEGLIB.H"
+ 
+ 
+ /* Private buffer controller object */
+Index: Papyrus3/JpegDir/JpgLossy/JQUANT2.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/JQUANT2.C	2013-10-28 16:47:57.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/JQUANT2.C	2013-10-28 16:48:31.000000000 +0100
+@@ -18,8 +18,8 @@
+  */
+ 
+ #define JPEG_INTERNALS
+-#include "jinclude.h"
+-#include "jpeglib.h"
++#include "JINCLUDE.H"
++#include "JPEGLIB.H"
+ 
+ #ifdef QUANT_2PASS_SUPPORTED
+ 
+Index: Papyrus3/JpegDir/JpgLossy/JDATASRC.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/JDATASRC.C	2013-10-28 16:47:57.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/JDATASRC.C	2013-10-28 16:48:31.000000000 +0100
+@@ -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 */
+Index: Papyrus3/JpegDir/JpgLossy/JIDCTFLT.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/JIDCTFLT.C	2013-10-28 16:47:57.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/JIDCTFLT.C	2013-10-28 16:48:31.000000000 +0100
+@@ -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
+ 
+Index: Papyrus3/JpegDir/JpgLossy/JCINIT.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/JCINIT.C	2013-10-28 16:47:57.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/JCINIT.C	2013-10-28 16:48:31.000000000 +0100
+@@ -16,8 +16,8 @@
+  */
+ 
+ #define JPEG_INTERNALS
+-#include "jinclude.h"
+-#include "jpeglib.h"
++#include "JINCLUDE.H"
++#include "JPEGLIB.H"
+ 
+ 
+ /*
+Index: Papyrus3/JpegDir/JpgLossy/RDCOLMAP.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/RDCOLMAP.C	2013-10-28 16:47:57.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/RDCOLMAP.C	2013-10-28 16:48:31.000000000 +0100
+@@ -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 ... */
+Index: Papyrus3/JpegDir/JpgLossy/JCAPIMIN.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/JCAPIMIN.C	2013-10-28 16:47:57.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/JCAPIMIN.C	2013-10-28 16:48:31.000000000 +0100
+@@ -17,8 +17,8 @@
+  */
+ 
+ #define JPEG_INTERNALS
+-#include "jinclude.h"
+-#include "jpeglib.h"
++#include "JINCLUDE.H"
++#include "JPEGLIB.H"
+ 
+ 
+ /*
+Index: Papyrus3/JpegDir/JpgLossy/JCMARKER.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/JCMARKER.C	2013-10-28 16:47:57.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/JCMARKER.C	2013-10-28 16:48:31.000000000 +0100
+@@ -9,8 +9,8 @@
+  */
+ 
+ #define JPEG_INTERNALS
+-#include "jinclude.h"
+-#include "jpeglib.h"
++#include "JINCLUDE.H"
++#include "JPEGLIB.H"
+ 
+ 
+ typedef enum {			/* JPEG marker codes */
+Index: Papyrus3/JpegDir/JpgLossy/JIDCTRED.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/JIDCTRED.C	2013-10-28 16:47:57.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/JIDCTRED.C	2013-10-28 16:48:31.000000000 +0100
+@@ -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
+ 
+Index: Papyrus3/JpegDir/JpgLossy/JDHUFF.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/JDHUFF.C	2013-10-28 16:47:58.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/JDHUFF.C	2013-10-28 16:48:31.000000000 +0100
+@@ -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 */
+ 
+ 
+ /*
+Index: Papyrus3/JpegDir/JpgLossy/JCCOEFCT.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/JCCOEFCT.C	2013-10-28 16:47:57.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/JCCOEFCT.C	2013-10-28 16:48:31.000000000 +0100
+@@ -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,
+Index: Papyrus3/JpegDir/JpgLossy/JFDCTFLT.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/JFDCTFLT.C	2013-10-28 16:47:57.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/JFDCTFLT.C	2013-10-28 16:48:31.000000000 +0100
+@@ -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
+ 
+Index: Papyrus3/JpegDir/JpgLossy/JDCOEFCT.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/JDCOEFCT.C	2013-10-28 16:47:57.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/JDCOEFCT.C	2013-10-28 16:48:31.000000000 +0100
+@@ -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
+Index: Papyrus3/JpegDir/JpgLossy/JDMERGE.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/JDMERGE.C	2013-10-28 16:47:57.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/JDMERGE.C	2013-10-28 16:48:31.000000000 +0100
+@@ -33,8 +33,8 @@
+  */
+ 
+ #define JPEG_INTERNALS
+-#include "jinclude.h"
+-#include "jpeglib.h"
++#include "JINCLUDE.H"
++#include "JPEGLIB.H"
+ 
+ #ifdef UPSAMPLE_MERGING_SUPPORTED
+ 
+Index: Papyrus3/JpegDir/JpgLossy/JCAPISTD.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/JCAPISTD.C	2013-10-28 16:47:58.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/JCAPISTD.C	2013-10-28 16:48:31.000000000 +0100
+@@ -15,8 +15,8 @@
+  */
+ 
+ #define JPEG_INTERNALS
+-#include "jinclude.h"
+-#include "jpeglib.h"
++#include "JINCLUDE.H"
++#include "JPEGLIB.H"
+ 
+ 
+ /*
+Index: Papyrus3/JpegDir/JpgLossy/JQUANT1.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/JQUANT1.C	2013-10-28 16:47:57.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/JQUANT1.C	2013-10-28 16:48:31.000000000 +0100
+@@ -11,8 +11,8 @@
+  */
+ 
+ #define JPEG_INTERNALS
+-#include "jinclude.h"
+-#include "jpeglib.h"
++#include "JINCLUDE.H"
++#include "JPEGLIB.H"
+ 
+ #ifdef QUANT_1PASS_SUPPORTED
+ 
+Index: Papyrus3/JpegDir/JpgLossy/RDRLE.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/RDRLE.C	2013-10-28 16:47:57.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/RDRLE.C	2013-10-28 16:48:31.000000000 +0100
+@@ -19,7 +19,7 @@
+  * with updates from Robert Hutchinson.
+  */
+ 
+-#include "cdjpeg.h"		/* Common decls for cjpeg/djpeg applications */
++#include "CDJPEG.H"		/* Common decls for cjpeg/djpeg applications */
+ 
+ #ifdef RLE_SUPPORTED
+ 
+Index: Papyrus3/JpegDir/JpgLossy/RDGIF.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/RDGIF.C	2013-10-28 16:47:57.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/RDGIF.C	2013-10-28 16:48:31.000000000 +0100
+@@ -19,7 +19,7 @@
+  *    CompuServe Incorporated."
+  */
+ 
+-#include "cdjpeg.h"		/* Common decls for cjpeg/djpeg applications */
++#include "CDJPEG.H"		/* Common decls for cjpeg/djpeg applications */
+ 
+ #ifdef GIF_SUPPORTED
+ 
+Index: Papyrus3/JpegDir/JpgLossy/RDTARGA.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/RDTARGA.C	2013-10-28 16:47:57.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/RDTARGA.C	2013-10-28 16:48:31.000000000 +0100
+@@ -17,7 +17,7 @@
+  * Based on code contributed by Lee Daniel Crocker.
+  */
+ 
+-#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 ... */
+Index: Papyrus3/JpegDir/JpgLossy/JDTRANS.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/JDTRANS.C	2013-10-28 16:47:57.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/JDTRANS.C	2013-10-28 16:48:31.000000000 +0100
+@@ -11,8 +11,8 @@
+  */
+ 
+ #define JPEG_INTERNALS
+-#include "jinclude.h"
+-#include "jpeglib.h"
++#include "JINCLUDE.H"
++#include "JPEGLIB.H"
+ 
+ 
+ /* Forward declarations */
+Index: Papyrus3/JpegDir/JpgLossy/RDSWITCH.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/RDSWITCH.C	2013-10-28 16:47:58.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/RDSWITCH.C	2013-10-28 16:48:31.000000000 +0100
+@@ -13,7 +13,7 @@
+  *	-sample HxV[,HxV,...]	Set component sampling factors
+  */
+ 
+-#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 ... */
+Index: Papyrus3/JpegDir/JpgLossy/RDBMP.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/RDBMP.C	2013-10-28 16:47:58.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/RDBMP.C	2013-10-28 16:48:31.000000000 +0100
+@@ -21,7 +21,7 @@
+  * This code contributed by James Arthur Boucher.
+  */
+ 
+-#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 ... */
+Index: Papyrus3/JpegDir/JpgLossy/WRRLE.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/WRRLE.C	2013-10-28 16:47:58.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/WRRLE.C	2013-10-28 16:48:31.000000000 +0100
+@@ -16,7 +16,7 @@
+  * with updates from Robert Hutchinson.
+  */
+ 
+-#include "cdjpeg.h"		/* Common decls for cjpeg/djpeg applications */
++#include "CDJPEG.H"		/* Common decls for cjpeg/djpeg applications */
+ 
+ #ifdef RLE_SUPPORTED
+ 
+Index: Papyrus3/JpegDir/JpgLossy/RDPPM.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/RDPPM.C	2013-10-28 16:47:58.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/RDPPM.C	2013-10-28 16:48:31.000000000 +0100
+@@ -18,7 +18,7 @@
+  * the file is indeed PPM format).
+  */
+ 
+-#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 ... */
+Index: Papyrus3/JpegDir/JpgLossy/JCTRANS.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLossy/JCTRANS.C	2013-10-28 16:47:58.000000000 +0100
++++ Papyrus3/JpegDir/JpgLossy/JCTRANS.C	2013-10-28 16:48:31.000000000 +0100
+@@ -11,8 +11,8 @@
+  */
+ 
+ #define JPEG_INTERNALS
+-#include "jinclude.h"
+-#include "jpeglib.h"
++#include "JINCLUDE.H"
++#include "JPEGLIB.H"
+ 
+ 
+ /* Forward declarations */
+Index: Papyrus3/JpegDir/JpgLless/JPEGUTIL.C
+===================================================================
+--- Papyrus3.orig/JpegDir/JpgLless/JPEGUTIL.C	2013-10-28 16:47:58.000000000 +0100
++++ Papyrus3/JpegDir/JpgLless/JPEGUTIL.C	2013-10-28 16:48:31.000000000 +0100
+@@ -37,21 +37,17 @@
+ #include <stdlib.h>
+ #include <string.h>
+ /* #include <malloc.h> */
+-#include "jpeg.h"
+-#include "mcu.h"
+-#include "proto.h"
++#include "JPEG.H"
++#include "MCU.H"
++#include "PROTO.H"
+ 
+ 
+ /* Papyrus 3 redefined basic types */
+ #ifndef FILENAME83		/* this is for the normal machines ... */
+ 
+-#ifndef PapyEalloc3H
+ #include "PapyEalloc3.h"
+-#endif
+ 
+-#ifndef   PapyFileSystem3H
+ #include "PapyFileSystem3.h"
+-#endif
+ 
+ #else				/* FILENAME83 defined for the DOS machines */
+ 

Modified: trunk/packages/papyrus/trunk/debian/patches/fixcmake.patch
===================================================================
--- trunk/packages/papyrus/trunk/debian/patches/fixcmake.patch	2013-10-28 15:40:01 UTC (rev 15023)
+++ trunk/packages/papyrus/trunk/debian/patches/fixcmake.patch	2013-10-28 15:54:53 UTC (rev 15024)
@@ -23,54 +23,4 @@
 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
-@@ -92,6 +92,14 @@ list(APPEND SOURCES
-     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
-@@ -151,6 +159,7 @@ list(APPEND SOURCES
-      )
- 
- 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)
---- papyrus-3.7.1.orig/JpegDir/JpgLless/CMakeLists.txt
-+++ papyrus-3.7.1/JpegDir/JpgLless/CMakeLists.txt
-@@ -11,9 +11,8 @@ set(SOURCES
- 	READ.C
- 	WRITE.C
- 	)
--
--set_source_files_properties(PROTO.H PROPERTIES LANGUAGE "C")
-+set_source_files_properties(PROTO.H PROPERTIES LANGUAGE C)
- 
- add_library(JpgLless ${SOURCES})
--set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE "C")
--set_target_properties(JpgLless PROPERTIES LINKER_LANGUAGE "C")
-+set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE C)
-+set_target_properties(JpgLless PROPERTIES LINKER_LANGUAGE C)
---- papyrus-3.7.1.orig/TESTS/CMakeLists.txt
-+++ papyrus-3.7.1/TESTS/CMakeLists.txt
-@@ -1,7 +1,7 @@
- # Tests
- add_executable(TestRead TestRead.c)
- target_link_libraries(TestRead Papyrus3)
--#set_source_files_properties(TestRead.c PROPERTIES LANGUAGE CXX)
-+set_source_files_properties(TestRead.c PROPERTIES LANGUAGE C)
- 
- #add_executable(TestWrite TestWrite.c)
- #target_link_libraries(TestWrite Papyrus3)
+

Modified: trunk/packages/papyrus/trunk/debian/patches/fixcxx.patch
===================================================================
--- trunk/packages/papyrus/trunk/debian/patches/fixcxx.patch	2013-10-28 15:40:01 UTC (rev 15023)
+++ trunk/packages/papyrus/trunk/debian/patches/fixcxx.patch	2013-10-28 15:54:53 UTC (rev 15024)
@@ -1,28 +1,9 @@
-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: #)
+Description: Track down an issue with CMake trying to compile in C++
+ when specified C
 Author: Mathieu Malaterre <malat at debian.org>
+Forwarded: no
+Bug-Debian: http://bugs.debian.org/728108
 
----
-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/PapyFileSystemUnix3.c
 +++ papyrus-3.7.1/PapyFileSystemUnix3.c
 @@ -78,13 +78,9 @@
@@ -74,210 +55,6 @@
  
        sprintf(jpegFilename,"%s.%d_%d.jpg",outJpegBaseFilename, dimImageJpeg, noImage);
  
---- papyrus-3.7.1.orig/CMakeLists.txt
-+++ papyrus-3.7.1/CMakeLists.txt
-@@ -18,23 +18,33 @@ include_directories(
- #add_subdirectory(${JPEGDIRLY})
- #add_subdirectory(${DICOMDIR})
- 
-+#add_definitions(
-+#  -DPapyrus3H 
-+#  -DDicomdirH 
-+#  -DDicomdirEnumRecordsH 
-+#  -DDicomdirTypeDef3H
-+#  -DDicomdirPrivFunctionDef3H
-+#  -DDicomdirPubFunctionDef3H 
-+#  -DDicomdirGlobalVar3H      
-+#  )
-+
- set(SOURCES
--	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
-+  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
-@@ -63,81 +73,81 @@ 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 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
-+    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
-     )
- 
- 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})
 --- papyrus-3.7.1.orig/PapyInitGroups3.c
 +++ papyrus-3.7.1/PapyInitGroups3.c
 @@ -63,9 +63,7 @@
@@ -733,109 +510,6 @@
    theWrkP->nb_val = 0;
    theWrkP->value = NULL;
  
---- papyrus-3.7.1.orig/JpegDir/JpgLossy/RDRLE.C
-+++ papyrus-3.7.1/JpegDir/JpgLossy/RDRLE.C
-@@ -19,7 +19,7 @@
-  * with updates from Robert Hutchinson.
-  */
- 
--#include "cdjpeg.h"		/* Common decls for cjpeg/djpeg applications */
-+#include "CDJPEG.H"		/* Common decls for cjpeg/djpeg applications */
- 
- #ifdef RLE_SUPPORTED
- 
---- papyrus-3.7.1.orig/JpegDir/JpgLossy/RDGIF.C
-+++ papyrus-3.7.1/JpegDir/JpgLossy/RDGIF.C
-@@ -19,7 +19,7 @@
-  *    CompuServe Incorporated."
-  */
- 
--#include "cdjpeg.h"		/* Common decls for cjpeg/djpeg applications */
-+#include "CDJPEG.H"		/* Common decls for cjpeg/djpeg applications */
- 
- #ifdef GIF_SUPPORTED
- 
---- papyrus-3.7.1.orig/JpegDir/JpgLossy/RDTARGA.C
-+++ papyrus-3.7.1/JpegDir/JpgLossy/RDTARGA.C
-@@ -17,7 +17,7 @@
-  * Based on code contributed by Lee Daniel Crocker.
-  */
- 
--#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/JDTRANS.C
-+++ papyrus-3.7.1/JpegDir/JpgLossy/JDTRANS.C
-@@ -11,8 +11,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/RDSWITCH.C
-+++ papyrus-3.7.1/JpegDir/JpgLossy/RDSWITCH.C
-@@ -13,7 +13,7 @@
-  *	-sample HxV[,HxV,...]	Set component sampling factors
-  */
- 
--#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/RDBMP.C
-+++ papyrus-3.7.1/JpegDir/JpgLossy/RDBMP.C
-@@ -21,7 +21,7 @@
-  * This code contributed by James Arthur Boucher.
-  */
- 
--#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/WRRLE.C
-+++ papyrus-3.7.1/JpegDir/JpgLossy/WRRLE.C
-@@ -16,7 +16,7 @@
-  * with updates from Robert Hutchinson.
-  */
- 
--#include "cdjpeg.h"		/* Common decls for cjpeg/djpeg applications */
-+#include "CDJPEG.H"		/* Common decls for cjpeg/djpeg applications */
- 
- #ifdef RLE_SUPPORTED
- 
---- papyrus-3.7.1.orig/JpegDir/JpgLossy/RDPPM.C
-+++ papyrus-3.7.1/JpegDir/JpgLossy/RDPPM.C
-@@ -18,7 +18,7 @@
-  * the file is indeed PPM format).
-  */
- 
--#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/JCTRANS.C
-+++ papyrus-3.7.1/JpegDir/JpgLossy/JCTRANS.C
-@@ -11,8 +11,8 @@
-  */
- 
- #define JPEG_INTERNALS
--#include "jinclude.h"
--#include "jpeglib.h"
-+#include "JINCLUDE.H"
-+#include "JPEGLIB.H"
- 
- 
- /* Forward declarations */
 --- papyrus-3.7.1.orig/JpegDir/JpgLless/huffcoptimisebug.c
 +++ papyrus-3.7.1/JpegDir/JpgLless/huffcoptimisebug.c
 @@ -53,17 +53,11 @@
@@ -895,55 +569,6 @@
 -}
 \ No newline at end of file
 +}
---- papyrus-3.7.1.orig/JpegDir/JpgLless/CMakeLists.txt
-+++ papyrus-3.7.1/JpegDir/JpgLless/CMakeLists.txt
-@@ -3,7 +3,7 @@ set(SOURCES
- 	decompoptimise.c
- 	huffcoptimisebug.c
- 	huffdoptimise.c
--	#jpegutil.c
-+	JPEGUTIL.C
- 	MCU.C
- 	pmreadoptimise.c
- 	pnmtoljpoptimisebug.c
-@@ -12,6 +12,8 @@ set(SOURCES
- 	WRITE.C
- 	)
- 
-+set_source_files_properties(PROTO.H PROPERTIES LANGUAGE "C")
-+
- add_library(JpgLless ${SOURCES})
--set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE C)
--set_target_properties(JpgLless PROPERTIES LINKER_LANGUAGE C)
-+set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE "C")
-+set_target_properties(JpgLless PROPERTIES LINKER_LANGUAGE "C")
---- papyrus-3.7.1.orig/JpegDir/JpgLless/JPEGUTIL.C
-+++ papyrus-3.7.1/JpegDir/JpgLless/JPEGUTIL.C
-@@ -37,21 +37,17 @@
- #include <stdlib.h>
- #include <string.h>
- /* #include <malloc.h> */
--#include "jpeg.h"
--#include "mcu.h"
--#include "proto.h"
-+#include "JPEG.H"
-+#include "MCU.H"
-+#include "PROTO.H"
- 
- 
- /* Papyrus 3 redefined basic types */
- #ifndef FILENAME83		/* this is for the normal machines ... */
- 
--#ifndef PapyEalloc3H
- #include "PapyEalloc3.h"
--#endif
- 
--#ifndef   PapyFileSystem3H
- #include "PapyFileSystem3.h"
--#endif
- 
- #else				/* FILENAME83 defined for the DOS machines */
- 
 --- papyrus-3.7.1.orig/JpegDir/JpgLless/pnmtoljpoptimisebug.c
 +++ papyrus-3.7.1/JpegDir/JpgLless/pnmtoljpoptimisebug.c
 @@ -50,17 +50,11 @@
@@ -1146,24 +771,6 @@
  
  
  /********************************************************************************/
---- papyrus-3.7.1.orig/DicomDir/CMakeLists.txt
-+++ papyrus-3.7.1/DicomDir/CMakeLists.txt
-@@ -12,11 +12,11 @@ set(SOURCES
- set(HEADERS
- 	DicomDir.h
- 	DicomDirEnumRecords.h
--	DicomDirGlobalVar3.h
-+	DicomdirGlobalVar3.h
- 	DicomDirInitRecords.h
--	DicomDirPrivFunctionDef3.h
--	DicomDirPubFunctionDef3.h
--	DicomDirTypeDef3.h
-+	DicomdirPrivFunctionDef3.h
-+	DicomdirPubFunctionDef3.h
-+	DicomdirTypeDef3.h
- 	OGlobalDicomFunc.h
-   )
- 
 --- papyrus-3.7.1.orig/DicomDir/DicomDirFiles.c
 +++ papyrus-3.7.1/DicomDir/DicomDirFiles.c
 @@ -55,9 +55,7 @@
@@ -1188,16 +795,4 @@
  
  
  /********************************************************************************/
---- papyrus-3.7.1.orig/TESTS/CMakeLists.txt
-+++ papyrus-3.7.1/TESTS/CMakeLists.txt
-@@ -1,6 +1,8 @@
- # Tests
- add_executable(TestRead TestRead.c)
- target_link_libraries(TestRead Papyrus3)
-+#set_source_files_properties(TestRead.c PROPERTIES LANGUAGE CXX)
- 
--add_executable(TestWrite TestWrite.c)
--target_link_libraries(TestWrite Papyrus3)
-+#add_executable(TestWrite TestWrite.c)
-+#target_link_libraries(TestWrite Papyrus3)
-+#set_source_files_properties(TestWrite.c PROPERTIES LANGUAGE CXX)
+

Modified: trunk/packages/papyrus/trunk/debian/patches/fixmakefiles.patch
===================================================================
--- trunk/packages/papyrus/trunk/debian/patches/fixmakefiles.patch	2013-10-28 15:40:01 UTC (rev 15023)
+++ trunk/packages/papyrus/trunk/debian/patches/fixmakefiles.patch	2013-10-28 15:54:53 UTC (rev 15024)
@@ -1,7 +1,11 @@
+Description: Fix issues with default Makefile build system
+Author: Mathieu Malaterre <malat at debian.org>
+Forwarded: no
+
 Index: Papyrus3/Makefile.PC
 ===================================================================
---- Papyrus3.orig/Makefile.PC	2002-09-03 16:29:00.000000000 +0200
-+++ Papyrus3/Makefile.PC	2013-10-28 16:34:00.000000000 +0100
+--- Papyrus3.orig/Makefile.PC	2013-10-28 16:46:30.000000000 +0100
++++ Papyrus3/Makefile.PC	2013-10-28 16:47:38.000000000 +0100
 @@ -5,6 +5,7 @@
  MANDIR=		$(DSTDIR)/man
  JPEGDIRLL=	JpegDir/JpgLless
@@ -21,8 +25,8 @@
  
 Index: Papyrus3/Makefile
 ===================================================================
---- Papyrus3.orig/Makefile	2002-09-03 16:29:00.000000000 +0200
-+++ Papyrus3/Makefile	2013-10-28 16:34:00.000000000 +0100
+--- Papyrus3.orig/Makefile	2013-10-28 16:46:30.000000000 +0100
++++ Papyrus3/Makefile	2013-10-28 16:47:38.000000000 +0100
 @@ -13,7 +13,7 @@
  
  INSTALLDIR=	/home/Dorad/dorad/bin

Modified: trunk/packages/papyrus/trunk/debian/patches/hardening.patch
===================================================================
--- trunk/packages/papyrus/trunk/debian/patches/hardening.patch	2013-10-28 15:40:01 UTC (rev 15023)
+++ trunk/packages/papyrus/trunk/debian/patches/hardening.patch	2013-10-28 15:54:53 UTC (rev 15024)
@@ -1,31 +1,12 @@
-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: #)
+Description: Fix issues with gcc hardening compilations flags
 Author: Mathieu Malaterre <malat at debian.org>
+Forwarded: no
 
----
-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/PapyError3.c
-+++ papyrus-3.7.1/PapyError3.c
-@@ -168,7 +168,7 @@ void PapyPrintErrMsg3 (char *inFileP, Pa
+Index: Papyrus3/PapyError3.c
+===================================================================
+--- Papyrus3.orig/PapyError3.c	2013-10-28 16:47:57.000000000 +0100
++++ Papyrus3/PapyError3.c	2013-10-28 16:48:41.000000000 +0100
+@@ -168,7 +168,7 @@
  #ifndef DLL
      PapyShort	i, theMax, theNb = 0;
  
@@ -34,7 +15,7 @@
      if (sCrtErrLevel >= 0)
      {
  	fprintf (stderr, "%s\n", sERRMSG);
-@@ -202,7 +202,7 @@ void PapyPrintErrMsg3 (char *inFileP, Pa
+@@ -202,7 +202,7 @@
      else
  	fprintf (stderr, "No e%s\n", &sERRMSG [1]);
  	
@@ -43,3 +24,15 @@
  #endif
      
  } /* endof PapyPrintErrMsg3 */
+Index: Papyrus3/TESTS/TestRead.c
+===================================================================
+--- Papyrus3.orig/TESTS/TestRead.c	2013-10-28 16:47:57.000000000 +0100
++++ Papyrus3/TESTS/TestRead.c	2013-10-28 16:48:41.000000000 +0100
+@@ -53,6 +53,7 @@
+ #define MAIN
+ 
+ #include <stdio.h>
++#include <stdlib.h> /* exit */
+ #include "Papyrus3.h"
+ 
+ 

Deleted: trunk/packages/papyrus/trunk/debian/patches/installheader.patch
===================================================================
--- trunk/packages/papyrus/trunk/debian/patches/installheader.patch	2013-10-28 15:40:01 UTC (rev 15023)
+++ trunk/packages/papyrus/trunk/debian/patches/installheader.patch	2013-10-28 15:54:53 UTC (rev 15024)
@@ -1,262 +0,0 @@
-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
-   )

Deleted: trunk/packages/papyrus/trunk/debian/patches/more2.patch
===================================================================
--- trunk/packages/papyrus/trunk/debian/patches/more2.patch	2013-10-28 15:40:01 UTC (rev 15023)
+++ trunk/packages/papyrus/trunk/debian/patches/more2.patch	2013-10-28 15:54:53 UTC (rev 15024)
@@ -1,696 +0,0 @@
-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/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/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
- 

Deleted: trunk/packages/papyrus/trunk/debian/patches/redo.patch
===================================================================
--- trunk/packages/papyrus/trunk/debian/patches/redo.patch	2013-10-28 15:40:01 UTC (rev 15023)
+++ trunk/packages/papyrus/trunk/debian/patches/redo.patch	2013-10-28 15:54:53 UTC (rev 15024)
@@ -1,144 +0,0 @@
-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,9 +14,9 @@ include_directories(
-   ${CMAKE_CURRENT_SOURCE_DIR}
-   )
- 
--add_subdirectory(${JPEGDIRLL})
--add_subdirectory(${JPEGDIRLY})
--add_subdirectory(${DICOMDIR})
-+#add_subdirectory(${JPEGDIRLL})
-+#add_subdirectory(${JPEGDIRLY})
-+#add_subdirectory(${DICOMDIR})
- 
- set(SOURCES
- 	PapyVars3.c
-@@ -56,22 +56,94 @@ set(HEADERS
-   PapyWild3.h
-   )
- if(UNIX)
--  set(SOURCES
--    ${SOURCES}
--    PapyFileSystemUnix3.c PapyEallocUnix3.c
--    )
-+  list(APPEND SOURCES PapyFileSystemUnix3.c PapyEallocUnix3.c)
- endif()
- if(WIN32)
--  set(SOURCES
--    ${SOURCES}
--    PapyFileSystemPC3.c PapyEallocPC3.c
--    )
-+  list(APPEND SOURCES PapyFileSystemPC3.c PapyEallocPC3.c)
- endif()
- 
-+list(APPEND SOURCES 
-+	 DicomDir/DicomDirDataSetRead.c
-+	 DicomDir/DicomDirDataSetWrite.c
-+	 DicomDir/DicomDirFiles.c
-+	 DicomDir/DicomDirInit.c
-+	 DicomDir/DicomDirInitRecords.c
-+ 	 DicomDir/OGlobalDicomFunc.c
-+   )
-+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
-+    )
-+
-+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
-+     )
-+
- add_library(Papyrus3 ${SOURCES})
- set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE C)
- set_target_properties(Papyrus3 PROPERTIES LINKER_LANGUAGE C)
--target_link_libraries(Papyrus3 DicomDir JpgLless JpgLossy)
-+#target_link_libraries(Papyrus3 DicomDir JpgLless JpgLossy)
- 
- add_subdirectory(TESTS)
- 

Modified: trunk/packages/papyrus/trunk/debian/patches/series
===================================================================
--- trunk/packages/papyrus/trunk/debian/patches/series	2013-10-28 15:40:01 UTC (rev 15023)
+++ trunk/packages/papyrus/trunk/debian/patches/series	2013-10-28 15:54:53 UTC (rev 15024)
@@ -1,10 +1,5 @@
 fixmakefiles.patch
 fixcase.patch
-addcmake.patch
-more2.patch
 hardening.patch
-redo.patch
-ya.patch
-fixcxx.patch
-fixcmake.patch
-installheader.patch
+#fixcxx.patch
+addcmake.patch

Deleted: trunk/packages/papyrus/trunk/debian/patches/ya.patch
===================================================================
--- trunk/packages/papyrus/trunk/debian/patches/ya.patch	2013-10-28 15:40:01 UTC (rev 15023)
+++ trunk/packages/papyrus/trunk/debian/patches/ya.patch	2013-10-28 15:54:53 UTC (rev 15024)
@@ -1,163 +0,0 @@
-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
-@@ -68,76 +68,76 @@ list(APPEND SOURCES
- 	 DicomDir/DicomDirFiles.c
- 	 DicomDir/DicomDirInit.c
- 	 DicomDir/DicomDirInitRecords.c
-- 	 DicomDir/OGlobalDicomFunc.c
-+ 	 DicomDir/OGlobalDicomFunc.cpp
-    )
- 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/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
-+	  JpegDir/JpgLless/PREDICT.C
-+	  JpegDir/JpgLless/READ.C
-+	  JpegDir/JpgLless/WRITE.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/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/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})




More information about the debian-med-commit mailing list