Author: malat-guest Date: 2011-08-23 11:56:34 +0000 (Tue, 23 Aug 2011) New Revision: 7522
Added: trunk/packages/dcmtk/trunk/debian/patches/removecharls.patch Modified: trunk/packages/dcmtk/trunk/debian/changelog trunk/packages/dcmtk/trunk/debian/patches/series Log: Work on charls in dcmtk Modified: trunk/packages/dcmtk/trunk/debian/changelog =================================================================== --- trunk/packages/dcmtk/trunk/debian/changelog 2011-08-23 10:13:37 UTC (rev 7521) +++ trunk/packages/dcmtk/trunk/debian/changelog 2011-08-23 11:56:34 UTC (rev 7522) @@ -1,6 +1,7 @@ dcmtk (3.6.0-8) unstable; urgency=low * Adding a storescp daemon + * Remove convenient copy of CharLS. Closes: #631100 -- Mathieu Malaterre <[email protected]> Tue, 19 Jul 2011 17:08:19 +0200 Added: trunk/packages/dcmtk/trunk/debian/patches/removecharls.patch =================================================================== --- trunk/packages/dcmtk/trunk/debian/patches/removecharls.patch (rev 0) +++ trunk/packages/dcmtk/trunk/debian/patches/removecharls.patch 2011-08-23 11:56:34 UTC (rev 7522) @@ -0,0 +1,75 @@ +Index: dcmtk-3.6.0/dcmjpls/Makefile.in +=================================================================== +--- dcmtk-3.6.0.orig/dcmjpls/Makefile.in 2011-08-23 13:39:52.000000000 +0200 ++++ dcmtk-3.6.0/dcmjpls/Makefile.in 2011-08-23 13:40:31.000000000 +0200 +@@ -36,7 +36,6 @@ + (cd include && $(MAKE) ARCH="$(ARCH)" all) + + libsrc-all: include-all +- (cd libcharls && $(MAKE) ARCH="$(ARCH)" all) + (cd libsrc && $(MAKE) ARCH="$(ARCH)" all) + + apps-all: libsrc-all +@@ -50,7 +49,6 @@ + (cd include && $(MAKE) ARCH="$(ARCH)" install) + + libsrc-install: libsrc-all +- (cd libcharls && $(MAKE) ARCH="$(ARCH)" install) + (cd libsrc && $(MAKE) ARCH="$(ARCH)" install) + + apps-install: apps-all +@@ -68,7 +66,6 @@ + + clean: + (cd include && $(MAKE) clean) +- (cd libcharls && $(MAKE) clean) + (cd libsrc && $(MAKE) clean) + (cd apps && $(MAKE) clean) + (cd tests && $(MAKE) clean) +@@ -79,7 +76,6 @@ + + distclean: + (cd include && $(MAKE) distclean) +- (cd libcharls && $(MAKE) distclean) + (cd libsrc && $(MAKE) distclean) + (cd apps && $(MAKE) distclean) + (cd tests && $(MAKE) distclean) +@@ -89,7 +85,6 @@ + rm -f $(DISTTRASH) + + dependencies: +- (cd libcharls && touch $(DEP) && $(MAKE) dependencies) + (cd libsrc && touch $(DEP) && $(MAKE) dependencies) + (cd apps && touch $(DEP) && $(MAKE) dependencies) + # (cd tests && touch $(DEP) && $(MAKE) dependencies) +Index: dcmtk-3.6.0/dcmjpls/libsrc/Makefile.in +=================================================================== +--- dcmtk-3.6.0.orig/dcmjpls/libsrc/Makefile.in 2011-08-23 13:42:02.000000000 +0200 ++++ dcmtk-3.6.0/dcmjpls/libsrc/Makefile.in 2011-08-23 13:42:47.000000000 +0200 +@@ -16,10 +16,9 @@ + oflogdir = $(top_srcdir)/../oflog + dcmdatadir = $(top_srcdir)/../dcmdata + dcmimgledir = $(top_srcdir)/../dcmimgle +-libcharlsdir = $(top_srcdir)/../dcmjpls/libcharls + + LOCALINCLUDES = -I$(ofstddir)/include -I$(oflogdir)/include -I$(dcmdatadir)/include \ +- -I$(dcmimgledir)/include -I$(libcharlsdir) ++ -I$(dcmimgledir)/include + LOCALDEFS = + + objs = djcodecd.o djcodece.o djcparam.o djdecode.o djencode.o djrparam.o djutils.o +Index: dcmtk-3.6.0/dcmjpls/apps/Makefile.in +=================================================================== +--- dcmtk-3.6.0.orig/dcmjpls/apps/Makefile.in 2011-08-23 13:43:12.000000000 +0200 ++++ dcmtk-3.6.0/dcmjpls/apps/Makefile.in 2011-08-23 13:43:23.000000000 +0200 +@@ -42,10 +42,6 @@ + dcmjplslibdir = -L$(dcmjplsdir)/libsrc + dcmjplslib = -ldcmjpls + +-libcharlsdir = $(dcmjplsdir) +-libcharlslibdir = -L$(dcmjplsdir)/libcharls +-libcharlslib = -lcharls +- + LOCALINCLUDES = $(dcmjplsinc) $(ofstdinc) $(ofloginc) $(dcmdatainc) $(dcmimageinc) $(dcmimgleinc) + LIBDIRS = -L$(top_srcdir)/libsrc $(dcmjplslibdir) $(libcharlslibdir) $(dcmimagelibdir) \ + $(dcmimglelibdir) $(dcmdatalibdir) $(ofloglibdir) $(ofstdlibdir) Modified: trunk/packages/dcmtk/trunk/debian/patches/series =================================================================== --- trunk/packages/dcmtk/trunk/debian/patches/series 2011-08-23 10:13:37 UTC (rev 7521) +++ trunk/packages/dcmtk/trunk/debian/patches/series 2011-08-23 11:56:34 UTC (rev 7522) @@ -8,3 +8,4 @@ removedocsfromall.patch dcmtk_version_number.patch regression_stacksequenceisodd.patch +removecharls.patch _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
