ubuntu-packaging-guide-team team mailing list archive

[Daniel Holbach <daniel.holbach@xxxxxxxxxx>]

Daniel Holbach has proposed merging lp:~dholbach/ubuntu-packaging-guide/split-out-packages into lp:ubuntu-packaging-guide.

Requested reviews:
  Ubuntu Packaging Guide Team (ubuntu-packaging-guide-team)

For more details, see:
https://code.launchpad.net/~dholbach/ubuntu-packaging-guide/split-out-packages/+merge/105357
-- 
https://code.launchpad.net/~dholbach/ubuntu-packaging-guide/split-out-packages/+merge/105357
Your team Ubuntu Packaging Guide Team is requested to review the proposed merge of lp:~dholbach/ubuntu-packaging-guide/split-out-packages into lp:ubuntu-packaging-guide.

=== modified file 'debian/control'
--- debian/control	2012-03-21 06:39:43 +0000
+++ debian/control	2012-05-10 17:19:38 +0000
@@ -8,11 +8,51 @@
 Standards-Version: 3.9.1
 
 Package: ubuntu-packaging-guide
-Depends: ${misc:Depends}
-Architecture: all
-Description: Ubuntu Packaging Guide
- The Ubuntu Packaging Guide is a set of articles that should help you to get
- involved with packaging and development of Ubuntu. It's not meant to replace
- other great documentation like the Debian New Maintainer's Guide or the 
- Debian policy, but serve as a starting point with easy and simple to 
- understand articles.
+Depends: ${misc:Depends}, ubuntu-packaging-guide-html
+Architecture: all
+Section: metapackages
+Description: Ubuntu Packaging Guide - metapackage
+ The Ubuntu Packaging Guide is a set of articles that should help you to get
+ involved with packaging and development of Ubuntu. It's not meant to replace
+ other great documentation like the Debian New Maintainer's Guide or the 
+ Debian policy, but serve as a starting point with easy and simple to 
+ understand articles.
+ .
+ This is a metapackage, depending only on 
+ ubuntu-packaging-guide-html.
+
+Package: ubuntu-packaging-guide-html
+Depends: ${misc:Depends}
+Architecture: all
+Description: Ubuntu Packaging Guide - HTML guide
+ The Ubuntu Packaging Guide is a set of articles that should help you to get
+ involved with packaging and development of Ubuntu. It's not meant to replace
+ other great documentation like the Debian New Maintainer's Guide or the 
+ Debian policy, but serve as a starting point with easy and simple to 
+ understand articles.
+ .
+ This package contains the HTML version of the guide.
+
+Package: ubuntu-packaging-guide-pdf
+Depends: ${misc:Depends}
+Architecture: all
+Description: Ubuntu Packaging Guide - PDF guide
+ The Ubuntu Packaging Guide is a set of articles that should help you to get
+ involved with packaging and development of Ubuntu. It's not meant to replace
+ other great documentation like the Debian New Maintainer's Guide or the 
+ Debian policy, but serve as a starting point with easy and simple to 
+ understand articles.
+ .
+ This package contains the PDF version of the guide.
+
+Package: ubuntu-packaging-guide-epub
+Depends: ${misc:Depends}
+Architecture: all
+Description: Ubuntu Packaging Guide - EPUB guide
+ The Ubuntu Packaging Guide is a set of articles that should help you to get
+ involved with packaging and development of Ubuntu. It's not meant to replace
+ other great documentation like the Debian New Maintainer's Guide or the 
+ Debian policy, but serve as a starting point with easy and simple to 
+ understand articles.
+ .
+ This package contains the EPUB version of the guide.

=== modified file 'debian/rules'
--- debian/rules	2012-03-19 22:26:27 +0000
+++ debian/rules	2012-05-10 17:19:38 +0000
@@ -13,13 +13,19 @@
 
 override_dh_link:
 	# symlink identical resources.
-	cd debian/ubuntu-packaging-guide && LC_ALL=C fdupes -r1nq \
-	usr/share/doc/ubuntu-packaging-guide/html | while read s; do \
-		set -- $$(echo $$s | tr ' ' '\n' | sort); \
-		f=$$1; shift; \
-		for d; do \
-			echo "symlinking identical file $$f to $$d"; \
-			rm $$f; ln -s /$$d $$f; \
+	for version in html epub pdf; do \
+		cd debian/ubuntu-packaging-guide-$$version && LC_ALL=C fdupes -r1nq \
+			usr/share/doc/ubuntu-packaging-guide-$$version/$$version | while read s; do \
+			set -- $$(echo $$s | tr ' ' '\n' | sort); \
+			f=$$1; shift; \
+			for d; do \
+				echo "symlinking identical file $$f to $$d"; \
+				rm $$f; ln -s /$$d $$f; \
+			done; \
 		done; \
