about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2017-04-04 15:26:15 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2017-04-04 15:26:15 +0000
commitdd1729e780abf32158475f49e05380183f230a99 (patch)
tree21650e39eaceb65bcf9cf81e9b00b26de4190023
parent7d3ec71c7aa5ba5ee4aec5a0abd62a4f64e131b6 (diff)
downloadnetpbm-mirror-dd1729e780abf32158475f49e05380183f230a99.tar.gz
netpbm-mirror-dd1729e780abf32158475f49e05380183f230a99.tar.xz
netpbm-mirror-dd1729e780abf32158475f49e05380183f230a99.zip
Don't try to include Manweb files in Debian package
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@2936 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rwxr-xr-xbuildtools/debian/mkdeb4
-rw-r--r--doc/HISTORY3
2 files changed, 6 insertions, 1 deletions
diff --git a/buildtools/debian/mkdeb b/buildtools/debian/mkdeb
index d1a88dc8..011d75b2 100755
--- a/buildtools/debian/mkdeb
+++ b/buildtools/debian/mkdeb
@@ -428,7 +428,9 @@ sub buildDpkgBuildTree($$$$$) {
     makePkgConfig("$dpkgDirName/usr/lib/pkgconfig/netpbm.pc", $templateSubsR,
                   $netpbmPkgDir);
 
-    makeManweb($dpkgDirName, $netpbmPkgDir);
+    # Beginning in Netpbm 10.78 (March 2017_, 'make package' doesn't package
+    # the manweb stuff, so we no longer put it in the Debian package.
+    #makeManweb($dpkgDirName, $netpbmPkgDir);
 }
 
 
diff --git a/doc/HISTORY b/doc/HISTORY
index f8dffdf2..ebbb7932 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -9,6 +9,9 @@ not yet  BJH  Release 10.79.00
               pnmtojpeg: fix array bounds violation in argument list.  Always
               broken (pnmtojpeg was new to Netpbm in Netpbm 8.2 (March 2000).
 
+              Debian packaging: fix bug: don't try to include Manweb files, as
+              it is no longer packaged by 'make package'.
+
 17.03.28 BJH  Release 10.78.00
 
               ppmpat: Add -color.