From 98f5506bd75d0b9332bfb1041e1fc2b4f1587a09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 25 Sep 2014 15:12:32 +0200 Subject: Debian bug #762771, #762772, #762773, #762774, #762780 --- debian/argyll-doc.doc-base | 4 +- debian/changelog | 20 +++++ debian/control | 8 +- debian/patches/15_jam.patch | 155 +++++++++++++++++++++++++++++++--- debian/patches/20_hurd_PATH_MAX.patch | 81 ++++++++++++++++++ debian/patches/series | 1 + debian/rules | 23 +---- 7 files changed, 254 insertions(+), 38 deletions(-) create mode 100644 debian/patches/20_hurd_PATH_MAX.patch diff --git a/debian/argyll-doc.doc-base b/debian/argyll-doc.doc-base index b4f3f54..962b063 100644 --- a/debian/argyll-doc.doc-base +++ b/debian/argyll-doc.doc-base @@ -3,5 +3,5 @@ Title: Argyll Documentation Section: Graphics Format: HTML -Index: /usr/share/doc/argyll-doc/html/ArgyllDoc.html -Files: /usr/share/doc/argyll-doc/html/*.html +Index: /usr/share/doc/argyll-doc/ArgyllDoc.html +Files: /usr/share/doc/argyll-doc/*.html diff --git a/debian/changelog b/debian/changelog index 06c3576..e11383c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,23 @@ +argyll (1.6.3-2) unstable; urgency=medium + + * debian/control: + - Bump Standards-Version to 3.9.6 (no changes required). + - Add Replaces: argyll (<< 1.6.3-1) and + Breaks (<< 1.6.3-1) to argyll-ref (Closes: #762780). + - Change Achitecture from any to linux-any hurd-i386 to disable build + on kfreebsd-* (Closes: #762773). + * debian/patches/15_jam.patch: + - Add missing multiarch directories for libtiff and libjpeg + (Closes: #762772). + * New debain/patches/20_hurd_PATH_MAX.patch: + - Add missing PATH_MAX for hurdi386 (Closes: #762774). + * debian/rules: + - Remove the move of the html docs into a subdirectory (Closes: #762771). + - Remove BUILTIN_TIFF=false from JAMCMDLINE to prevent + false negative tests for libtiff. + + -- Jörg Frings-Fürst Thu, 25 Sep 2014 12:49:49 +0200 + argyll (1.6.3-1) unstable; urgency=medium * New Maintainer (Closes: #720178). diff --git a/debian/control b/debian/control index d21f905..5646e6e 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: argyll Section: graphics Priority: extra Maintainer: Jörg Frings-Fürst -Standards-Version: 3.9.5 +Standards-Version: 3.9.6 Build-Depends: debhelper (>= 9), dh-autoreconf, @@ -24,7 +24,7 @@ Vcs-Git: git://anonscm.debian.org/collab-maint/argyll.git Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/argyll.git Package: argyll -Architecture: any +Architecture: linux-any hurd-i386 Depends: ${misc:Depends}, ${shlibs:Depends}, argyll-doc, argyll-ref Pre-Depends: dpkg (>= 1.17.5) @@ -48,7 +48,7 @@ Description: Color Management System, calibrator and profiler Package: argyll-dbg Section: debug -Architecture: any +Architecture: linux-any hurd-i386 Depends: argyll (= ${binary:Version}), ${misc:Depends} Pre-Depends: dpkg (>= 1.17.5) @@ -65,6 +65,8 @@ Architecture: all Depends: ${misc:Depends}, ${shlibs:Depends} Pre-Depends: dpkg (>= 1.17.5) +Replaces: argyll (<< 1.6.3-1) +Breaks: argyll (<< 1.6.3-1) Description: Color Management System, calibrator and profiler (data files) Argyll is an experimental, open source, ICC compatible color management system. It supports accurate ICC profile creation for scanners, CMYK diff --git a/debian/patches/15_jam.patch b/debian/patches/15_jam.patch index 08ca67a..b8014ef 100644 --- a/debian/patches/15_jam.patch +++ b/debian/patches/15_jam.patch @@ -1,33 +1,99 @@ Description: Add multiarch support to jam files Author: Jörg Frings Fürst Forwarded: http://www.freelists.org/post/argyllcms/Some-buildsystem-issues -Last-Update: 2014-09-14 +Last-Update: 2014-09-25 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ Index: trunk/Jamtop =================================================================== ---- trunk.orig/Jamtop 2014-09-07 20:15:02.520225484 +0200 -+++ trunk/Jamtop 2014-09-07 20:15:43.909089670 +0200 -@@ -109,12 +109,16 @@ +--- trunk.orig/Jamtop 2014-09-25 11:10:18.768548869 +0200 ++++ trunk/Jamtop 2014-09-25 11:17:03.696933742 +0200 +@@ -109,12 +109,80 @@ # See if we have a system TIFF library. if ! $(BUILTIN_TIFF) && $(UNIX) { - if [ GLOB /usr/include : tiffio.h ] || [ GLOB /usr/local/include : tiffio.h ] { -+ if [ GLOB /usr/include : tiffio.h ] || [ GLOB /usr/local/include : tiffio.h ] +- if [ GLOB /usr/lib : libtiff.so ] || [ GLOB /usr/lib : libtiff.a ] +- || [ GLOB /usr/lib64 : libtiff.so ] || [ GLOB /usr/lib64 : libtiff.a ] ++ if [ GLOB /usr/include : tiffio.h ] ++ || [ GLOB /usr/local/include : tiffio.h ] + || [ GLOB /usr/include/x86_64-linux-gnu : tiffio.h ] -+ || [ GLOB /usr/include/i386-linux-gnu : tiffio.h ] { - if [ GLOB /usr/lib : libtiff.so ] || [ GLOB /usr/lib : libtiff.a ] - || [ GLOB /usr/lib64 : libtiff.so ] || [ GLOB /usr/lib64 : libtiff.a ] ++ || [ GLOB /usr/include/i386-linux-gnu : tiffio.h ] ++ || [ GLOB /usr/include/aarch64-linux-gnu : tiffio.h ] ++ || [ GLOB /usr/include/arm-linux-gnueabi : tiffio.h ] ++ || [ GLOB /usr/include/arm-linux-gnueabihf : tiffio.h ] ++ || [ GLOB /usr/include/i386-gnu : tiffio.h ] ++ || [ GLOB /usr/include/x86_64-kfreebsd-gnu : tiffio.h ] ++ || [ GLOB /usr/include/i386-kfreebsd-gnu : tiffio.h ] ++ || [ GLOB /usr/include/mips-linux-gnu : tiffio.h ] ++ || [ GLOB /usr/include/mipsel-linux-gnu : tiffio.h ] ++ || [ GLOB /usr/include/powerpc-linux-gnu : tiffio.h ] ++ || [ GLOB /usr/include/powerpc64le-linux-gnu : tiffio.h ] ++ || [ GLOB /usr/include/s390x-linux-gnu : tiffio.h ] ++ || [ GLOB /usr/include/sparc-linux-gnu : tiffio.h ] ++ || [ GLOB /usr/include/alpha-linux-gnu : tiffio.h ] ++ || [ GLOB /usr/include/hppa-linux-gnu : tiffio.h ] ++ || [ GLOB /usr/include/m68k-linux-gnu : tiffio.h ] ++ || [ GLOB /usr/include/powerpc-linux-gnuspe : tiffio.h ] ++ || [ GLOB /usr/include/sh4-linux-gnu : tiffio.h ] ++ || [ GLOB /usr/include/sparc64-linux-gnu : tiffio.h ] ++ || [ GLOB /usr/include/x86_64-linux-gnux32 : tiffio.h ] ++ || [ GLOB /usr/include/powerpc64-linux-gnu : tiffio.h ] { ++ if [ GLOB /usr/lib : libtiff.so ] ++ || [ GLOB /usr/lib : libtiff.a ] ++ || [ GLOB /usr/lib64 : libtiff.so ] ++ || [ GLOB /usr/lib64 : libtiff.a ] || [ GLOB /usr/lib/x86_64-linux-gnu : libtiff.so ] || [ GLOB /usr/lib/x86_64-linux-gnu : libtiff.a ] - || [ GLOB /usr/local/lib : libtiff.so ] || [ GLOB /usr/local/lib : libtiff.a ] { + || [ GLOB /usr/lib/i386-linux-gnu : libtiff.so ] + || [ GLOB /usr/lib/i386-linux-gnu : libtiff.a ] -+ || [ GLOB /usr/local/lib : libtiff.so ] || [ GLOB /usr/local/lib : libtiff.a ] { ++ || [ GLOB /usr/lib/aarch64-linux-gnu : libtiff.so ] ++ || [ GLOB /usr/lib/aarch64-linux-gnu : libtiff.a ] ++ || [ GLOB /usr/lib/arm-linux-gnueabi : libtiff.so ] ++ || [ GLOB /usr/lib/arm-linux-gnueabi : libtiff.a ] ++ || [ GLOB /usr/lib/arm-linux-gnueabihf : libtiff.so ] ++ || [ GLOB /usr/lib/arm-linux-gnueabihf : libtiff.a ] ++ || [ GLOB /usr/lib/i386-gnu : libtiff.so ] ++ || [ GLOB /usr/lib/i386-gnu : libtiff.a ] ++ || [ GLOB /usr/lib/x86_64-kfreebsd-gnu : libtiff.so ] ++ || [ GLOB /usr/lib/x86_64-kfreebsd-gnu : libtiff.a ] ++ || [ GLOB /usr/lib/i386-kfreebsd-gnu : libtiff.so ] ++ || [ GLOB /usr/lib/i386-kfreebsd-gnu : libtiff.a ] ++ || [ GLOB /usr/lib/mips-linux-gnu : libtiff.so ] ++ || [ GLOB /usr/lib/mips-linux-gnu : libtiff.a ] ++ || [ GLOB /usr/lib/mipsel-linux-gnu : libtiff.so ] ++ || [ GLOB /usr/lib/mipsel-linux-gnu : libtiff.a ] ++ || [ GLOB /usr/lib/powerpc-linux-gnu : libtiff.so ] ++ || [ GLOB /usr/lib/powerpc-linux-gnu : libtiff.a ] ++ || [ GLOB /usr/lib/powerpc64le-linux-gnu : libtiff.so ] ++ || [ GLOB /usr/lib/powerpc64le-linux-gnu : libtiff.a ] ++ || [ GLOB /usr/lib/s390x-linux-gnu : libtiff.so ] ++ || [ GLOB /usr/lib/s390x-linux-gnu : libtiff.a ] ++ || [ GLOB /usr/lib/sparc-linux-gnu : libtiff.so ] ++ || [ GLOB /usr/lib/sparc-linux-gnu : libtiff.a ] ++ || [ GLOB /usr/lib/alpha-linux-gnu : libtiff.so ] ++ || [ GLOB /usr/lib/alpha-linux-gnu : libtiff.a ] ++ || [ GLOB /usr/lib/hppa-linux-gnu : libtiff.so ] ++ || [ GLOB /usr/lib/hppa-linux-gnu : libtiff.a ] ++ || [ GLOB /usr/lib/m68k-linux-gnu : libtiff.so ] ++ || [ GLOB /usr/lib/m68k-linux-gnu : libtiff.a ] ++ || [ GLOB /usr/lib/powerpc-linux-gnuspe : libtiff.so ] ++ || [ GLOB /usr/lib/powerpc-linux-gnuspe : libtiff.a ] ++ || [ GLOB /usr/lib/sh4-linux-gnu : libtiff.so ] ++ || [ GLOB /usr/lib/sh4-linux-gnu : libtiff.a ] ++ || [ GLOB /usr/lib/sparc64-linux-gnu : libtiff.so ] ++ || [ GLOB /usr/lib/sparc64-linux-gnu : libtiff.a ] ++ || [ GLOB /usr/lib/x86_64-linux-gnux32 : libtiff.so ] ++ || [ GLOB /usr/lib/x86_64-linux-gnux32 : libtiff.a ] ++ || [ GLOB /usr/lib/powerpc64-linux-gnu : libtiff.so ] ++ || [ GLOB /usr/lib/powerpc64-linux-gnu : libtiff.a ] ++ || [ GLOB /usr/local/lib : libtiff.so ] ++ || [ GLOB /usr/local/lib : libtiff.a ] { echo "Using system TIFF library" ; TIFFLIB = ; TIFFINC = ; -@@ -124,6 +128,7 @@ +@@ -124,6 +192,7 @@ } } @@ -35,10 +101,75 @@ Index: trunk/Jamtop # If nothing else, use Argyll supplied TIFF library if ! $(HAVE_TIFF) || $(BUILTIN_TIFF) { echo "Using Argyll TIFF library" ; +@@ -133,12 +202,58 @@ + + # See if we have a system JPEG library. + if ! $(BUILTIN_JPEG) && $(UNIX) { +- if [ GLOB /usr/include : jpeglib.h ] || [ GLOB /usr/local/include : jpeglib.h ] { +- if [ GLOB /usr/lib : libjpeg.so ] || [ GLOB /usr/lib : libjpeg.a ] +- || [ GLOB /usr/lib64 : libjpeg.so ] || [ GLOB /usr/lib64 : libjpeg.a ] +- || [ GLOB /usr/lib/x86_64-linux-gnu : libjpeg.so ] +- || [ GLOB /usr/lib/x86_64-linux-gnu : libjpeg.a ] +- || [ GLOB /usr/local/lib : libjpeg.so ] || [ GLOB /usr/local/lib : libjpeg.a ] { ++ if [ GLOB /usr/include : jpeglib.h ] ++ || [ GLOB /usr/local/include : jpeglib.h ] { ++ if [ GLOB /usr/lib : libjpeg.so ] ++ || [ GLOB /usr/lib : libjpeg.a ] ++ || [ GLOB /usr/lib64 : libjpeg.so ] ++ || [ GLOB /usr/lib64 : libjpeg.a ] ++ || [ GLOB /usr/lib/x86_64-linux-gnu : libjpeg.so ] ++ || [ GLOB /usr/lib/x86_64-linux-gnu : libjpeg.a ] ++ || [ GLOB /usr/lib/i386-linux-gnu : libjpeg.so ] ++ || [ GLOB /usr/lib/i386-linux-gnu : libjpeg.a ] ++ || [ GLOB /usr/lib/aarch64-linux-gnu : libjpeg.so ] ++ || [ GLOB /usr/lib/aarch64-linux-gnu : libjpeg.a ] ++ || [ GLOB /usr/lib/arm-linux-gnueabi : libjpeg.so ] ++ || [ GLOB /usr/lib/arm-linux-gnueabi : libjpeg.a ] ++ || [ GLOB /usr/lib/arm-linux-gnueabihf : libjpeg.so ] ++ || [ GLOB /usr/lib/arm-linux-gnueabihf : libjpeg.a ] ++ || [ GLOB /usr/lib/i386-gnu : libjpeg.so ] ++ || [ GLOB /usr/lib/i386-gnu : libjpeg.a ] ++ || [ GLOB /usr/lib/x86_64-kfreebsd-gnu : libjpeg.so ] ++ || [ GLOB /usr/lib/x86_64-kfreebsd-gnu : libjpeg.a ] ++ || [ GLOB /usr/lib/i386-kfreebsd-gnu : libjpeg.so ] ++ || [ GLOB /usr/lib/i386-kfreebsd-gnu : libjpeg.a ] ++ || [ GLOB /usr/lib/mips-linux-gnu : libjpeg.so ] ++ || [ GLOB /usr/lib/mips-linux-gnu : libjpeg.a ] ++ || [ GLOB /usr/lib/mipsel-linux-gnu : libjpeg.so ] ++ || [ GLOB /usr/lib/mipsel-linux-gnu : libjpeg.a ] ++ || [ GLOB /usr/lib/powerpc-linux-gnu : libjpeg.so ] ++ || [ GLOB /usr/lib/powerpc-linux-gnu : libjpeg.a ] ++ || [ GLOB /usr/lib/powerpc64le-linux-gnu : libjpeg.so ] ++ || [ GLOB /usr/lib/powerpc64le-linux-gnu : libjpeg.a ] ++ || [ GLOB /usr/lib/s390x-linux-gnu : libjpeg.so ] ++ || [ GLOB /usr/lib/s390x-linux-gnu : libjpeg.a ] ++ || [ GLOB /usr/lib/sparc-linux-gnu : libjpeg.so ] ++ || [ GLOB /usr/lib/sparc-linux-gnu : libjpeg.a ] ++ || [ GLOB /usr/lib/alpha-linux-gnu : libjpeg.so ] ++ || [ GLOB /usr/lib/alpha-linux-gnu : libjpeg.a ] ++ || [ GLOB /usr/lib/hppa-linux-gnu : libjpeg.so ] ++ || [ GLOB /usr/lib/hppa-linux-gnu : libjpeg.a ] ++ || [ GLOB /usr/lib/m68k-linux-gnu : libjpeg.so ] ++ || [ GLOB /usr/lib/m68k-linux-gnu : libjpeg.a ] ++ || [ GLOB /usr/lib/powerpc-linux-gnuspe : libjpeg.so ] ++ || [ GLOB /usr/lib/powerpc-linux-gnuspe : libjpeg.a ] ++ || [ GLOB /usr/lib/sh4-linux-gnu : libjpeg.so ] ++ || [ GLOB /usr/lib/sh4-linux-gnu : libjpeg.a ] ++ || [ GLOB /usr/lib/sparc64-linux-gnu : libjpeg.so ] ++ || [ GLOB /usr/lib/sparc64-linux-gnu : libjpeg.a ] ++ || [ GLOB /usr/lib/x86_64-linux-gnux32 : libjpeg.so ] ++ || [ GLOB /usr/lib/x86_64-linux-gnux32 : libjpeg.a ] ++ || [ GLOB /usr/lib/powerpc64-linux-gnu : libjpeg.so ] ++ || [ GLOB /usr/lib/powerpc64-linux-gnu : libjpeg.a ] ++ || [ GLOB /usr/local/lib : libjpeg.so ] ++ || [ GLOB /usr/local/lib : libjpeg.a ] { + echo "Using system JPEG library" ; + JPEGLIB = ; + JPEGINC = ; Index: trunk/Jambase =================================================================== ---- trunk.orig/Jambase 2014-09-07 20:15:02.520225484 +0200 -+++ trunk/Jambase 2014-09-07 20:15:02.512225317 +0200 +--- trunk.orig/Jambase 2014-09-25 11:10:18.768548869 +0200 ++++ trunk/Jambase 2014-09-25 11:10:18.768548869 +0200 @@ -880,7 +880,7 @@ # UNIX defaults diff --git a/debian/patches/20_hurd_PATH_MAX.patch b/debian/patches/20_hurd_PATH_MAX.patch new file mode 100644 index 0000000..e5b2b40 --- /dev/null +++ b/debian/patches/20_hurd_PATH_MAX.patch @@ -0,0 +1,81 @@ +Description: Add on hurdi386 missing PATH_MAX +Author: Jörg Frings-Fürst +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=762774 +Last-Update: 2014-09-25 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/numlib/numsup.c +=================================================================== +--- trunk.orig/numlib/numsup.c 2014-01-31 05:08:43.000000000 +0100 ++++ trunk/numlib/numsup.c 2014-09-25 14:02:54.718876001 +0200 +@@ -39,6 +39,10 @@ + + /* Globals */ + ++#ifndef PATH_MAX ++#define PATH_MAX 4096 ++#endif ++ + char *exe_path = "\000"; /* Directory executable resides in ('/' dir separator) */ + //char *error_program = "Unknown"; /* Name to report as responsible for an error */ + +Index: trunk/spectro/mongoose.c +=================================================================== +--- trunk.orig/spectro/mongoose.c 2014-01-31 05:08:55.000000000 +0100 ++++ trunk/spectro/mongoose.c 2014-09-25 14:06:05.274863478 +0200 +@@ -18,6 +18,10 @@ + // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + // THE SOFTWARE. + ++#ifndef PATH_MAX ++#define PATH_MAX 4096 ++#endif ++ + #if defined(_WIN32) + #define _CRT_SECURE_NO_WARNINGS // Disable deprecation warning in VS2005 + #else +Index: trunk/spectro/usbio_lx.c +=================================================================== +--- trunk.orig/spectro/usbio_lx.c 2014-01-31 05:08:58.000000000 +0100 ++++ trunk/spectro/usbio_lx.c 2014-09-25 14:07:12.552271544 +0200 +@@ -33,6 +33,10 @@ + #define poll_x poll + #endif + ++#ifndef PATH_MAX ++#define PATH_MAX 4096 ++#endif ++ + /* USB descriptors are little endian */ + + /* Take a word sized return buffer, and convert it to an unsigned int */ +Index: trunk/spectro/usbio_nt.c +=================================================================== +--- trunk.orig/spectro/usbio_nt.c 2014-01-31 05:08:58.000000000 +0100 ++++ trunk/spectro/usbio_nt.c 2014-09-25 14:07:37.048784270 +0200 +@@ -31,6 +31,10 @@ + #define LIBUSBW1_PATH_MAX 512 + #define LIBUSBW1_DEFAULT_TIMEOUT 5000 + ++#ifndef PATH_MAX ++#define PATH_MAX 4096 ++#endif ++ + /* USB descriptors are little endian */ + + /* Take a word sized return buffer, and convert it to an unsigned int */ +Index: trunk/spectro/hidio.c +=================================================================== +--- trunk.orig/spectro/hidio.c 2014-09-25 11:17:32.000000000 +0200 ++++ trunk/spectro/hidio.c 2014-09-25 14:08:43.834182211 +0200 +@@ -97,6 +97,10 @@ + #endif + #endif + ++#ifndef PATH_MAX ++#define PATH_MAX 4096 ++#endif ++ + #if defined(NT) + + /* Declartions to enable HID access without using the DDK */ diff --git a/debian/patches/series b/debian/patches/series index 1382f48..928d441 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ 100_spelling.patch 15_jam.patch 03_usb-db.diff +20_hurd_PATH_MAX.patch diff --git a/debian/rules b/debian/rules index 54397f3..75954a3 100755 --- a/debian/rules +++ b/debian/rules @@ -4,26 +4,15 @@ export DH_OPTIONS NO_PROC=$(shell cat /proc/cpuinfo | grep processor | wc -l) -JAMCMDLINE = -q -fJambase -j$(NO_PROC) -sPREFIX=/usr -sDESTDIR=$(CURDIR)/debian/tmp -sREFSUBDIR=share/color/argyll/ref -sBUILTIN_TIFF=false +JAMCMDLINE = -q -fJambase -j$(NO_PROC) -sPREFIX=/usr -sDESTDIR=$(CURDIR)/debian/tmp -sREFSUBDIR=share/color/argyll/ref %: - dh $@ --parallel + dh $@ override_dh_auto_build: jam $(JAMCMDLINE) all override_dh_auto_clean: - jam $(JAMCMDLINE) clean - rm -f $(CURDIR)/tiff/*.a - rm -f $(CURDIR)/tiff/*.h - rm -f $(CURDIR)/tiff/config.log - rm -f $(CURDIR)/tiff/config.status - rm -f $(CURDIR)/tiff/Makefile - rm -f $(CURDIR)/tiff/libtool - rm -f $(CURDIR)/tiff/mkg3states - rm -f $(CURDIR)/imdi/imdi_k.c - rm -rf $(CURDIR)/debian/tmp/* - [ ! -d $(CURDIR)/debian/tmp ] || rmdir --ignore-fail-on-non-empty $(CURDIR)/debian/tmp dh_auto_clean override_dh_auto_install: @@ -33,14 +22,6 @@ override_dh_auto_install: override_dh_installdocs: dh_installdocs -A --link-doc=argyll-doc - mkdir -p $(CURDIR)/debian/argyll-doc/usr/share/doc/argyll-doc/html - mv -f $(CURDIR)/debian/argyll-doc/usr/share/doc/argyll-doc/*.html $(CURDIR)/debian/argyll-doc/usr/share/doc/argyll-doc/html/ - mv -f $(CURDIR)/debian/argyll-doc/usr/share/doc/argyll-doc/*.jpg $(CURDIR)/debian/argyll-doc/usr/share/doc/argyll-doc/html/ - mv -f $(CURDIR)/debian/argyll-doc/usr/share/doc/argyll-doc/SG_*.txt $(CURDIR)/debian/argyll-doc/usr/share/doc/argyll-doc/html/ - mv -f $(CURDIR)/debian/argyll-doc/usr/share/doc/argyll-doc/*.gif $(CURDIR)/debian/argyll-doc/usr/share/doc/argyll-doc/html/ - mv -f $(CURDIR)/debian/argyll-doc/usr/share/doc/argyll-doc/*.xls $(CURDIR)/debian/argyll-doc/usr/share/doc/argyll-doc/html/ - mv -f $(CURDIR)/debian/argyll-doc/usr/share/doc/argyll-doc/*.zip $(CURDIR)/debian/argyll-doc/usr/share/doc/argyll-doc/html/ - mv -f $(CURDIR)/debian/argyll-doc/usr/share/doc/argyll-doc/ccmxs $(CURDIR)/debian/argyll-doc/usr/share/doc/argyll-doc/html/ rm -f $(CURDIR)/debian/argyll-doc/usr/share/doc/argyll-doc/License.txt rm -f $(CURDIR)/debian/argyll-doc/usr/share/doc/argyll-doc/License2.txt rm -f $(CURDIR)/debian/argyll-doc/usr/share/doc/argyll-doc/License3.txt -- cgit v1.2.3