+		cd -; \
 	done;
 	dh_link
+
+override_dh_install:
+	dh_install --list-missing

=== added file 'debian/ubuntu-packaging-guide-epub.docs'
--- debian/ubuntu-packaging-guide-epub.docs	1970-01-01 00:00:00 +0000
+++ debian/ubuntu-packaging-guide-epub.docs	2012-05-10 17:19:38 +0000
@@ -0,0 +1,1 @@
+_build/epub

=== renamed file 'debian/ubuntu-packaging-guide.doc-base' => 'debian/ubuntu-packaging-guide-html.doc-base'
--- debian/ubuntu-packaging-guide.doc-base	2012-03-16 17:05:12 +0000
+++ debian/ubuntu-packaging-guide-html.doc-base	2012-05-10 17:19:38 +0000
@@ -1,4 +1,4 @@
-Document: ubuntu-packaging-guide
+Document: ubuntu-packaging-guide-html
 Title: Ubuntu Packaging Guide
 Author: Ubuntu Developers 
 Abstract: The Ubuntu Packaging Guide is a set of articles that should help 
@@ -7,5 +7,5 @@
 Section: Text
 
 Format: HTML
-Index: /usr/share/doc/ubuntu-packaging-guide/html/index.html
-Files: /usr/share/doc/ubuntu-packaging-guide/html/*.html
+Index: /usr/share/doc/ubuntu-packaging-guide-html/html/index.html
+Files: /usr/share/doc/ubuntu-packaging-guide-html/html/*.html

=== renamed file 'debian/ubuntu-packaging-guide.doc-base.single' => 'debian/ubuntu-packaging-guide-html.doc-base.single'
--- debian/ubuntu-packaging-guide.doc-base.single	2012-03-20 16:21:33 +0000
+++ debian/ubuntu-packaging-guide-html.doc-base.single	2012-05-10 17:19:38 +0000
@@ -1,4 +1,4 @@
-Document: ubuntu-packaging-guide
+Document: ubuntu-packaging-guide-html
 Title: Ubuntu Packaging Guide
 Author: Ubuntu Developers 
 Abstract: The Ubuntu Packaging Guide is a set of articles that should help 
@@ -6,9 +6,6 @@
  serve as a starting point with easy and simple to understand articles.
 Section: Text
 
-Format: PDF
-Files: /usr/share/doc/ubuntu-packaging-guide/pdf/ubuntu-packaging-guide.pdf.gz
-
 Format: HTML
-Index: /usr/share/doc/ubuntu-packaging-guide/singlehtml/index.html
-Files: /usr/share/doc/ubuntu-packaging-guide/singlehtml/index.html
+Index: /usr/share/doc/ubuntu-packaging-guide-html/singlehtml/index.html
+Files: /usr/share/doc/ubuntu-packaging-guide-html/singlehtml/index.html

=== added file 'debian/ubuntu-packaging-guide-html.docs'
--- debian/ubuntu-packaging-guide-html.docs	1970-01-01 00:00:00 +0000
+++ debian/ubuntu-packaging-guide-html.docs	2012-05-10 17:19:38 +0000
@@ -0,0 +1,2 @@
+_build/html
+_build/singlehtml

=== added file 'debian/ubuntu-packaging-guide-pdf.doc-base'
--- debian/ubuntu-packaging-guide-pdf.doc-base	1970-01-01 00:00:00 +0000
+++ debian/ubuntu-packaging-guide-pdf.doc-base	2012-05-10 17:19:38 +0000
@@ -0,0 +1,10 @@
+Document: ubuntu-packaging-guide-pdf
+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: PDF
+Files: /usr/share/doc/ubuntu-packaging-guide-pdf/pdf/ubuntu-packaging-guide.pdf.gz

=== added file 'debian/ubuntu-packaging-guide-pdf.docs'
--- debian/ubuntu-packaging-guide-pdf.docs	1970-01-01 00:00:00 +0000
+++ debian/ubuntu-packaging-guide-pdf.docs	2012-05-10 17:19:38 +0000
@@ -0,0 +1,1 @@
+_build/pdf

=== removed file 'debian/ubuntu-packaging-guide.docs'
--- debian/ubuntu-packaging-guide.docs	2012-03-09 15:12:18 +0000
+++ debian/ubuntu-packaging-guide.docs	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-_build/pdf
-_build/html
-_build/epub
-_build/singlehtml