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/105372
-- 
https://code.launchpad.net/~dholbach/ubuntu-packaging-guide/split-out-packages/+merge/105372
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/rules'
--- debian/rules	2012-05-10 17:20:03 +0000
+++ debian/rules	2012-05-10 18:44:25 +0000
@@ -14,16 +14,21 @@
 override_dh_link:
 	# symlink identical resources.
 	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; \
+		if [ "$$version" = "html" ]; then subversion="html singlehtml"; \
+		else subversion=$$version; \
+		fi; \
+		for sv in $$subversion; do \
+			cd debian/ubuntu-packaging-guide-$$version && LC_ALL=C fdupes -r1nq \
+				usr/share/doc/ubuntu-packaging-guide-$$version/$$sv | 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; \
-		cd -; \
 	done;
 	# use system copies of jquery and underscore instead.
 	for filename in `find $$DEBIANDIR -wholename '*/_static/jquery.js'`; do \