summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2016-05-25 08:32:01 +0200
committerDavid Kalnischkies <david@kalnischkies.de>2016-05-25 08:32:01 +0200
commitcb6020cdfea3d6dec6f6ad13843ab46f0c10d562 (patch)
tree9b0b97b92da633cacca0964718d48cb5ffae8482 /debian
parenta97127c3d019ee073c078dbb652a12386f58515b (diff)
use *.docs files instead of hardcoding in debian/rules
Git-Dch: Ignore
Diffstat (limited to 'debian')
-rw-r--r--debian/apt-doc.docs2
-rw-r--r--debian/apt-transport-https.docs1
-rw-r--r--debian/apt.examples1
-rw-r--r--debian/libapt-pkg-doc.docs7
-rwxr-xr-xdebian/rules21
5 files changed, 17 insertions, 15 deletions
diff --git a/debian/apt-doc.docs b/debian/apt-doc.docs
index d59100e8d..6ef985371 100644
--- a/debian/apt-doc.docs
+++ b/debian/apt-doc.docs
@@ -1,3 +1,5 @@
+build/docs/guide*
+build/docs/offline*
README.progress-reporting
doc/external-dependency-solver-protocol.txt
doc/acquire-additional-files.txt
diff --git a/debian/apt-transport-https.docs b/debian/apt-transport-https.docs
new file mode 100644
index 000000000..906c1db69
--- /dev/null
+++ b/debian/apt-transport-https.docs
@@ -0,0 +1 @@
+debian/apt-transport-https.README
diff --git a/debian/apt.examples b/debian/apt.examples
index e69de29bb..622ef80b1 100644
--- a/debian/apt.examples
+++ b/debian/apt.examples
@@ -0,0 +1 @@
+build/docs/examples/*
diff --git a/debian/libapt-pkg-doc.docs b/debian/libapt-pkg-doc.docs
new file mode 100644
index 000000000..1ad92a8bb
--- /dev/null
+++ b/debian/libapt-pkg-doc.docs
@@ -0,0 +1,7 @@
+build/docs/design*
+build/docs/dpkg-tech*
+build/docs/files*
+build/docs/method*
+doc/libapt-pkg2_to_3.txt
+doc/style.txt
+build/doc/doxygen/html
diff --git a/debian/rules b/debian/rules
index bdc539fef..cbe7e70b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -133,13 +133,7 @@ libapt-pkg-doc: build-docbook
# libapt-pkg-doc install
#
rm -f $(BLD)/doc/doxygen/html/*.map $(BLD)/doc/doxygen/html/*.md5
- dh_installdocs -p$@ $(BLD)/docs/design* \
- $(BLD)/docs/dpkg-tech* \
- $(BLD)/docs/files* \
- $(BLD)/docs/method* \
- doc/libapt-pkg2_to_3.txt \
- doc/style.txt \
- $(BLD)/doc/doxygen/html
+ dh_installdocs -p$@
dh_installexamples -p$@
dh_lintian -p$@
dh_installchangelogs -p$@
@@ -159,10 +153,7 @@ apt-doc: build-docbook
# apt-doc install
#
# Copy the guides
- dh_installdocs -p$@ $(BLD)/docs/guide*.text \
- $(BLD)/docs/guide*.html \
- $(BLD)/docs/offline*.text \
- $(BLD)/docs/offline*.html
+ dh_installdocs -p$@
dh_installchangelogs -p$@
dh_compress -p$@
dh_fixperms -p$@
@@ -214,7 +205,7 @@ apt: build-binary build-manpages debian/apt.install
dh_bugfiles -p$@
dh_lintian -p$@
- dh_installexamples -p$@ $(BLD)/docs/examples/*
+ dh_installexamples -p$@
dh_installman -p$@ $(wildcard $(patsubst %,doc/en/%.[158],$(apt_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt_MANPAGES)))
dh_installcron -p$@ --name=apt-compat
dh_systemd_enable -p$@ apt-daily.timer
@@ -314,7 +305,7 @@ $(LIBAPT_INST): build-binary debian/$(LIBAPT_INST).install
dh_fixperms -p$@
dh_makeshlibs -p$@
dh_installdeb -p$@
- dh_shlibdeps -p$@
+ dh_shlibdeps -p$@
dh_gencontrol -p$@
dh_md5sums -p$@
dh_builddeb -p$@
@@ -326,7 +317,7 @@ apt-transport-https: build-binary libapt-pkg-dev
dh_installdirs -p$@
dh_install -p$@ --sourcedir=$(BLD)
- dh_installdocs -p$@ debian/apt-transport-https.README
+ dh_installdocs -p$@
dh_installexamples -p$@
# Install the man pages..
@@ -337,7 +328,7 @@ apt-transport-https: build-binary libapt-pkg-dev
dh_compress -p$@
dh_fixperms -p$@
dh_installdeb -p$@
- dh_shlibdeps -p$@
+ dh_shlibdeps -p$@
dh_gencontrol -p$@
dh_md5sums -p$@
dh_builddeb -p$@