about summary refs log tree commit diff
path: root/buildtools
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2017-03-19 02:09:34 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2017-03-19 02:09:34 +0000
commit34895cc28fb303ba5a2c025a99626b6a481d0076 (patch)
treef8a61741abf38fd9284953ea8cba5edfd5f28210 /buildtools
parenta0a2e113c59a01a599cbb91752a5ba344b6f92e8 (diff)
downloadnetpbm-mirror-34895cc28fb303ba5a2c025a99626b6a481d0076.tar.gz
netpbm-mirror-34895cc28fb303ba5a2c025a99626b6a481d0076.tar.xz
netpbm-mirror-34895cc28fb303ba5a2c025a99626b6a481d0076.zip
Update from Debian 7 to Debian 8
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@2919 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'buildtools')
-rw-r--r--buildtools/debian/README11
-rwxr-xr-xbuildtools/debian/mkdeb11
2 files changed, 12 insertions, 10 deletions
diff --git a/buildtools/debian/README b/buildtools/debian/README
index 02fae4b5..2cf921ce 100644
--- a/buildtools/debian/README
+++ b/buildtools/debian/README
@@ -37,11 +37,11 @@ To install Netpbm as a Debian package:
 PREREQUSISITES
 --------------
 
-The following information was taken from the Wheezy version (Version 7) of
-Debian, in January 2014.
+The following information was taken from the Jessie version (Version 8) of
+Debian, in March 2017.
 
 You don't actually need the current version of any of these.  For example,
-while we list package libjpeg8-dev, the package libjpeg62-dev works fine.
+while we list package libjpeg62-dev, the package libjpeg8-dev works fine.
 
 
 Building
@@ -54,12 +54,11 @@ indicate you don't have them, and the build will simply omit some parts.
 For example, if you don't install libx11-dev, the Netpbm build process
 will not build the 'pamx' program.
 
-  libjpeg8-dev
+  libjpeg62-dev
   libpng12-0-dev
-  libsvga1-dev
   libtiff5-dev
   libx11-dev
-  libxml2a-dev
+  libxml2-dev
   zlib1g-dev
 
 
diff --git a/buildtools/debian/mkdeb b/buildtools/debian/mkdeb
index 42a986eb..d1a88dc8 100755
--- a/buildtools/debian/mkdeb
+++ b/buildtools/debian/mkdeb
@@ -10,6 +10,10 @@
 #  package (what Debian contains is derived from Sourceforge Netpbm ca.
 #  2002).
 #
+#  The dependencies this package declares are those that can be satisfied by
+#  Debian 8 (Jessie).  Netpbm works fine on other versions of Debian, but you
+#  may have to change the dependencies in this program or ignore dependencies
+#  at install time.
 ###############################################################################
 
 use strict;
@@ -111,8 +115,8 @@ sub control($$) {
 
 # The Debian packaging system doesn't provide a way to express Netpbm's actual
 # prerequisites.  For example, Netpbm needs Version 6.2 or better of Libjpeg,
-# but there is no way to state that here.  Instead, we state Libjpeg 8.
-# This makes the Netpbm package less useful.
+# but there is no way to state that here.  Instead, we state Libjpeg 6.2
+# exactly.  This makes the Netpbm package less useful.
 
     my %control;
 
@@ -135,8 +139,7 @@ sub control($$) {
         'libc6, ' .
         'libjpeg62, ' .
         'libpng12-0, ' .
-        'libsvga1, ' .
-        'libtiff4, ' .
+        'libtiff5, ' .
         'libx11-6, ' .
         'libxml2, ' .
         'zlib1g, ' .