Author: malat
Date: 2013-10-28 15:40:01 +0000 (Mon, 28 Oct 2013)
New Revision: 15023

Added:
   trunk/packages/papyrus/trunk/debian/patches/fixcase.patch
   trunk/packages/papyrus/trunk/debian/patches/fixmakefiles.patch
Removed:
   trunk/packages/papyrus/trunk/debian/patches/all.patch
   trunk/packages/papyrus/trunk/debian/patches/more.patch
Modified:
   trunk/packages/papyrus/trunk/debian/patches/more2.patch
   trunk/packages/papyrus/trunk/debian/patches/series
Log:
Simplify patches

Deleted: trunk/packages/papyrus/trunk/debian/patches/all.patch
===================================================================
--- trunk/packages/papyrus/trunk/debian/patches/all.patch       2013-10-28 
15:30:41 UTC (rev 15022)
+++ trunk/packages/papyrus/trunk/debian/patches/all.patch       2013-10-28 
15:40:01 UTC (rev 15023)
@@ -1,272 +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 <ma...@debian.org>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
-Index: Papyrus3/Makefile
-===================================================================
---- Papyrus3.orig/Makefile     2013-10-28 10:48:57.778418378 +0100
-+++ Papyrus3/Makefile  2013-10-28 10:49:13.774418164 +0100
-@@ -13,7 +13,7 @@
- 
- INSTALLDIR=   /home/Dorad/dorad/bin
- 
--CPPFLAGS=     -I. -I../.. -I$(DICOMDIR) -I$(JPEGDIRLL) -I$(JPEGDIRLY) 
-D_NO_LONGLONG -DSolaris
-+CPPFLAGS=     -I. -I../.. -I$(DICOMDIR) -I$(JPEGDIRLL) -I$(JPEGDIRLY) 
-D_NO_LONGLONG -DSolaris -DHAVE_BOOLEAN
- CFLAGS=               -g
- LINTFLAGS=    -hb
- 
-@@ -65,7 +65,7 @@
-               -rm -Rf $(ARCH);
-               cd JpegDir/JpgLless;make clean;
-               cd JpegDir/JpgLossy;make clean;
--              cd DicomDir;make clean
-+              cd DicomDir;#make clean
-               
- 
- .KEEP_STATE:
-Index: Papyrus3/PapyConvertFile3.c
-===================================================================
---- Papyrus3.orig/PapyConvertFile3.c   2013-10-28 10:48:57.730418380 +0100
-+++ Papyrus3/PapyConvertFile3.c        2013-10-28 10:49:13.774418164 +0100
-@@ -61,8 +61,8 @@
- #define CHECK_MEMORY
- #define HAVE_BOOLEAN
- 
--#include "jpegless.h"         /* interface for JPEG lossless */
--#include "jpeglib.h"          /* interface for JPEG lossy */
-+#include "JPEGLESS.H"         /* interface for JPEG lossless */
-+#include "JPEGLIB.H"          /* interface for JPEG lossy */
- 
- #ifndef Papyrus3H 
- #include "Papyrus3.h"
-Index: Papyrus3/JpegDir/JpgLless/JPEGLESS.H
-===================================================================
---- Papyrus3.orig/JpegDir/JpgLless/JPEGLESS.H  2013-10-28 10:48:57.678418382 
+0100
-+++ Papyrus3/JpegDir/JpgLless/JPEGLESS.H       2013-10-28 10:49:13.774418164 
+0100
-@@ -70,7 +70,7 @@
- #endif                                /* FILENAME83 defined */
- 
- 
--#include "jpeg.h"
-+#include "JPEG.H"
- 
- 
- /* Global variables for lossless encoding process */
-Index: Papyrus3/JpegDir/JpgLossy/JPEGLIB.H
-===================================================================
---- Papyrus3.orig/JpegDir/JpgLossy/JPEGLIB.H   2013-10-28 10:48:57.526418383 
+0100
-+++ Papyrus3/JpegDir/JpgLossy/JPEGLIB.H        2013-10-28 10:49:13.774418164 
+0100
-@@ -21,9 +21,9 @@
-  */
- 
- #ifndef JCONFIG_INCLUDED      /* in case jinclude.h already did */
--#include "jconfig.h"          /* widely used configuration options */
-+#include "JCONFIG.H"          /* widely used configuration options */
- #endif
--#include "jmorecfg.h"         /* seldom changed options */
-+#include "JMORECFG.H"         /* seldom changed options */
- 
- 
- /* Papyrus 3 redefined basic types */
-Index: Papyrus3/DicomDir/DicomDir.h
-===================================================================
---- Papyrus3.orig/DicomDir/DicomDir.h  2013-10-28 10:48:57.422418383 +0100
-+++ Papyrus3/DicomDir/DicomDir.h       2013-10-28 10:49:13.778418165 +0100
-@@ -68,16 +68,16 @@
- #include "DicomDirEnumRecords.h"
- #endif
- #ifndef DicomdirTypeDef3H         /* DICOMDIR type definition */
--#include "DicomDirTypeDef3.h"
-+#include "DicomdirTypeDef3.h"
- #endif
- #ifndef DicomdirPrivFunctionDef3H   /* DICOMDIR private functions */
--#include "DicomDirPrivFunctionDef3.h"
-+#include "DicomdirPrivFunctionDef3.h"
- #endif
- #ifndef DicomdirPubFunctionDef3H    /* DICOMDIR public functions */
--#include "DicomDirPubFunctionDef3.h"
-+#include "DicomdirPubFunctionDef3.h"
- #endif
- #ifndef DicomdirGlobalVar3H         /* DICOMDIR global variables */
--#include "DicomDirGlobalVar3.h"
-+#include "DicomdirGlobalVar3.h"
- #endif
- 
- #else                             /* FILENAME83 defined for the DOS machines 
*/
-Index: Papyrus3/PapyRead3.c
-===================================================================
---- Papyrus3.orig/PapyRead3.c  2013-10-28 10:48:57.222418388 +0100
-+++ Papyrus3/PapyRead3.c       2013-10-28 10:49:13.778418165 +0100
-@@ -72,8 +72,8 @@
- #include <math.h>
- 
- #include "setjmp.h"
--#include "jpegless.h"       /* interface for JPEG lossless decompressor */
--#include "jpeglib.h"      /* interface for JPEG lossy decompressor */
-+#include "JPEGLESS.H"       /* interface for JPEG lossless decompressor */
-+#include "JPEGLIB.H"      /* interface for JPEG lossy decompressor */
- 
- #ifdef MAYO_WAVE
- #include "Mayo.h"     /* interface for wavelet decompressor */
-Index: Papyrus3/PapyWrite3.c
-===================================================================
---- Papyrus3.orig/PapyWrite3.c 2013-10-28 10:48:57.122418389 +0100
-+++ Papyrus3/PapyWrite3.c      2013-10-28 10:49:13.778418165 +0100
-@@ -78,8 +78,8 @@
- #endif
- 
- 
--#include "jpegless.h"         /* interface for JPEG lossless decompressor */
--#include "jpeglib.h"          /* interface for JPEG lossy decompressor */
-+#include "JPEGLESS.H"         /* interface for JPEG lossless decompressor */
-+#include "JPEGLIB.H"          /* interface for JPEG lossy decompressor */
- 
- 
- #ifdef MAYO_WAVE
-Index: Papyrus3/JpegDir/JpgLless/decompoptimise.c
-===================================================================
---- Papyrus3.orig/JpegDir/JpgLless/decompoptimise.c    2013-10-28 
10:48:57.070418389 +0100
-+++ Papyrus3/JpegDir/JpgLless/decompoptimise.c 2013-10-28 10:49:13.778418165 
+0100
-@@ -50,10 +50,10 @@
- #include <stdlib.h>
- #include <string.h>  
- /*#include <ctype.h>*/
--#include "io.h"
--#include "jpeg.h"
--#include "mcu.h"
--#include "proto.h"
-+#include "IO.H"
-+#include "JPEG.H"
-+#include "MCU.H"
-+#include "PROTO.H"
- 
- 
- /* Papyrus 3 redefined basic types */
-@@ -127,7 +127,6 @@
-     /* Initialization */
-     JpegInFile = inFile; 
-     MEMSET (&dcInfo, 0, sizeof (dcInfo));
--    inputBufferOffset = 0;
- 
-     /* Allocate input buffer */
-     inputBuffer = (PapyUChar *) emalloc3 ((PapyULong)length+5);
-@@ -161,7 +160,6 @@
- 
-     /* Initialization */
-     MEMSET (&dcInfo, 0, sizeof (dcInfo));
--    inputBufferOffset = 0;
- 
-     /* Allocate input buffer */
-     inputBuffer = (PapyUChar *) JPEGPix;
-Index: Papyrus3/JpegDir/JpgLless/PROTO.H
-===================================================================
---- Papyrus3.orig/JpegDir/JpgLless/PROTO.H     2013-10-28 10:48:56.958418392 
+0100
-+++ Papyrus3/JpegDir/JpgLless/PROTO.H  2013-10-28 10:49:13.778418165 +0100
-@@ -42,7 +42,7 @@
- # define P(s) ()
- #endif
- 
--#include "mcu.h"
-+#include "MCU.H"
- 
- #ifndef FILENAME83            /* this is for the normal machines ... */
- 
-Index: Papyrus3/JpegDir/JpgLless/IO.H
-===================================================================
---- Papyrus3.orig/JpegDir/JpgLless/IO.H        2013-10-28 10:48:56.854418393 
+0100
-+++ Papyrus3/JpegDir/JpgLless/IO.H     2013-10-28 10:49:13.778418165 +0100
-@@ -52,7 +52,7 @@
- #ifndef _IO
- #define _IO
- 
--#include "jpeg.h"
-+#include "JPEG.H"
- 
- 
- /*
-Index: Papyrus3/JpegDir/JpgLless/huffcoptimisebug.c
-===================================================================
---- Papyrus3.orig/JpegDir/JpgLless/huffcoptimisebug.c  2013-10-28 
10:48:56.802418394 +0100
-+++ Papyrus3/JpegDir/JpgLless/huffcoptimisebug.c       2013-10-28 
10:49:13.778418165 +0100
-@@ -42,12 +42,12 @@
- #include <stdlib.h>
- #include <string.h>
- #include <assert.h>
--#include "jpeg.h"
--#include "mcu.h"
--#include "io.h"
--#include "proto.h"
--#include "predict.h"
--#include "jpegless.h"
-+#include "JPEG.H"
-+#include "MCU.H"
-+#include "IO.H"
-+#include "PROTO.H"
-+#include "PREDICT.H"
-+#include "JPEGLESS.H"
- 
- 
- /* Papyrus 3 redefined basic types */
-Index: Papyrus3/JpegDir/JpgLless/huffdoptimise.c
-===================================================================
---- Papyrus3.orig/JpegDir/JpgLless/huffdoptimise.c     2013-10-28 
10:48:56.750418394 +0100
-+++ Papyrus3/JpegDir/JpgLless/huffdoptimise.c  2013-10-28 10:49:13.782418165 
+0100
-@@ -42,11 +42,11 @@
- #include <stdlib.h>
- #include <string.h>
- 
--#include "jpeg.h"
--#include "mcu.h"
--#include "io.h"
--#include "proto.h"
--#include "predict.h"
-+#include "JPEG.H"
-+#include "MCU.H"
-+#include "IO.H"
-+#include "PROTO.H"
-+#include "PREDICT.H"
- 
- /* Papyrus 3 redefined basic types */
- #ifndef FILENAME83            /* this is for the normal machines ... */
-Index: Papyrus3/Makefile.PC
-===================================================================
---- Papyrus3.orig/Makefile.PC  2013-10-28 10:48:56.702418394 +0100
-+++ Papyrus3/Makefile.PC       2013-10-28 10:49:13.782418165 +0100
-@@ -5,6 +5,7 @@
- MANDIR=               $(DSTDIR)/man
- JPEGDIRLL=    JpegDir/JpgLless
- JPEGDIRLY=    JpegDir/JpgLossy
-+DICOMDIR=     DicomDir
- MAYODIR=      Mayo
- BINDIR=               $(DSTDIR)/test
- LIBDIR=               $(DSTDIR)/$(ARCH)/lib
-@@ -12,7 +13,7 @@
- INCPAPYRUS2DIR= ../Papyrus2
- LIBPAPYRUS2DIR= ../Papyrus2/$(ARCH)/lib
- 
--CPPFLAGS=     -I. -I../.. -I$(INCPAPYRUS2DIR) -I$(JPEGDIRLL) -I$(JPEGDIRLY) 
-D_NO_LONGLONG
-+CPPFLAGS=     -I. -I../.. -I$(DICOMDIR) -I$(JPEGDIRLL) -I$(JPEGDIRLY) 
-D_NO_LONGLONG
- CFLAGS=               -g
- LINTFLAGS=    -hb
- 

