[med-svn] r15006 - in trunk/packages/papyrus/trunk/debian: . patches
Mathieu Malaterre
malat at alioth.debian.org
Mon Oct 28 09:52:49 UTC 2013
Author: malat
Date: 2013-10-28 09:52:49 +0000 (Mon, 28 Oct 2013)
New Revision: 15006
Added:
trunk/packages/papyrus/trunk/debian/patches/
trunk/packages/papyrus/trunk/debian/patches/all.patch
trunk/packages/papyrus/trunk/debian/patches/series
Modified:
trunk/packages/papyrus/trunk/debian/rules
Log:
Fix compilation on case sensitive system
Added: trunk/packages/papyrus/trunk/debian/patches/all.patch
===================================================================
--- trunk/packages/papyrus/trunk/debian/patches/all.patch (rev 0)
+++ trunk/packages/papyrus/trunk/debian/patches/all.patch 2013-10-28 09:52:49 UTC (rev 15006)
@@ -0,0 +1,272 @@
+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>
+
+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
+
Added: trunk/packages/papyrus/trunk/debian/patches/series
===================================================================
--- trunk/packages/papyrus/trunk/debian/patches/series (rev 0)
+++ trunk/packages/papyrus/trunk/debian/patches/series 2013-10-28 09:52:49 UTC (rev 15006)
@@ -0,0 +1 @@
+all.patch
Modified: trunk/packages/papyrus/trunk/debian/rules
===================================================================
--- trunk/packages/papyrus/trunk/debian/rules 2013-10-28 09:52:40 UTC (rev 15005)
+++ trunk/packages/papyrus/trunk/debian/rules 2013-10-28 09:52:49 UTC (rev 15006)
@@ -3,5 +3,12 @@
%:
dh $@
+#override_dh_auto_configure:
+# dh_auto_configure -- -f Makefile.PC
+
+override_dh_auto_build:
+ mkdir -p Solaris/lib
+ dh_auto_build -- -f Makefile.PC
+
get-orig-source:
uscan --verbose --force-download --rename
More information about the debian-med-commit
mailing list