Change in osmo-bts[master]: Revert "debian: create -doc subpackage with pdf manuals"

osmith gerrit-no-reply at lists.osmocom.org
Mon May 20 12:06:04 UTC 2019


osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/14097 )

Change subject: Revert "debian: create -doc subpackage with pdf manuals"
......................................................................

Revert "debian: create -doc subpackage with pdf manuals"

This reverts commit ad7b8bee71e78e5a046b65898e181b8c48be3974.

Unfortunately the osmo-gsm-manuals-dev package isn't working properly
yet, therefore osmo-bts fails to build on nightly OBS now. My apologies
for not testing enough in my own OBS namespace, before merging. I'll do
that in the future. I'm reverting the patch now, so osmo-bts isn't
missing from the nightly repository until I've fixed the
osmo-gsm-manuals package.

Change-Id: I89c2b92c8ae6331d6fff95a378fb58d82059af13
---
M debian/control
D debian/osmo-bts-doc.install
M debian/rules
M doc/manuals/Makefile.am
4 files changed, 2 insertions(+), 18 deletions(-)

Approvals:
  Jenkins Builder: Verified
  osmith: Looks good to me, approved



diff --git a/debian/control b/debian/control
index 2b66716..0377d9f 100644
--- a/debian/control
+++ b/debian/control
@@ -11,8 +11,7 @@
                libosmocore-dev,
                libosmo-abis-dev,
                libgps-dev,
-               txt2man,
-               osmo-gsm-manuals-dev
+               txt2man
 Standards-Version: 3.9.8
 Vcs-Browser: http://git.osmocom.org/osmo-bts/
 Vcs-Git: git://git.osmocom.org/osmo-bts
@@ -49,12 +48,3 @@
 Depends: osmo-bts-virtual (= ${binary:Version}), ${misc:Depends}
 Description: Debug symbols for the osmo-bts-virtual
  Make debugging possible
-
-Package: osmo-bts-doc
-Architecture: all
-Section: doc
-Priority: optional
-Depends: ${misc:Depends}
-Description: ${misc:Package} PDF documentation
- Various manuals: user manual, VTY reference manual and/or
- protocol/interface manuals.
diff --git a/debian/osmo-bts-doc.install b/debian/osmo-bts-doc.install
deleted file mode 100644
index 65aaaf7..0000000
--- a/debian/osmo-bts-doc.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/osmo-bts-doc/*.pdf
diff --git a/debian/rules b/debian/rules
index 94bed0e..27de11b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,7 @@
 	dh_strip --package=osmo-bts-trx --dbg-package=osmo-bts-trx-dbg
 
 override_dh_auto_configure:
-	dh_auto_configure --  --enable-trx --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals
+	dh_auto_configure --  --enable-trx --with-systemdsystemunitdir=/lib/systemd/system
 
 override_dh_clean:
 	dh_clean
@@ -26,7 +26,3 @@
 # Print test results in case of a failure
 override_dh_auto_test:
 	dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false)
-
-# Don't create .pdf.gz files (barely saves space and they can't be opened directly by most pdf readers)
-override_dh_compress:
-	dh_compress -X.pdf
diff --git a/doc/manuals/Makefile.am b/doc/manuals/Makefile.am
index 1d8125f..90fff57 100644
--- a/doc/manuals/Makefile.am
+++ b/doc/manuals/Makefile.am
@@ -20,6 +20,5 @@
   VTY_REFERENCE = osmobts-vty-reference.xml
   include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc
 
-  OSMO_REPOSITORY = osmo-bts
   include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc
 endif

-- 
To view, visit https://gerrit.osmocom.org/14097
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I89c2b92c8ae6331d6fff95a378fb58d82059af13
Gerrit-Change-Number: 14097
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: osmith <osmith at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190520/9eeb8a9a/attachment.html>


More information about the gerrit-log mailing list