[SCM] live-manual branch, debian, updated. debian/2.0_a4-1-7-g39f40e0
Daniel Baumann
daniel at debian.org
Tue Sep 7 08:59:54 UTC 2010
The following commit has been merged in the debian branch:
commit 64cd28bce38ee456e4702467908d639fac3d5308
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Sep 7 10:40:37 2010 +0200
Reorganising packaging into output format specific packages.
diff --git a/Makefile b/Makefile
index 95abb61..df090d9 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ tidy:
done
build:
- # FIXME: sisu-concordance sisu-pg sisu-sqlite
+ @# FIXME: sisu-concordance sisu-pg sisu-sqlite
for LANGUAGE in $(LANGUAGES); \
do \
cd $(CURDIR)/manual/$${LANGUAGE}; \
@@ -67,18 +67,23 @@ commit: tidy test
@echo " * git push"
install:
+
for LANGUAGE in $(LANGUAGES); \
do \
- mkdir -p $(DESTDIR)/usr/share/doc/live-manual/$${LANGUAGE}/html; \
- cp manual/$${LANGUAGE}/build/$${LANGUAGE}/epub/live-manual.epub $(DESTDIR)/usr/share/doc/live-manual/$${LANGUAGE}; \
- cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/[0-9]*.html manual/$${LANGUAGE}/build/$${LANGUAGE}/index.html $(DESTDIR)/usr/share/doc/live-manual/$${LANGUAGE}/html; \
- cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/opendocument.odt $(DESTDIR)/usr/share/doc/live-manual/$${LANGUAGE}/live-manual.odt; \
- cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/doc.html $(DESTDIR)/usr/share/doc/live-manual/$${LANGUAGE}/live-manual.html; \
- cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/plain.txt $(DESTDIR)/usr/share/doc/live-manual/$${LANGUAGE}/live-manual.txt; \
- cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/landscape.a4.pdf $(DESTDIR)/usr/share/doc/live-manual/$${LANGUAGE}/live-manual.landscape-a4.pdf; \
- cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/portrait.a4.pdf $(DESTDIR)/usr/share/doc/live-manual/$${LANGUAGE}/live-manual.portrait-a4.pdf; \
- cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/landscape.letter.pdf $(DESTDIR)/usr/share/doc/live-manual/$${LANGUAGE}/live-manual.landscape-letter.pdf; \
- cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/portrait.letter.pdf $(DESTDIR)/usr/share/doc/live-manual/$${LANGUAGE}/live-manual.portrait-letter.pdf; \
+ mkdir -p $(DESTDIR)/usr/share/doc/live-manual/epub; \
+ cp manual/$${LANGUAGE}/build/$${LANGUAGE}/epub/live-manual.epub $(DESTDIR)/usr/share/doc/live-manual/epub/live-manual.$${LANGUAGE}.epub; \
+ mkdir -p $(DESTDIR)/usr/share/doc/live-manual/html/$${LANGUAGE}; \
+ cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/[0-9]*.html manual/$${LANGUAGE}/build/$${LANGUAGE}/index.html $(DESTDIR)/usr/share/doc/live-manual/html/$${LANGUAGE}; \
+ cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/doc.html $(DESTDIR)/usr/share/doc/live-manual/html/live-manual.$${LANGUAGE}.html; \
+ mkdir -p $(DESTDIR)/usr/share/doc/live-manual/odf; \
+ cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/opendocument.odt $(DESTDIR)/usr/share/doc/live-manual/odf/live-manual.$${LANGUAGE}.odt; \
+ mkdir -p $(DESTDIR)/usr/share/doc/live-manual/txt; \
+ cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/plain.txt $(DESTDIR)/usr/share/doc/live-manual/txt/live-manual.$${LANGUAGE}.txt; \
+ mkdir -p $(DESTDIR)/usr/share/doc/live-manual/pdf; \
+ cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/landscape.a4.pdf $(DESTDIR)/usr/share/doc/live-manual/pdf/live-manual.landscape-a4.$${LANGUAGE}.pdf; \
+ cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/portrait.a4.pdf $(DESTDIR)/usr/share/doc/live-manual/pdf/live-manual.portrait-a4.$${LANGUAGE}.pdf; \
+ cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/landscape.letter.pdf $(DESTDIR)/usr/share/doc/live-manual/pdf/live-manual.landscape-letter.$${LANGUAGE}.pdf; \
+ cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/portrait.letter.pdf $(DESTDIR)/usr/share/doc/live-manual/pdf/live-manual.portrait-letter.$${LANGUAGE}.pdf; \
done
uninstall:
diff --git a/debian/control b/debian/control
index f1212ab..6d2e330 100644
--- a/debian/control
+++ b/debian/control
@@ -12,9 +12,50 @@ Vcs-Git: git://live.debian.net/git/live-manual.git
Package: live-manual
Architecture: all
+Depends:
+ ${misc:Depends}, live-manual-epub, live-manual-html, live-manual-odf,
+ live-manual-pdf, live-manual-txt
+Description: Debian Live - Documentation (metapackage)
+ live-manual contains the documentation for the Debian Live project.
+ .
+ This package is a metapackage depending on all available output formats.
+
+Package: live-manual-epub
+Architecture: all
+Depends: ${misc:Depends}
+Description: Debian Live - Documentation (epub)
+ live-manual contains the documentation for the Debian Live project.
+ .
+ This package contains the epub output.
+
+Package: live-manual-html
+Architecture: all
+Depends: ${misc:Depends}
+Description: Debian Live - Documentation (html)
+ live-manual contains the documentation for the Debian Live project.
+ .
+ This package contains the html output.
+
+Package: live-manual-odf
+Architecture: all
+Depends: ${misc:Depends}
+Description: Debian Live - Documentation (odf)
+ live-manual contains the documentation for the Debian Live project.
+ .
+ This package contains the odf output.
+
+Package: live-manual-pdf
+Architecture: all
+Depends: ${misc:Depends}
+Description: Debian Live - Documentation (pdf)
+ live-manual contains the documentation for the Debian Live project.
+ .
+ This package contains the pdf output.
+
+Package: live-manual-txt
+Architecture: all
Depends: ${misc:Depends}
-Description: Debian Live manual
- This package contains the documentation for Debian Live project. It provides a
- broad overview of the tools and philosophy of Debian Live, as well as
- providing details on how live systems may be built and customised by end users
- and developers.
+Description: Debian Live - Documentation (txt)
+ live-manual contains the documentation for the Debian Live project.
+ .
+ This package contains the txt output.
diff --git a/debian/live-manual.bug-presubj b/debian/live-manual-epub.bug-presubj
similarity index 100%
copy from debian/live-manual.bug-presubj
copy to debian/live-manual-epub.bug-presubj
diff --git a/debian/live-manual.bug-presubj b/debian/live-manual-html.bug-presubj
similarity index 100%
copy from debian/live-manual.bug-presubj
copy to debian/live-manual-html.bug-presubj
diff --git a/debian/live-manual.bug-presubj b/debian/live-manual-odf.bug-presubj
similarity index 100%
copy from debian/live-manual.bug-presubj
copy to debian/live-manual-odf.bug-presubj
diff --git a/debian/live-manual.bug-presubj b/debian/live-manual-pdf.bug-presubj
similarity index 100%
copy from debian/live-manual.bug-presubj
copy to debian/live-manual-pdf.bug-presubj
diff --git a/debian/live-manual.bug-presubj b/debian/live-manual-txt.bug-presubj
similarity index 100%
copy from debian/live-manual.bug-presubj
copy to debian/live-manual-txt.bug-presubj
diff --git a/debian/rules b/debian/rules
index 000210b..638d0da 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,3 +2,29 @@
%:
dh ${@}
+
+override_dh_auto_install:
+ dh_auto_install
+
+ # live-manual-epub
+ mkdir -p debian/live-manual-epub/usr/share/doc/live-manual
+ mv debian/tmp/usr/share/doc/live-manual/epub debian/live-manual-epub/usr/share/doc/live-manual
+
+ # live-manual-html
+ mkdir -p debian/live-manual-html/usr/share/doc/live-manual
+ mv debian/tmp/usr/share/doc/live-manual/html debian/live-manual-html/usr/share/doc/live-manual
+
+ # live-manual-odf
+ mkdir -p debian/live-manual-odf/usr/share/doc/live-manual
+ mv debian/tmp/usr/share/doc/live-manual/odf debian/live-manual-odf/usr/share/doc/live-manual
+
+ # live-manual-pdf
+ mkdir -p debian/live-manual-pdf/usr/share/doc/live-manual
+ mv debian/tmp/usr/share/doc/live-manual/pdf debian/live-manual-pdf/usr/share/doc/live-manual
+
+ # live-manual-txt
+ mkdir -p debian/live-manual-txt/usr/share/doc/live-manual
+ mv debian/tmp/usr/share/doc/live-manual/txt debian/live-manual-txt/usr/share/doc/live-manual
+
+override_dh_compress:
+ dh_compress -X.html -X.odt
--
live-manual
More information about the debian-live-changes
mailing list