<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/14247">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Pau Espin Pedrol: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">debian: create -doc subpackage with pdf manuals<br><br>I have verified, that the resulting debian packages build in my own OBS<br>namespace (see the -doc packages):<br>https://download.opensuse.org/repositories/home:/osmith42/Debian_9.0/all/<br>https://build.opensuse.org/project/show/home:osmith42<br><br>Depends: Ib7251cca9116151e473798879375cd5eb48ff3ad (osmo-ci)<br>Related: OS#3899<br>Change-Id: I6d7a182d0a668693a5014aca0edc50ada9ac0d0f<br>---<br>M debian/control<br>A debian/osmo-bts-doc.install<br>M debian/rules<br>M doc/manuals/Makefile.am<br>4 files changed, 18 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/debian/control b/debian/control</span><br><span>index 0377d9f..2b66716 100644</span><br><span>--- a/debian/control</span><br><span>+++ b/debian/control</span><br><span>@@ -11,7 +11,8 @@</span><br><span> libosmocore-dev,</span><br><span> libosmo-abis-dev,</span><br><span> libgps-dev,</span><br><span style="color: hsl(0, 100%, 40%);">- txt2man</span><br><span style="color: hsl(120, 100%, 40%);">+ txt2man,</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-gsm-manuals-dev</span><br><span> Standards-Version: 3.9.8</span><br><span> Vcs-Browser: http://git.osmocom.org/osmo-bts/</span><br><span> Vcs-Git: git://git.osmocom.org/osmo-bts</span><br><span>@@ -48,3 +49,12 @@</span><br><span> Depends: osmo-bts-virtual (= ${binary:Version}), ${misc:Depends}</span><br><span> Description: Debug symbols for the osmo-bts-virtual</span><br><span> Make debugging possible</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+Package: osmo-bts-doc</span><br><span style="color: hsl(120, 100%, 40%);">+Architecture: all</span><br><span style="color: hsl(120, 100%, 40%);">+Section: doc</span><br><span style="color: hsl(120, 100%, 40%);">+Priority: optional</span><br><span style="color: hsl(120, 100%, 40%);">+Depends: ${misc:Depends}</span><br><span style="color: hsl(120, 100%, 40%);">+Description: ${misc:Package} PDF documentation</span><br><span style="color: hsl(120, 100%, 40%);">+ Various manuals: user manual, VTY reference manual and/or</span><br><span style="color: hsl(120, 100%, 40%);">+ protocol/interface manuals.</span><br><span>diff --git a/debian/osmo-bts-doc.install b/debian/osmo-bts-doc.install</span><br><span>new file mode 100644</span><br><span>index 0000000..65aaaf7</span><br><span>--- /dev/null</span><br><span>+++ b/debian/osmo-bts-doc.install</span><br><span>@@ -0,0 +1 @@</span><br><span style="color: hsl(120, 100%, 40%);">+usr/share/doc/osmo-bts-doc/*.pdf</span><br><span>diff --git a/debian/rules b/debian/rules</span><br><span>index 27de11b..94bed0e 100755</span><br><span>--- a/debian/rules</span><br><span>+++ b/debian/rules</span><br><span>@@ -16,7 +16,7 @@</span><br><span> dh_strip --package=osmo-bts-trx --dbg-package=osmo-bts-trx-dbg</span><br><span> </span><br><span> override_dh_auto_configure:</span><br><span style="color: hsl(0, 100%, 40%);">- dh_auto_configure -- --enable-trx --with-systemdsystemunitdir=/lib/systemd/system</span><br><span style="color: hsl(120, 100%, 40%);">+ dh_auto_configure -- --enable-trx --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals</span><br><span> </span><br><span> override_dh_clean:</span><br><span> dh_clean</span><br><span>@@ -26,3 +26,7 @@</span><br><span> # Print test results in case of a failure</span><br><span> override_dh_auto_test:</span><br><span> dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Don't create .pdf.gz files (barely saves space and they can't be opened directly by most pdf readers)</span><br><span style="color: hsl(120, 100%, 40%);">+override_dh_compress:</span><br><span style="color: hsl(120, 100%, 40%);">+ dh_compress -X.pdf</span><br><span>diff --git a/doc/manuals/Makefile.am b/doc/manuals/Makefile.am</span><br><span>index 90fff57..1d8125f 100644</span><br><span>--- a/doc/manuals/Makefile.am</span><br><span>+++ b/doc/manuals/Makefile.am</span><br><span>@@ -20,5 +20,6 @@</span><br><span> VTY_REFERENCE = osmobts-vty-reference.xml</span><br><span> include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_REPOSITORY = osmo-bts</span><br><span> include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc</span><br><span> endif</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/14247">change 14247</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/14247"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I6d7a182d0a668693a5014aca0edc50ada9ac0d0f </div>
<div style="display:none"> Gerrit-Change-Number: 14247 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>