Copied: trunk/packages/papyrus/trunk/debian/patches/fixcase.patch (from rev 
15022, trunk/packages/papyrus/trunk/debian/patches/all.patch)
===================================================================
--- trunk/packages/papyrus/trunk/debian/patches/fixcase.patch                   
        (rev 0)
+++ trunk/packages/papyrus/trunk/debian/patches/fixcase.patch   2013-10-28 
15:40:01 UTC (rev 15023)
@@ -0,0 +1,300 @@
+Description: Fix issues with case sensitive file systems
+Author: Mathieu Malaterre <ma...@debian.org>
+Forwarded: no
+
+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
+@@ -32,9 +32,9 @@
+ #include <stdlib.h>
+ /* #include <malloc.h> */
+ #include <string.h>
+-#include "jpeg.h"
+-#include "mcu.h"
+-#include "proto.h"
++#include "JPEG.H"
++#include "MCU.H"
++#include "PROTO.H"
+ 
+ 
+ /* Papyrus 3 redefined basic types */
+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
+@@ -38,10 +38,10 @@
+ #include <malloc.h>
+ */
+ #include <string.h>
+-#include "jpeg.h"
+-#include "mcu.h"
+-#include "io.h"
+-#include "proto.h"
++#include "JPEG.H"
++#include "MCU.H"
++#include "IO.H"
++#include "PROTO.H"
+ 
+ /* Papyrus 3 redefined basic types */
+ #ifndef FILENAME83            /* this is for the normal machines ... */
+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
+@@ -36,10 +36,10 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include "jpeg.h"
+-#include "mcu.h"
+-#include "io.h"
+-#include "proto.h"
++#include "JPEG.H"
++#include "MCU.H"
++#include "IO.H"
++#include "PROTO.H"
+ 
+ /*
+  * To fix a memory leak (memory malloc'd then never freed) in the original
+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
+@@ -42,10 +42,10 @@
+ #include <errno.h>
+ 
+ #include <string.h>
+-#include "jpeg.h"
+-#include "mcu.h"
+-#include "proto.h"
+-#include "jpegless.h"
++#include "JPEG.H"
++#include "MCU.H"
++#include "PROTO.H"
++#include "JPEGLESS.H"
+ 
+ /* Papyrus 3 redefined basic types */
+ #ifndef FILENAME83            /* this is for the normal machines ... */
+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
+@@ -30,11 +30,11 @@
+  * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+  */
+ #include <stdio.h>
+-#include "jpeg.h"
+-#include "mcu.h"
+-#include "proto.h"
+-#include "jpegless.h"
+-#include "io.h"
++#include "JPEG.H"
++#include "MCU.H"
++#include "PROTO.H"
++#include "JPEGLESS.H"
++#include "IO.H"
+ 
+ 
+ /* Papyrus 3 redefined basic types */
+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
+@@ -26,7 +26,7 @@
+  */
+ 
+ #include <stdio.h>
+-#include "mcu.h"
++#include "MCU.H"
+ 
+ #ifdef DEBUG
+ /*
+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
+@@ -61,8 +61,8 @@
+ #define CHECK_MEMORY
+ #define HAVE_BOOLEAN
+ 
+-#include "jpegless.h"         /* interface for JPEG lossless */
+-#include "jpeglib.h"          /* interface for JPEG lossy */
++#include "JPEGLESS.H"         /* interface for JPEG lossless */
++#include "JPEGLIB.H"          /* interface for JPEG lossy */
+ 
+ #ifndef Papyrus3H 
+ #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
+@@ -70,7 +70,7 @@
+ #endif                                /* FILENAME83 defined */
+ 
+ 
+-#include "jpeg.h"
++#include "JPEG.H"
+ 
+ 
+ /* 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
+@@ -21,9 +21,9 @@
+  */
+ 
+ #ifndef JCONFIG_INCLUDED      /* in case jinclude.h already did */
+-#include "jconfig.h"          /* widely used configuration options */
++#include "JCONFIG.H"          /* widely used configuration options */
+ #endif
+-#include "jmorecfg.h"         /* seldom changed options */
++#include "JMORECFG.H"         /* seldom changed options */
+ 
+ 
+ /* Papyrus 3 redefined basic types */
+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
+@@ -68,16 +68,16 @@
+ #include "DicomDirEnumRecords.h"
+ #endif
+ #ifndef DicomdirTypeDef3H         /* DICOMDIR type definition */
+-#include "DicomDirTypeDef3.h"
++#include "DicomdirTypeDef3.h"
+ #endif
+ #ifndef DicomdirPrivFunctionDef3H   /* DICOMDIR private functions */
+-#include "DicomDirPrivFunctionDef3.h"
++#include "DicomdirPrivFunctionDef3.h"
+ #endif
+ #ifndef DicomdirPubFunctionDef3H    /* DICOMDIR public functions */
+-#include "DicomDirPubFunctionDef3.h"
++#include "DicomdirPubFunctionDef3.h"
+ #endif
+ #ifndef DicomdirGlobalVar3H         /* DICOMDIR global variables */
+-#include "DicomDirGlobalVar3.h"
++#include "DicomdirGlobalVar3.h"
+ #endif
+ 
+ #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
+@@ -72,8 +72,8 @@
+ #include <math.h>
+ 
+ #include "setjmp.h"
+-#include "jpegless.h"       /* interface for JPEG lossless decompressor */
+-#include "jpeglib.h"      /* interface for JPEG lossy decompressor */
++#include "JPEGLESS.H"       /* interface for JPEG lossless decompressor */
++#include "JPEGLIB.H"      /* interface for JPEG lossy decompressor */
+ 
+ #ifdef MAYO_WAVE
+ #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
+@@ -78,8 +78,8 @@
+ #endif
+ 
+ 
+-#include "jpegless.h"         /* interface for JPEG lossless decompressor */
+-#include "jpeglib.h"          /* interface for JPEG lossy decompressor */
++#include "JPEGLESS.H"         /* interface for JPEG lossless decompressor */
++#include "JPEGLIB.H"          /* interface for JPEG lossy decompressor */
+ 
+ 
+ #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
+@@ -50,10 +50,10 @@
+ #include <stdlib.h>
+ #include <string.h>  
+ /*#include <ctype.h>*/
+-#include "io.h"
+-#include "jpeg.h"
+-#include "mcu.h"
+-#include "proto.h"
++#include "IO.H"
++#include "JPEG.H"
++#include "MCU.H"
++#include "PROTO.H"
+ 
+ 
+ /* 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
+@@ -42,7 +42,7 @@
+ # define P(s) ()
+ #endif
+ 
+-#include "mcu.h"
++#include "MCU.H"
+ 
+ #ifndef FILENAME83            /* this is for the normal machines ... */
+ 
+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
+@@ -52,7 +52,7 @@
+ #ifndef _IO
+ #define _IO
+ 
+-#include "jpeg.h"
++#include "JPEG.H"
+ 
+ 
+ /*
+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
+@@ -42,12 +42,12 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <assert.h>
+-#include "jpeg.h"
+-#include "mcu.h"
+-#include "io.h"
+-#include "proto.h"
+-#include "predict.h"
+-#include "jpegless.h"
++#include "JPEG.H"
++#include "MCU.H"
++#include "IO.H"
++#include "PROTO.H"
++#include "PREDICT.H"
++#include "JPEGLESS.H"
+ 
+ 
+ /* 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
+@@ -42,11 +42,11 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
+-#include "jpeg.h"
+-#include "mcu.h"
+-#include "io.h"
+-#include "proto.h"
+-#include "predict.h"
++#include "JPEG.H"
++#include "MCU.H"
++#include "IO.H"
++#include "PROTO.H"
++#include "PREDICT.H"
+ 
+ /* Papyrus 3 redefined basic types */
+ #ifndef FILENAME83            /* this is for the normal machines ... */

