<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/14256">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Pau Espin Pedrol: Looks good to me, approved
</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: I34858a18a34fc467f274ac164697a242f4cf0df8<br>---<br>M debian/control<br>A debian/osmo-trx-doc.install<br>M debian/patches/build-for-debian8.patch<br>M debian/rules<br>M doc/manuals/Makefile.am<br>5 files changed, 37 insertions(+), 18 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 ffb9ac1..8ff59f0 100644</span><br><span>--- a/debian/control</span><br><span>+++ b/debian/control</span><br><span>@@ -14,7 +14,8 @@</span><br><span> libtalloc-dev,</span><br><span> libusrp-dev,</span><br><span> liblimesuite-dev,</span><br><span style="color: hsl(0, 100%, 40%);">- libosmocore-dev (>= 0.10.0)</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmocore-dev (>= 0.10.0),</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-gsm-manuals-dev</span><br><span> Standards-Version: 3.9.6</span><br><span> Vcs-Browser: http://cgit.osmocom.org/osmo-trx</span><br><span> Vcs-Git: git://git.osmocom.org/osmo-trx</span><br><span>@@ -89,3 +90,12 @@</span><br><span> 3GPP is the "3rd Generation Partnership Project" which is the collaboration</span><br><span> between different telecommunication associations for developing new</span><br><span> generations of mobile phone networks. (post-2G/GSM)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+Package: osmo-trx-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-trx-doc.install b/debian/osmo-trx-doc.install</span><br><span>new file mode 100644</span><br><span>index 0000000..aa207b5</span><br><span>--- /dev/null</span><br><span>+++ b/debian/osmo-trx-doc.install</span><br><span>@@ -0,0 +1 @@</span><br><span style="color: hsl(120, 100%, 40%);">+usr/share/doc/osmo-trx-doc/*.pdf</span><br><span>diff --git a/debian/patches/build-for-debian8.patch b/debian/patches/build-for-debian8.patch</span><br><span>index cd1f356..6b917c4 100644</span><br><span>--- a/debian/patches/build-for-debian8.patch</span><br><span>+++ b/debian/patches/build-for-debian8.patch</span><br><span>@@ -1,16 +1,16 @@</span><br><span style="color: hsl(0, 100%, 40%);">-Index: osmo-trx/debian/control</span><br><span style="color: hsl(0, 100%, 40%);">-===================================================================</span><br><span>---- osmo-trx.orig/debian/control</span><br><span style="color: hsl(0, 100%, 40%);">-+++ osmo-trx/debian/control</span><br><span style="color: hsl(120, 100%, 40%);">+diff --git a/debian/control b/debian/control</span><br><span style="color: hsl(120, 100%, 40%);">+index 8ff59f0..126c16a 100644</span><br><span style="color: hsl(120, 100%, 40%);">+--- a/debian/control</span><br><span>++++ b/debian/control</span><br><span> @@ -13,7 +13,6 @@ Build-Depends: debhelper (>= 9),</span><br><span> libfftw3-dev,</span><br><span> libtalloc-dev,</span><br><span> libusrp-dev,</span><br><span> - liblimesuite-dev,</span><br><span style="color: hsl(0, 100%, 40%);">- libosmocore-dev (>= 0.10.0)</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmocore-dev (>= 0.10.0),</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-gsm-manuals-dev</span><br><span> Standards-Version: 3.9.6</span><br><span style="color: hsl(0, 100%, 40%);">- Vcs-Browser: http://cgit.osmocom.org/osmo-trx</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -29,7 +28,7 @@ Package: osmo-trx-dbg</span><br><span style="color: hsl(120, 100%, 40%);">+@@ -30,7 +29,7 @@ Package: osmo-trx-dbg</span><br><span> Architecture: any</span><br><span> Section: debug</span><br><span> Priority: extra</span><br><span>@@ -19,11 +19,10 @@</span><br><span> Description: Debug symbols for the osmo-trx-*</span><br><span> Make debugging possible</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-@@ -70,22 +70,3 @@ Description: SDR transceiver that implem</span><br><span style="color: hsl(0, 100%, 40%);">- 3GPP is the "3rd Generation Partnership Project" which is the collaboration</span><br><span style="color: hsl(120, 100%, 40%);">+@@ -72,25 +71,6 @@ Description: SDR transceiver that implements Layer 1 of a GSM BTS (USRP1)</span><br><span> between different telecommunication associations for developing new</span><br><span> generations of mobile phone networks. (post-2G/GSM)</span><br><span style="color: hsl(0, 100%, 40%);">--</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span> -Package: osmo-trx-lms</span><br><span> -Architecture: any</span><br><span> -Depends: ${shlibs:Depends}, ${misc:Depends}</span><br><span>@@ -42,16 +41,20 @@</span><br><span> - 3GPP is the "3rd Generation Partnership Project" which is the collaboration</span><br><span> - between different telecommunication associations for developing new</span><br><span> - generations of mobile phone networks. (post-2G/GSM)</span><br><span style="color: hsl(0, 100%, 40%);">-Index: osmo-trx/debian/rules</span><br><span style="color: hsl(0, 100%, 40%);">-===================================================================</span><br><span>---- osmo-trx.orig/debian/rules</span><br><span style="color: hsl(0, 100%, 40%);">-+++ osmo-trx/debian/rules</span><br><span style="color: hsl(120, 100%, 40%);">+-</span><br><span style="color: hsl(120, 100%, 40%);">+ Package: osmo-trx-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%);">+diff --git a/debian/rules b/debian/rules</span><br><span style="color: hsl(120, 100%, 40%);">+index 627c0c8..d9285e2 100755</span><br><span style="color: hsl(120, 100%, 40%);">+--- a/debian/rules</span><br><span>++++ b/debian/rules</span><br><span> @@ -9,7 +9,7 @@ override_dh_shlibdeps:</span><br><span> dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info</span><br><span> </span><br><span> override_dh_auto_configure:</span><br><span style="color: hsl(0, 100%, 40%);">-- dh_auto_configure -- --with-uhd --with-usrp1 --with-lms --with-systemdsystemunitdir=/lib/systemd/system</span><br><span style="color: hsl(0, 100%, 40%);">-+ dh_auto_configure -- --with-uhd --with-usrp1 --with-systemdsystemunitdir=/lib/systemd/system</span><br><span style="color: hsl(120, 100%, 40%);">+- dh_auto_configure -- --with-uhd --with-usrp1 --with-lms --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals</span><br><span style="color: hsl(120, 100%, 40%);">++ dh_auto_configure -- --with-uhd --with-usrp1 --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals</span><br><span> </span><br><span> override_dh_strip:</span><br><span> dh_strip --dbg-package=osmo-trx-dbg</span><br><span>diff --git a/debian/rules b/debian/rules</span><br><span>index 68de706..627c0c8 100755</span><br><span>--- a/debian/rules</span><br><span>+++ b/debian/rules</span><br><span>@@ -9,7 +9,11 @@</span><br><span> dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info</span><br><span> </span><br><span> override_dh_auto_configure:</span><br><span style="color: hsl(0, 100%, 40%);">- dh_auto_configure -- --with-uhd --with-usrp1 --with-lms --with-systemdsystemunitdir=/lib/systemd/system</span><br><span style="color: hsl(120, 100%, 40%);">+ dh_auto_configure -- --with-uhd --with-usrp1 --with-lms --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals</span><br><span> </span><br><span> override_dh_strip:</span><br><span> dh_strip --dbg-package=osmo-trx-dbg</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 a1f3bfb..7bf1f58 100644</span><br><span>--- a/doc/manuals/Makefile.am</span><br><span>+++ b/doc/manuals/Makefile.am</span><br><span>@@ -12,5 +12,6 @@</span><br><span> VTY_REFERENCE = osmotrx-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-trx</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/14256">change 14256</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/14256"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-trx </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I34858a18a34fc467f274ac164697a242f4cf0df8 </div>
<div style="display:none"> Gerrit-Change-Number: 14256 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </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>