[cohomcalg] 01/01: Remove non-DFSG logo and rebuild manual from source.

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository cohomcalg.

commit 2b2641e97b408bdfc906c21338549cb057f39fcf
Author: Doug Torrance <dtorrance at piedmont.edu>
Date:   Wed Feb 1 19:28:15 2017 -0500

    Remove non-DFSG logo and rebuild manual from source.
---
 debian/README.source                   |   5 ++++-
 debian/clean                           |   1 +
 debian/cohomcalg-common.docs           |   2 +-
 debian/control                         |   4 ++++
 debian/copyright                       |   2 ++
 debian/patches/dfsg_manual.patch       |  24 ++++++++++++++++++++++++
 debian/patches/series                  |   1 +
 debian/rules                           |   4 ++++
 manual.pdf                             | Bin 956842 -> 0 bytes
 manual/latex_source/cohomCalg_logo.png | Bin 530907 -> 0 bytes
 10 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index c1326a6..c268590 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -9,7 +9,10 @@ We repack the upstream distribution file for several reasons:
   https://github.com/BenjaminJurke/cohomCalg/blob/master/old/cohomcalg-script-v004/manual.pdf
 * Upstream ships the source for the polylib library.  We remove it and use
   the Debian polylib package instead.
+* The cohomCalg logo incorporates a light bulb image with a non-DFSG license.
+  Upstream includes this logo in the manual, but we rebuild the manual
+  without the logo.
 
 Note that this repacking is performed automatically by uscan.
 
- -- Doug Torrance <dtorrance at piedmont.edu>, Mon, 16 Jan 2017 00:31:48 -0500
+ -- Doug Torrance <dtorrance at piedmont.edu>, Wed,  1 Feb 2017 18:46:17 -0500
diff --git a/debian/clean b/debian/clean
index 56d7443..c0e1e85 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1 +1,2 @@
 bin/cohomcalg
+manual/latex_source/manual.{aux,log,out,pdf,toc}
diff --git a/debian/cohomcalg-common.docs b/debian/cohomcalg-common.docs
index 840ed33..b923764 100644
--- a/debian/cohomcalg-common.docs
+++ b/debian/cohomcalg-common.docs
@@ -1,2 +1,2 @@
 Proper?Citation.txt
-manual.pdf
+manual/latex_source/manual.pdf
diff --git a/debian/control b/debian/control
index f8ed0a7..9d75a63 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,10 @@ Priority: optional
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Doug Torrance <dtorrance at piedmont.edu>
 Build-Depends: debhelper (>=9), libpolylib64-dev
+Build-Depends-Indep: texlive-fonts-recommended,
+                     texlive-latex-base,
+                     texlive-latex-extra,
+                     texlive-latex-recommended
 Standards-Version: 3.9.8
 Homepage: https://github.com/BenjaminJurke/cohomCalg
 Vcs-Browser: https://anonscm.debian.org/git/debian-science/packages/cohomcalg.git
diff --git a/debian/copyright b/debian/copyright
index 8bda8de..bb767df 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,8 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: cohomcalg
 Source: https://github.com/BenjaminJurke/cohomCalg
 Files-Excluded: bin/*.exe
+		manual/latex_source/cohomCalg_logo.png
+		manual.pdf
 		old/cohomcalg-script-v004/manual.pdf
 		source/polylib_mod
 
diff --git a/debian/patches/dfsg_manual.patch b/debian/patches/dfsg_manual.patch
new file mode 100644
index 0000000..03f0420
--- /dev/null
+++ b/debian/patches/dfsg_manual.patch
@@ -0,0 +1,24 @@
+Description: Remove non-DFSG logo from manual.
+ Since this means we have to rebuild the manual from source, we also remove
+ the date to allow reproducible builds.
+Author: Doug Torrance <dtorrance at piedmont.edu>
+Last-Update: 2017-02-01
+
+--- a/manual/latex_source/manual.tex
++++ b/manual/latex_source/manual.tex
+@@ -169,7 +169,6 @@
+ \put(400,0) {\includegraphics[height=1.5cm]{img_open_source_logo_gray}}
+ \end{picture}
+ \begin{center}        % Main title
+-	\includegraphics[height=7cm]{cohomCalg_logo.png}\\[1cm]
+ 	{\LARGE
+   {\bf\---Manual {\manualversion} ---}
+   }\\[15mm]
+@@ -177,7 +176,6 @@
+ 	\\[5mm]
+ 	in collaboration with\\[2mm]
+ 	{\sc Ralph Blumenhagen}, {\sc Helmut Roschy}\\[5mm]
+-  \today\\[5mm]
+ \end{center}
+ 
+ %\vspace{1cm}
diff --git a/debian/patches/series b/debian/patches/series
index 78dbe8e..53a84de 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 link_polylib.patch
+dfsg_manual.patch
diff --git a/debian/rules b/debian/rules
index d8309f6..0d1ed76 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,3 +4,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
 	dh $@
+
+override_dh_installdocs:
+	cd manual/latex_source && pdflatex manual
+	dh_installdocs
diff --git a/manual.pdf b/manual.pdf
deleted file mode 100644
index e24dfee..0000000
Binary files a/manual.pdf and /dev/null differ
diff --git a/manual/latex_source/cohomCalg_logo.png b/manual/latex_source/cohomCalg_logo.png
deleted file mode 100644
index 19a6d45..0000000
Binary files a/manual/latex_source/cohomCalg_logo.png and /dev/null differ

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cohomcalg.git