Added: trunk/packages/papyrus/trunk/debian/patches/fixmakefiles.patch
===================================================================
--- trunk/packages/papyrus/trunk/debian/patches/fixmakefiles.patch              
                (rev 0)
+++ trunk/packages/papyrus/trunk/debian/patches/fixmakefiles.patch      
2013-10-28 15:40:01 UTC (rev 15023)
@@ -0,0 +1,43 @@
+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
+@@ -5,6 +5,7 @@
+ MANDIR=               $(DSTDIR)/man
+ JPEGDIRLL=    JpegDir/JpgLless
+ JPEGDIRLY=    JpegDir/JpgLossy
++DICOMDIR=     DicomDir
+ MAYODIR=      Mayo
+ BINDIR=               $(DSTDIR)/test
+ LIBDIR=               $(DSTDIR)/$(ARCH)/lib
+@@ -12,7 +13,7 @@
+ INCPAPYRUS2DIR= ../Papyrus2
+ LIBPAPYRUS2DIR= ../Papyrus2/$(ARCH)/lib
+ 
+-CPPFLAGS=     -I. -I../.. -I$(INCPAPYRUS2DIR) -I$(JPEGDIRLL) -I$(JPEGDIRLY) 
-D_NO_LONGLONG
++CPPFLAGS=     -I. -I../.. -I$(DICOMDIR) -I$(JPEGDIRLL) -I$(JPEGDIRLY) 
-D_NO_LONGLONG
+ CFLAGS=               -g
+ LINTFLAGS=    -hb
+ 
+Index: Papyrus3/Makefile
+===================================================================
+--- Papyrus3.orig/Makefile     2002-09-03 16:29:00.000000000 +0200
++++ Papyrus3/Makefile  2013-10-28 16:34:00.000000000 +0100
+@@ -13,7 +13,7 @@
+ 
+ INSTALLDIR=   /home/Dorad/dorad/bin
+ 
+-CPPFLAGS=     -I. -I../.. -I$(DICOMDIR) -I$(JPEGDIRLL) -I$(JPEGDIRLY) 
-D_NO_LONGLONG -DSolaris
++CPPFLAGS=     -I. -I../.. -I$(DICOMDIR) -I$(JPEGDIRLL) -I$(JPEGDIRLY) 
-D_NO_LONGLONG -DSolaris -DHAVE_BOOLEAN
+ CFLAGS=               -g
+ LINTFLAGS=    -hb
+ 
+@@ -65,7 +65,7 @@
+               -rm -Rf $(ARCH);
+               cd JpegDir/JpgLless;make clean;
+               cd JpegDir/JpgLossy;make clean;
+-              cd DicomDir;make clean
++              cd DicomDir;#make clean
+               
+ 
+ .KEEP_STATE:

