remove unused sources

5 files changed, 18 insertions, 95 deletions

diff --git a/debian/argyll-doc.doc-base b/debian/argyll-doc.doc-base
index 11a7dac..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/ArgyllDoc.html.gz
+Index: /usr/share/doc/argyll-doc/ArgyllDoc.html
 Files: /usr/share/doc/argyll-doc/*.html
diff --git a/debian/changelog b/debian/changelog
index 2b2cb17..979d859 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,7 +12,13 @@ argyll (1.7.0-1) UNRELEASED; urgency=medium
       + Add dpkg-dev to Build-Depends.
   * debian/rules:
     - get-orig-source:
-      + remove unwanted Windows binaries.
+      + Remove unwanted Windows binaries.
+      + Remove unused sources: tiff, jpeg, zlib, png.
+    - New override_dh_compress:
+      + Don't compress html files.
+  * debian/copyright:
+    - Remove unused tags.
+    - Set year 2015.
 
  -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Fri, 01 May 2015 16:42:49 +0200
 
diff --git a/debian/control b/debian/control
index 7cd8b3b..f8b2f4d 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Build-Depends:
  dpkg-dev (>= 1.17.0),
  jam,
  libjpeg-dev,
+ libpng12-dev,
  libtiff5-dev,
  libtool,
  libusb-dev,
diff --git a/debian/copyright b/debian/copyright
index 57c4f15..c035f45 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -27,15 +27,6 @@ Files: yajl/*
 Copyright: 2007-2014 Lloyd Hilaiel
 License: BSD-3
 
-Files: jpeg/*
-Copyright: 1991-2012 Thomas G. Lane
-           1991-2012 Guido Vollbeding
-License: libjpeg
-
-Files: jpeg/ansi2knr.c
-Copyright: 1989-2000 Aladdin Enterprises
-License: GPL-1
-
 Files: usb/*
 Copyright: 2012      Graeme W. Gill <Graeme@argyllcms.com>
 License: Expat
@@ -102,88 +93,6 @@ Files: h/sort.h
 Copyright: 1996-2010 Graeme W. Gill <Graeme@argyllcms.com>
 License: GPL-2+
 
-Files: tiff/*
-Copyright: 1988-1997 Sam Leffler
-           1991-1997 Silicon Graphics, Inc.
-License: Expat
-
-Files: tiff/contrib/addtiffo/*
-Copyright: 1999-2000 Frank Warmerdam <warmerdam@pobox.com>
-License: Expat
-
-Files: tiff/contrib/dbs/*
-Copyright: 1990-1991 Digital Equipment Corporation
-License: Expat
-
-Files: tiff/contrib/mfs/*
-Copyright: 1996      BancTec AB
-           1996      Mike Johnson
-License: Expat
-
-Files: tiff/contrib/pds/tif_pdsdir*
-Copyright: 1988-1996 Sam Leffler
-           1991-1996 Silicon Graphics, Inc.
-           1996      USAF Phillips Laboratory
-License: Expat
-
-Files: tiff/contrib/ras/*
-Copyright: 1990      Sun Microsystems, Inc.
-License: Expat
-
-Files: tiff/libtiff/mkg3states.c
-       tiff/libtiff/tif_fax3.*
-Copyright: 1991-1997 Sam Leffler
-           1991-1997 Silicon Graphics, Inc.
-           1990-1995 Frank D. Cringle
-License: Expat
-
-Files: tiff/libtiff/tif_luv.c
-Copyright: 1997      Greg Ward Larson
-           1997      Silicon Graphics, Inc.
-License: Expat
-
-Files: tiff/libtiff/tif_lzw.c
-Copyright: 1985-1986 The Regents of the University of California
-           1988-1997 Sam Leffler
-           1991-1997 Silicon Graphics, Inc.
-License: Expat
-
-Files: tiff/libtiff/tif_ojpeg.c
-Copyright:           Joris Van Damme <info@awaresystems.be>
-                     AWare Systems <http://www.awaresystems.be/>
-License: Expat
-
-Files: tiff/libtiff/tif_pixarlog.c
-Copyright: 1996-1997 Sam Leffler
-           1996      Pixar
-License: Expat
-
-Files: tiff/port/*
-Copyright: 1987-1994 The Regents of the University of California
-License: Expat
-
-Files: tiff/port/libport.h
-Copyright: 2009      Frank Warmerdam
-License: Expat
-
-Files: tiff/test/*
-Copyright: 2004      Andrey Kiselev <dron@ak4719.spb.edu>
-License: Expat
-
-Files: tiff/tools/tiffset.c
-Copyright: 2000      Frank Warmerdam
-License: Expat
-
-Files: tiff/tools/tiff2pdf.c
-Copyright: 2003      Ross Finlayson
-License: Expat
-
-Files: tiff/tools/bmp2tiff.c
-       tiff/tools/raw2tiff.c
-       tiff/tools/tiffgt.c 
-Copyright: 2002-2004, Andrey Kiselev <dron@ak4719.spb.edu>
-License: Expat
-
 Files: xicc/xspect.c
 Copyright: 2000-2006 Graeme W. Gill <Graeme@argyllcms.com>
 License: GPL-2+
@@ -209,7 +118,7 @@ License: public-domain
 Files: debian/*
 Copyright: 2006-2008 Christian Marillat <marillat@debian.org>
            2008-2010 Roland Mas <lolando@debian.org>
-           2014      Jörg Frings-Fürst <debian@jff-webhosting.net>
+           2014-2015 Jörg Frings-Fürst <debian@jff-webhosting.net>
 License: GPL-3+
 
 License: AGPL-3
diff --git a/debian/rules b/debian/rules
index 75c583b..bf38bd6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,6 +43,9 @@ override_dh_strip:
 override_dh_builddeb:
 	dh_builddeb
 
+override_dh_compress:
+	dh_compress -X.html
+
 build-manpages:
 	help2man -N --no-discard-stderr --name="Apply device calibration to an ICC profile." debian/tmp/usr/bin/applycal > debian/man/applycal.1
 	help2man -N --no-discard-stderr --name="Dump an ICC file in human readable form." debian/tmp/usr/bin/iccdump > debian/man/iccdump.1
@@ -99,5 +102,9 @@ get-orig-source:
 	mv ../Argyll_V${VERSION} ../argyll_${VERSION}
 	rm -f ../argyll_${VERSION}/yajl/yajl_test.exe ../argyll_${VERSION}/yajl/yajl_test.obj
 	rm -fr ../argyll_${VERSION}/usb/bin
+	rm -fr ../argyll_${VERSION}/jpeg
+	rm -fr ../argyll_${VERSION}/tiff
+	rm -fr ../argyll_${VERSION}/zlib
+	rm -fr ../argyll_${VERSION}/png
 	tar cJf ../argyll_${VERSION}.orig.tar.xz ../argyll_${VERSION}
-	rm -fr ../argyll_${VERSION} ../Argyll_V${VERSION}_src.zip 
+#	rm -fr ../argyll_${VERSION} ../Argyll_V${VERSION}_src.zip