diff options
author | Oliver Smith <osmith@sysmocom.de> | 2019-05-20 13:47:28 +0200 |
---|---|---|
committer | Oliver Smith <osmith@sysmocom.de> | 2019-05-20 13:51:51 +0200 |
commit | 2f251843f95c412705745e5946a5bcf6b9888fd5 (patch) | |
tree | 998529f65a8984e91f11cac04b57746818e2851e | |
parent | ad7b8bee71e78e5a046b65898e181b8c48be3974 (diff) |
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
-rw-r--r-- | debian/control | 12 | ||||
-rw-r--r-- | debian/osmo-bts-doc.install | 1 | ||||
-rwxr-xr-x | debian/rules | 6 | ||||
-rw-r--r-- | doc/manuals/Makefile.am | 1 |
4 files changed, 2 insertions, 18 deletions
diff --git a/debian/control b/debian/control index 2b667164..0377d9fd 100644 --- a/debian/control +++ b/debian/control @@ -11,8 +11,7 @@ Build-Depends: debhelper (>= 9), 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 @@ Priority: extra 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 65aaaf7e..00000000 --- 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 94bed0ea..27de11b8 100755 --- a/debian/rules +++ b/debian/rules @@ -16,7 +16,7 @@ override_dh_strip: 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 @@ override_dh_clean: # 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 1d8125f1..90fff57e 100644 --- a/doc/manuals/Makefile.am +++ b/doc/manuals/Makefile.am @@ -20,6 +20,5 @@ if BUILD_MANUALS 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 |