Deleted: trunk/packages/papyrus/trunk/debian/patches/more.patch
===================================================================
--- trunk/packages/papyrus/trunk/debian/patches/more.patch      2013-10-28 
15:30:41 UTC (rev 15022)
+++ trunk/packages/papyrus/trunk/debian/patches/more.patch      2013-10-28 
15:40:01 UTC (rev 15023)
@@ -1,285 +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 <ma...@debian.org>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
-Index: Papyrus3/CMakeLists.txt
-===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ Papyrus3/CMakeLists.txt    2013-10-28 13:17:12.810299208 +0100
-@@ -0,0 +1,71 @@
-+cmake_minimum_required(VERSION 2.8)
-+project(Papyrus3)
-+
-+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}
-+  )
-+
-+add_subdirectory(${JPEGDIRLL})
-+#add_subdirectory(${JPEGDIRLY})
-+
-+set(SOURCES
-+  PapyConvertFile3.c
-+  PapyError3.c
-+  PapyFileSystemUnix3.c
-+  PapyFiles3.c
-+  PapyGetGlobalVar3.c
-+  PapyInit3.c
-+  PapyInitGroups3.c
-+  PapyInitModules3.c
-+  PapyRead3.c
-+  PapyDataSetRead3.c
-+  PapyList3.c
-+  PapyVars3.c
-+  PapyWrite3.c
-+  PapyDataSetWrite3.c
-+  PapyEallocUnix3.c
-+  PapyWild3.c
-+  PapyWildexit3.c
-+  PapyUtils3.c
-+  )
-+
-+add_library(Papyrus3 ${SOURCES})
-+target_link_libraries(Papyrus3 JpgLless)
-+
-+install(TARGETS Papyrus3
-+  RUNTIME DESTINATION bin
-+  LIBRARY DESTINATION lib
-+  ARCHIVE DESTINATION lib
-+  )
-+
-+install(FILES
-+  Papyrus3.h
-+  PapyEnumGroups3.h
-+  PapyEnumModules3.h
-+  PapyTypeDef3.h
-+  PapyGlobalVar3.h
-+  PapyPrivFunctionDef3.h
-+  PapyPubFunctionDef3.h
-+  PapyEalloc3.h
-+  PapyFileSystem3.h
-+  PapyError3.h
-+  PapyWild3.h
-+  PapyEnumImageGroups3.h
-+  PapyEnumImagesModules3.h
-+  DicomDir/DicomDir.h
-+  DicomDir/DicomDirEnumRecords.h
-+  DicomDir/DicomdirTypeDef3.h
-+  DicomDir/DicomdirPrivFunctionDef3.h
-+  DicomDir/DicomdirPubFunctionDef3.h
-+  DicomDir/DicomdirGlobalVar3.h
-+  DESTINATION include/Papyrus3
-+  )
-Index: Papyrus3/JpegDir/JpgLossy/CMakeLists.txt
-===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ Papyrus3/JpegDir/JpgLossy/CMakeLists.txt   2013-10-28 13:06:47.798307580 
+0100
-@@ -0,0 +1,51 @@
-+# Jpglossy
-+set(SOURCES
-+      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})
-+
-Index: Papyrus3/JpegDir/JpgLless/MCU.C
-===================================================================
---- Papyrus3.orig/JpegDir/JpgLless/MCU.C       2013-10-28 13:06:16.058308006 
+0100
-+++ Papyrus3/JpegDir/JpgLless/MCU.C    2013-10-28 13:06:47.798307580 +0100
-@@ -32,9 +32,9 @@
- #include <stdlib.h>
- /* #include <malloc.h> */
- #include <string.h>
--#include "jpeg.h"
--#include "mcu.h"
--#include "proto.h"
-+#include "JPEG.H"
-+#include "MCU.H"
-+#include "PROTO.H"
- 
- 
- /* Papyrus 3 redefined basic types */
-Index: Papyrus3/JpegDir/JpgLless/WRITE.C
-===================================================================
---- Papyrus3.orig/JpegDir/JpgLless/WRITE.C     2013-10-28 13:06:16.098308008 
+0100
-+++ Papyrus3/JpegDir/JpgLless/WRITE.C  2013-10-28 13:06:47.798307580 +0100
-@@ -38,10 +38,10 @@
- #include <malloc.h>
- */
- #include <string.h>
--#include "jpeg.h"
--#include "mcu.h"
--#include "io.h"
--#include "proto.h"
-+#include "JPEG.H"
-+#include "MCU.H"
-+#include "IO.H"
-+#include "PROTO.H"
- 
- /* Papyrus 3 redefined basic types */
- #ifndef FILENAME83            /* this is for the normal machines ... */
-Index: Papyrus3/JpegDir/JpgLless/CMakeLists.txt
-===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ Papyrus3/JpegDir/JpgLless/CMakeLists.txt   2013-10-28 13:06:47.798307580 
+0100
-@@ -0,0 +1,15 @@
-+# Jpglless
-+set(SOURCES
-+      decompoptimise.c
-+      huffcoptimisebug.c
-+      huffdoptimise.c
-+      #jpegutil.c
-+      MCU.C
-+      pmreadoptimise.c
-+      pnmtoljpoptimisebug.c
-+      PREDICT.C
-+      READ.C
-+      WRITE.C
-+      )
-+
-+add_library(Jpglless ${SOURCES})
-Index: Papyrus3/JpegDir/JpgLless/READ.C
-===================================================================
---- Papyrus3.orig/JpegDir/JpgLless/READ.C      2013-10-28 13:06:16.074308007 
+0100
-+++ Papyrus3/JpegDir/JpgLless/READ.C   2013-10-28 13:06:47.798307580 +0100
-@@ -36,10 +36,10 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include "jpeg.h"
--#include "mcu.h"
--#include "io.h"
--#include "proto.h"
-+#include "JPEG.H"
-+#include "MCU.H"
-+#include "IO.H"
-+#include "PROTO.H"
- 
- /*
-  * To fix a memory leak (memory malloc'd then never freed) in the original
-Index: Papyrus3/JpegDir/JpgLless/pnmtoljpoptimisebug.c
-===================================================================
---- Papyrus3.orig/JpegDir/JpgLless/pnmtoljpoptimisebug.c       2013-10-28 
13:06:16.110308006 +0100
-+++ Papyrus3/JpegDir/JpgLless/pnmtoljpoptimisebug.c    2013-10-28 
13:06:47.798307580 +0100
-@@ -42,10 +42,10 @@
- #include <errno.h>
- 
- #include <string.h>
--#include "jpeg.h"
--#include "mcu.h"
--#include "proto.h"
--#include "jpegless.h"
-+#include "JPEG.H"
-+#include "MCU.H"
-+#include "PROTO.H"
-+#include "JPEGLESS.H"
- 
- /* Papyrus 3 redefined basic types */
- #ifndef FILENAME83            /* this is for the normal machines ... */
-Index: Papyrus3/JpegDir/JpgLless/pmreadoptimise.c
-===================================================================
---- Papyrus3.orig/JpegDir/JpgLless/pmreadoptimise.c    2013-10-28 
13:06:16.082308002 +0100
-+++ Papyrus3/JpegDir/JpgLless/pmreadoptimise.c 2013-10-28 13:06:47.802307580 
+0100
-@@ -30,11 +30,11 @@
-  * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-  */
- #include <stdio.h>
--#include "jpeg.h"
--#include "mcu.h"
--#include "proto.h"
--#include "jpegless.h"
--#include "io.h"
-+#include "JPEG.H"
-+#include "MCU.H"
-+#include "PROTO.H"
-+#include "JPEGLESS.H"
-+#include "IO.H"
- 
- 
- /* Papyrus 3 redefined basic types */
-Index: Papyrus3/JpegDir/JpgLless/PREDICT.C
-===================================================================
---- Papyrus3.orig/JpegDir/JpgLless/PREDICT.C   2013-10-28 13:06:16.090308005 
+0100
-+++ Papyrus3/JpegDir/JpgLless/PREDICT.C        2013-10-28 13:06:47.802307580 
+0100
-@@ -26,7 +26,7 @@
-  */
- 
- #include <stdio.h>
--#include "mcu.h"
-+#include "MCU.H"
- 
- #ifdef DEBUG
- /*

Modified: trunk/packages/papyrus/trunk/debian/patches/more2.patch
===================================================================
--- trunk/packages/papyrus/trunk/debian/patches/more2.patch     2013-10-28 
15:30:41 UTC (rev 15022)
+++ trunk/packages/papyrus/trunk/debian/patches/more2.patch     2013-10-28 
15:40:01 UTC (rev 15023)
@@ -23,174 +23,6 @@
 Reviewed-By: <name and email of someone who approved the patch>
 Last-Update: <YYYY-MM-DD>
 
---- papyrus-3.7.1.orig/CMakeLists.txt
-+++ papyrus-3.7.1/CMakeLists.txt
-@@ -1,5 +1,5 @@
- cmake_minimum_required(VERSION 2.8)
--project(Papyrus3)
-+project(Papyrus3 C)
- 
- set(JPEGDIRLL JpegDir/JpgLless)
- set(JPEGDIRLY JpegDir/JpgLossy)
-@@ -15,31 +15,65 @@ include_directories(
-   )
- 
- add_subdirectory(${JPEGDIRLL})
--#add_subdirectory(${JPEGDIRLY})
-+add_subdirectory(${JPEGDIRLY})
-+add_subdirectory(${DICOMDIR})
- 
- set(SOURCES
--  PapyConvertFile3.c
--  PapyError3.c
--  PapyFileSystemUnix3.c
--  PapyFiles3.c
--  PapyGetGlobalVar3.c
--  PapyInit3.c
--  PapyInitGroups3.c
--  PapyInitModules3.c
--  PapyRead3.c
--  PapyDataSetRead3.c
--  PapyList3.c
--  PapyVars3.c
--  PapyWrite3.c
--  PapyDataSetWrite3.c
--  PapyEallocUnix3.c
--  PapyWild3.c
--  PapyWildexit3.c
--  PapyUtils3.c
-+      PapyVars3.c
-+      PapyConvertFile3.c
-+      PapyError3.c
-+      PapyFiles3.c
-+      PapyGetGlobalVar3.c
-+      PapyInit3.c
-+      PapyInitGroups3.c
-+      PapyInitModules3.c
-+      PapyRead3.c
-+      PapyDataSetRead3.c
-+      PapyList3.c
-+      PapyWrite3.c
-+      PapyDataSetWrite3.c
-+      PapyWild3.c
-+      PapyWildexit3.c
-+      PapyUtils3.c
-   )
-+set(HEADERS
-+  PapyEalloc3.h
-+  PapyEnumGroups3.h
-+  PapyEnumImageGroups3.h
-+  PapyEnumImagesModules3.h
-+  PapyEnumMiscGroups3.h
-+  PapyEnumMiscModules3.h
-+  PapyEnumModules3.h
-+  PapyError3.h
-+  PapyErrorMacros3.h
-+  PapyFileSystem3.h
-+  PapyGlobalVar3.h
-+  PapyInitModules3.h
-+  PapyPrivFunctionDef3.h
-+  PapyPubFunctionDef3.h
-+  Papyrus3.h
-+  PapyTypeDef3.h
-+  PapyWild3.h
-+  )
-+if(UNIX)
-+  set(SOURCES
-+    ${SOURCES}
-+    PapyFileSystemUnix3.c PapyEallocUnix3.c
-+    )
-+endif()
-+if(WIN32)
-+  set(SOURCES
-+    ${SOURCES}
-+    PapyFileSystemPC3.c PapyEallocPC3.c
-+    )
-+endif()
- 
- add_library(Papyrus3 ${SOURCES})
--target_link_libraries(Papyrus3 JpgLless)
-+set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE C)
-+set_target_properties(Papyrus3 PROPERTIES LINKER_LANGUAGE C)
-+target_link_libraries(Papyrus3 DicomDir JpgLless JpgLossy)
-+
-+add_subdirectory(TESTS)
- 
- install(TARGETS Papyrus3
-   RUNTIME DESTINATION bin
---- /dev/null
-+++ papyrus-3.7.1/DicomDir/CMakeLists.txt
-@@ -0,0 +1,35 @@
-+# DicomDir
-+set(SOURCES
-+       DicomDirDataSetRead.c
-+       DicomDirDataSetWrite.c
-+       DicomDirFiles.c
-+       DicomDirInit.c
-+       DicomDirInitRecords.c
-+       OGlobalDicomFunc.cpp
-+  )
-+#set_source_files_properties(OGlobalDicomFunc.cpp PROPERTIES LANGUAGE "C")
-+
-+set(HEADERS
-+      DicomDir.h
-+      DicomDirEnumRecords.h
-+      DicomDirGlobalVar3.h
-+      DicomDirInitRecords.h
-+      DicomDirPrivFunctionDef3.h
-+      DicomDirPubFunctionDef3.h
-+      DicomDirTypeDef3.h
-+      OGlobalDicomFunc.h
-+  )
-+
-+add_library(DicomDir ${SOURCES})
-+set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE C)
-+set_target_properties(DicomDir PROPERTIES LINKER_LANGUAGE C)
-+
-+#install(TARGETS Papyrus3
-+#  RUNTIME DESTINATION bin
-+#  LIBRARY DESTINATION lib
-+#  ARCHIVE DESTINATION lib
-+#  )
-+#
-+#install(FILES
-+#  DESTINATION include/Papyrus3
-+#  )
---- /dev/null
-+++ papyrus-3.7.1/TESTS/CMakeLists.txt
-@@ -0,0 +1,6 @@
-+# Tests
-+add_executable(TestRead TestRead.c)
-+target_link_libraries(TestRead Papyrus3)
-+
-+add_executable(TestWrite TestWrite.c)
-+target_link_libraries(TestWrite Papyrus3)
---- papyrus-3.7.1.orig/TESTS/TestRead.c
-+++ papyrus-3.7.1/TESTS/TestRead.c
-@@ -53,6 +53,7 @@
- #define MAIN
- 
- #include <stdio.h>
-+#include <stdlib.h> /* exit */
- #include "Papyrus3.h"
- 
- 
---- papyrus-3.7.1.orig/JpegDir/JpgLless/CMakeLists.txt
-+++ papyrus-3.7.1/JpegDir/JpgLless/CMakeLists.txt
-@@ -1,4 +1,4 @@
--# Jpglless
-+# JpgLless
- set(SOURCES
-       decompoptimise.c
-       huffcoptimisebug.c
-@@ -12,4 +12,6 @@ set(SOURCES
-       WRITE.C
-       )
- 
--add_library(Jpglless ${SOURCES})
-+add_library(JpgLless ${SOURCES})
-+set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE C)
-+set_target_properties(JpgLless PROPERTIES LINKER_LANGUAGE C)
 --- papyrus-3.7.1.orig/JpegDir/JpgLossy/JCSAMPLE.C
 +++ papyrus-3.7.1/JpegDir/JpgLossy/JCSAMPLE.C
 @@ -46,8 +46,8 @@
