<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/14097">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Revert "debian: create -doc subpackage with pdf manuals"<br><br>This reverts commit ad7b8bee71e78e5a046b65898e181b8c48be3974.<br><br>Unfortunately the osmo-gsm-manuals-dev package isn't working properly<br>yet, therefore osmo-bts fails to build on nightly OBS now. My apologies<br>for not testing enough in my own OBS namespace, before merging. I'll do<br>that in the future. I'm reverting the patch now, so osmo-bts isn't<br>missing from the nightly repository until I've fixed the<br>osmo-gsm-manuals package.<br><br>Change-Id: I89c2b92c8ae6331d6fff95a378fb58d82059af13<br>---<br>M debian/control<br>D debian/osmo-bts-doc.install<br>M debian/rules<br>M doc/manuals/Makefile.am<br>4 files changed, 2 insertions(+), 18 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/97/14097/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/debian/control b/debian/control</span><br><span>index 2b66716..0377d9f 100644</span><br><span>--- a/debian/control</span><br><span>+++ b/debian/control</span><br><span>@@ -11,8 +11,7 @@</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(0, 100%, 40%);">- osmo-gsm-manuals-dev</span><br><span style="color: hsl(120, 100%, 40%);">+ txt2man</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>@@ -49,12 +48,3 @@</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(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-Package: osmo-bts-doc</span><br><span style="color: hsl(0, 100%, 40%);">-Architecture: all</span><br><span style="color: hsl(0, 100%, 40%);">-Section: doc</span><br><span style="color: hsl(0, 100%, 40%);">-Priority: optional</span><br><span style="color: hsl(0, 100%, 40%);">-Depends: ${misc:Depends}</span><br><span style="color: hsl(0, 100%, 40%);">-Description: ${misc:Package} PDF documentation</span><br><span style="color: hsl(0, 100%, 40%);">- Various manuals: user manual, VTY reference manual and/or</span><br><span style="color: hsl(0, 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>deleted file mode 100644</span><br><span>index 65aaaf7..0000000</span><br><span>--- a/debian/osmo-bts-doc.install</span><br><span>+++ /dev/null</span><br><span>@@ -1 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-usr/share/doc/osmo-bts-doc/*.pdf</span><br><span>diff --git a/debian/rules b/debian/rules</span><br><span>index 94bed0e..27de11b 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 --enable-manuals</span><br><span style="color: hsl(120, 100%, 40%);">+ dh_auto_configure -- --enable-trx --with-systemdsystemunitdir=/lib/systemd/system</span><br><span> </span><br><span> override_dh_clean:</span><br><span> dh_clean</span><br><span>@@ -26,7 +26,3 @@</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(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 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(0, 100%, 40%);">-override_dh_compress:</span><br><span style="color: hsl(0, 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 1d8125f..90fff57 100644</span><br><span>--- a/doc/manuals/Makefile.am</span><br><span>+++ b/doc/manuals/Makefile.am</span><br><span>@@ -20,6 +20,5 @@</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(0, 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/14097">change 14097</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/14097"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I89c2b92c8ae6331d6fff95a378fb58d82059af13 </div>
<div style="display:none"> Gerrit-Change-Number: 14097 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>