Daniel Holbach has proposed merging lp:~dholbach/ubuntu-packaging-guide/766880 into lp:ubuntu-packaging-guide.
Requested reviews: Ubuntu Packaging Guide Team (ubuntu-packaging-guide-team) Related bugs: Bug #766880 in Ubuntu Packaging Guide: "Ubuntu Packaging Guide for LUCID" https://bugs.launchpad.net/ubuntu-packaging-guide/+bug/766880 For more details, see: https://code.launchpad.net/~dholbach/ubuntu-packaging-guide/766880/+merge/58475 -- https://code.launchpad.net/~dholbach/ubuntu-packaging-guide/766880/+merge/58475 Your team Ubuntu Packaging Guide Team is requested to review the proposed merge of lp:~dholbach/ubuntu-packaging-guide/766880 into lp:ubuntu-packaging-guide.
=== modified file 'debian/control' --- debian/control 2011-04-19 09:08:45 +0000 +++ debian/control 2011-04-20 11:12:30 +0000 @@ -2,7 +2,7 @@ Priority: optional Section: doc Maintainer: Ubuntu Developers <[email protected]> -Build-Depends: debhelper (>= 7.0.50~), python-sphinx (>= 1.0~), doc-base, +Build-Depends: debhelper (>= 7.0.50~), python-sphinx, doc-base, lsb-release, texlive-latex-base, texlive-latex-recommended, texlive-latex-extra, texlive-fonts-recommended Standards-Version: 3.9.1 === added directory 'debian/natty' === added file 'debian/natty/ubuntu-packaging-guide.doc-base' --- debian/natty/ubuntu-packaging-guide.doc-base 1970-01-01 00:00:00 +0000 +++ debian/natty/ubuntu-packaging-guide.doc-base 2011-04-20 11:12:30 +0000 @@ -0,0 +1,11 @@ +Document: ubuntu-packaging-guide +Title: Ubuntu Packaging Guide +Author: Ubuntu Developers +Abstract: The Ubuntu Packaging Guide is a set of articles that should help + you to get involved with packaging and development of Ubuntu. It tries to + serve as a starting point with easy and simple to understand articles. +Section: Text + +Format: HTML +Index: /usr/share/doc/ubuntu-packaging-guide/html/index.html +Files: /usr/share/doc/ubuntu-packaging-guide/html/*.html === renamed file 'debian/ubuntu-packaging-guide.doc-base.single' => 'debian/natty/ubuntu-packaging-guide.doc-base.single' === added file 'debian/natty/ubuntu-packaging-guide.docs' --- debian/natty/ubuntu-packaging-guide.docs 1970-01-01 00:00:00 +0000 +++ debian/natty/ubuntu-packaging-guide.docs 2011-04-20 11:12:30 +0000 @@ -0,0 +1,4 @@ +_build/latex/*.pdf +_build/html +_build/epub +_build/singlehtml === added directory 'debian/old' === renamed file 'debian/ubuntu-packaging-guide.doc-base' => 'debian/old/ubuntu-packaging-guide.doc-base' === renamed file 'debian/ubuntu-packaging-guide.docs' => 'debian/old/ubuntu-packaging-guide.docs' --- debian/ubuntu-packaging-guide.docs 2010-11-19 12:02:45 +0000 +++ debian/old/ubuntu-packaging-guide.docs 2011-04-20 11:12:30 +0000 @@ -1,4 +1,2 @@ _build/latex/*.pdf _build/html -_build/epub -_build/singlehtml === modified file 'debian/rules' --- debian/rules 2010-11-19 12:02:45 +0000 +++ debian/rules 2011-04-20 11:12:30 +0000 @@ -2,8 +2,18 @@ %: dh $@ --builddirectory=_build +override_dh_clean: + dh_clean debian/ubuntu-packaging-guide.doc-base.single \ + debian/ubuntu-packaging-guide.docs \ + debian/ubuntu-packaging-guide.doc-base + override_dh_auto_build: make latexpdf make html - make singlehtml - make epub + if [ `lsb_release -cs` = 'natty' ]; then \ + make epub; \ + make singlehtml; \ + cp debian/natty/* debian/; \ + else \ + cp debian/old/* debian; \ + fi
_______________________________________________ Mailing list: https://launchpad.net/~ubuntu-packaging-guide-team Post to : [email protected] Unsubscribe : https://launchpad.net/~ubuntu-packaging-guide-team More help : https://help.launchpad.net/ListHelp