@@ -422,110 +254,6 @@
  #define JCONFIG_INCLUDED      /* so that jpeglib.h doesn't do it again */
  
  /*
---- papyrus-3.7.1.orig/JpegDir/JpgLossy/CMakeLists.txt
-+++ papyrus-3.7.1/JpegDir/JpgLossy/CMakeLists.txt
-@@ -1,51 +1,52 @@
--# Jpglossy
-+# JpgLossy
- set(SOURCES
--      jcapimin.c
--              jcapistd.c
--              jccoefct.c
--              jccolor.c
--              jcdctmgr.c
--              jchuff.c
--              jcinit.c
--              jcmainct.c
--              jcmaster.c
--              jcmarker.c
--              jcomapi.c
--              jcparam.c
--              jcphuff.c
--              jcprepct.c
--              jcsample.c
--              jdapimin.c
--              jdapistd.c
--              jdatadst.c
--              jdatasrc.c
--              jdcoefct.c
--              jdcolor.c
--              jddctmgr.c
--              jdhuff.c
--              jdinput.c
--              jdmainct.c
--              jdmarker.c
--              jdmaster.c
--              jdmerge.c
--              jdphuff.c
--              jdpostct.c
--              jdsample.c
--              jerror.c
--              jfdctint.c
--              jfdctflt.c
--              jfdctfst.c
--              jidctflt.c
--              jidctfst.c
--              jidctint.c
--              jidctred.c
--              jmemmgr.c
--              jmemnobs.c
--              jquant1.c
--              jquant2.c
--              jutils.c
--              rdcolmap.c
--              )
--
--add_library(Jpglossy ${SOURCES})
-+  JCAPIMIN.C
-+  JCAPISTD.C
-+  JCCOEFCT.C
-+  JCCOLOR.C
-+  JCDCTMGR.C
-+  JCHUFF.C
-+  JCINIT.C
-+  JCMAINCT.C
-+  JCMASTER.C
-+  JCMARKER.C
-+  JCOMAPI.C
-+  JCPARAM.C
-+  JCPHUFF.C
-+  JCPREPCT.C
-+  JCSAMPLE.C
-+  JDAPIMIN.C
-+  JDAPISTD.C
-+  JDATADST.C
-+  JDATASRC.C
-+  JDCOEFCT.C
-+  JDCOLOR.C
-+  JDDCTMGR.C
-+  JDHUFF.C
-+  JDINPUT.C
-+  JDMAINCT.C
-+  JDMARKER.C
-+  JDMASTER.C
-+  JDMERGE.C
-+  JDPHUFF.C
-+  JDPOSTCT.C
-+  JDSAMPLE.C
-+  JERROR.C
-+  JFDCTINT.C
-+  JFDCTFLT.C
-+  JFDCTFST.C
-+  JIDCTFLT.C
-+  JIDCTFST.C
-+  JIDCTINT.C
-+  JIDCTRED.C
-+  jmemmgr.c
-+  JMEMNOBS.C
-+  JQUANT1.C
-+  JQUANT2.C
-+  JUTILS.C
-+  RDCOLMAP.C
-+  )
- 
-+add_library(JpgLossy ${SOURCES})
-+set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE C)
-+set_target_properties(JpgLossy PROPERTIES LINKER_LANGUAGE C)
 --- papyrus-3.7.1.orig/JpegDir/JpgLossy/JCPHUFF.C
 +++ papyrus-3.7.1/JpegDir/JpgLossy/JCPHUFF.C
 @@ -13,9 +13,9 @@

Modified: trunk/packages/papyrus/trunk/debian/patches/series
===================================================================
--- trunk/packages/papyrus/trunk/debian/patches/series  2013-10-28 15:30:41 UTC 
(rev 15022)
+++ trunk/packages/papyrus/trunk/debian/patches/series  2013-10-28 15:40:01 UTC 
(rev 15023)
@@ -1,5 +1,6 @@
-all.patch
-more.patch
+fixmakefiles.patch
+fixcase.patch
+addcmake.patch
 more2.patch
 hardening.patch
 redo.patch


_______________________________________________
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit

Reply via email to