Merge lp:~vorlon/gnome-user-docs/ubuntu-jaunty into lp:~ubuntu-core-doc/gnome-user-docs/ubuntu-jaunty

[Steve Langasek]

[Steve Langasek (vorlon)]

uploading this to jaunty, so merging it into the official branch would be advantageous ;)

[Matthew East (mdke)]

Thanks Steve for this.

review: Approve

[lp:~vorlon/gnome-user-docs/ubuntu-jaunty]

742. By Matthew East on 2009-03-30

Merging from ~vorlon's branch, already uploaded to Ubuntu/Jaunty

=== modified file 'debian/changelog'
--- debian/changelog	2009-03-27 22:37:01 +0000
+++ debian/changelog	2009-03-30 12:50:42 +0000
@@ -1,3 +1,13 @@
+gnome-user-docs (2.26.0+svn20090323ubuntu2) jaunty; urgency=low
+
+  * Fix Vcs-Bzr field to point at the current branch
+  * debian/control*, debian/rules, debian/gnome-user-guide.install:
+    build per-language packages with a dependency on a common
+    gnome-user-guide package, letting language packs pull in the
+    appropriate languages and saving space on the CDs.
+
+ -- Steve Langasek <[e-mail]>  Mon, 30 Mar 2009 05:50:00 -0700
+
 gnome-user-docs (2.26.0+svn20090323ubuntu1) jaunty; urgency=low
 
   * Version 2.26.0 released
 
=== modified file 'debian/control'
--- debian/control	2008-03-17 07:57:48 +0000
+++ debian/control	2009-03-30 12:45:35 +0000
@@ -6,14 +6,14 @@
 Standards-Version: 3.7.3
 Pre-Depends: dpkg (>= 1.10.24)
 Build-Depends: debhelper (>= 5),
-               cdbs,
-               fdupes
+               cdbs
 Build-Depends-Indep: scrollkeeper,
                      gnome-doc-utils,
                      pkg-config,
                      gnome-common,
-                     automake1.10
-XS-Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-doc/gnome-user-docs/ubuntu-hardy
+                     automake1.10,
+                     iso-codes
+Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-doc/gnome-user-docs/ubuntu-jaunty
 
 Package: gnome-user-guide
 Architecture: all
@@ -26,3 +26,311 @@
 Description: GNOME user's guide
  Documentation for using the GNOME 2 desktop environment and its components. 
  It covers usage and setup of the core GNOME 2 programs.
+
+Package: gnome-user-guide-ar
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-guide (= ${source:Version}),
+         scrollkeeper,
+         yelp
+Conflicts: gnome-intro
+Replaces: gnome2-user-guide
+Description: GNOME user's guide (Arabic)
+ Documentation for using the GNOME 2 desktop environment and its components.
+ It covers usage and setup of the core GNOME 2 programs.
+ .
+ This package includes translated documentation for Arabic.
+
+Package: gnome-user-guide-bg
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-guide (= ${source:Version}),
+         scrollkeeper,
+         yelp
+Conflicts: gnome-intro
+Replaces: gnome2-user-guide
+Description: GNOME user's guide (Bulgarian)
+ Documentation for using the GNOME 2 desktop environment and its components.
+ It covers usage and setup of the core GNOME 2 programs.
+ .
+ This package includes translated documentation for Bulgarian.
+
+Package: gnome-user-guide-ca
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-guide (= ${source:Version}),
+         scrollkeeper,
+         yelp
+Conflicts: gnome-intro
+Replaces: gnome2-user-guide
+Description: GNOME user's guide (Catalan)
+ Documentation for using the GNOME 2 desktop environment and its components.
+ It covers usage and setup of the core GNOME 2 programs.
+ .
+ This package includes translated documentation for Catalan.
+
+Package: gnome-user-guide-cs
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-guide (= ${source:Version}),
+         scrollkeeper,
+         yelp
+Conflicts: gnome-intro
+Replaces: gnome2-user-guide
+Description: GNOME user's guide (Czech)
+ Documentation for using the GNOME 2 desktop environment and its components.
+ It covers usage and setup of the core GNOME 2 programs.
+ .
+ This package includes translated documentation for Czech.
+
+Package: gnome-user-guide-de
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-guide (= ${source:Version}),
+         scrollkeeper,
+         yelp
+Conflicts: gnome-intro
+Replaces: gnome2-user-guide
+Description: GNOME user's guide (German)
+ Documentation for using the GNOME 2 desktop environment and its components.
+ It covers usage and setup of the core GNOME 2 programs.
+ .
+ This package includes translated documentation for German.
+
+Package: gnome-user-guide-el
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-guide (= ${source:Version}),
+         scrollkeeper,
+         yelp
+Conflicts: gnome-intro
+Replaces: gnome2-user-guide
+Description: GNOME user's guide (Greek, Modern (1453-))
+ Documentation for using the GNOME 2 desktop environment and its components.
+ It covers usage and setup of the core GNOME 2 programs.
+ .
+ This package includes translated documentation for Greek, Modern (1453-).
+
+Package: gnome-user-guide-en
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-guide (= ${source:Version}),
+         scrollkeeper,
+         yelp
+Conflicts: gnome-intro
+Replaces: gnome2-user-guide
+Description: GNOME user's guide (English)
+ Documentation for using the GNOME 2 desktop environment and its components.
+ It covers usage and setup of the core GNOME 2 programs.
+ .
+ This package includes translated documentation for English.
+
+Package: gnome-user-guide-es
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-guide (= ${source:Version}),
+         scrollkeeper,
+         yelp
+Conflicts: gnome-intro
+Replaces: gnome2-user-guide
+Description: GNOME user's guide (Spanish)
+ Documentation for using the GNOME 2 desktop environment and its components.
+ It covers usage and setup of the core GNOME 2 programs.
+ .
+ This package includes translated documentation for Spanish.
+
+Package: gnome-user-guide-eu
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-guide (= ${source:Version}),
+         scrollkeeper,
+         yelp
+Conflicts: gnome-intro
+Replaces: gnome2-user-guide
+Description: GNOME user's guide (Basque)
+ Documentation for using the GNOME 2 desktop environment and its components.
+ It covers usage and setup of the core GNOME 2 programs.
+ .
+ This package includes translated documentation for Basque.
+
+Package: gnome-user-guide-fi
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-guide (= ${source:Version}),
+         scrollkeeper,
+         yelp
+Conflicts: gnome-intro
+Replaces: gnome2-user-guide
+Description: GNOME user's guide (Finnish)
+ Documentation for using the GNOME 2 desktop environment and its components.
+ It covers usage and setup of the core GNOME 2 programs.
+ .
+ This package includes translated documentation for Finnish.
+
+Package: gnome-user-guide-fr
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-guide (= ${source:Version}),
+         scrollkeeper,
+         yelp
+Conflicts: gnome-intro
+Replaces: gnome2-user-guide
+Description: GNOME user's guide (French)
+ Documentation for using the GNOME 2 desktop environment and its components.
+ It covers usage and setup of the core GNOME 2 programs.
+ .
+ This package includes translated documentation for French.
+
+Package: gnome-user-guide-hu
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-guide (= ${source:Version}),
+         scrollkeeper,
+         yelp
+Conflicts: gnome-intro
+Replaces: gnome2-user-guide
+Description: GNOME user's guide (Hungarian)
+ Documentation for using the GNOME 2 desktop environment and its components.
+ It covers usage and setup of the core GNOME 2 programs.
+ .
+ This package includes translated documentation for Hungarian.
+
+Package: gnome-user-guide-it
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-guide (= ${source:Version}),
+         scrollkeeper,
+         yelp
+Conflicts: gnome-intro
+Replaces: gnome2-user-guide
+Description: GNOME user's guide (Italian)
+ Documentation for using the GNOME 2 desktop environment and its components.
+ It covers usage and setup of the core GNOME 2 programs.
+ .
+ This package includes translated documentation for Italian.
+
+Package: gnome-user-guide-ja
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-guide (= ${source:Version}),
+         scrollkeeper,
+         yelp
+Conflicts: gnome-intro
+Replaces: gnome2-user-guide
+Description: GNOME user's guide (Japanese)
+ Documentation for using the GNOME 2 desktop environment and its components.
+ It covers usage and setup of the core GNOME 2 programs.
+ .
+ This package includes translated documentation for Japanese.
+
+Package: gnome-user-guide-ko
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-guide (= ${source:Version}),
+         scrollkeeper,
+         yelp
+Conflicts: gnome-intro
+Replaces: gnome2-user-guide
+Description: GNOME user's guide (Korean)
+ Documentation for using the GNOME 2 desktop environment and its components.
+ It covers usage and setup of the core GNOME 2 programs.
+ .
+ This package includes translated documentation for Korean.
+
+Package: gnome-user-guide-oc
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-guide (= ${source:Version}),
+         scrollkeeper,
+         yelp
+Conflicts: gnome-intro
+Replaces: gnome2-user-guide
+Description: GNOME user's guide (Occitan (post 1500))
+ Documentation for using the GNOME 2 desktop environment and its components.
+ It covers usage and setup of the core GNOME 2 programs.
+ .
+ This package includes translated documentation for Occitan (post 1500).
+
+Package: gnome-user-guide-pa
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-guide (= ${source:Version}),
+         scrollkeeper,
+         yelp
+Conflicts: gnome-intro
+Replaces: gnome2-user-guide
+Description: GNOME user's guide (Panjabi)
+ Documentation for using the GNOME 2 desktop environment and its components.
+ It covers usage and setup of the core GNOME 2 programs.
+ .
+ This package includes translated documentation for Panjabi.
+
+Package: gnome-user-guide-pt
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-guide (= ${source:Version}),
+         scrollkeeper,
+         yelp
+Conflicts: gnome-intro
+Replaces: gnome2-user-guide
+Description: GNOME user's guide (Portuguese)
+ Documentation for using the GNOME 2 desktop environment and its components.
+ It covers usage and setup of the core GNOME 2 programs.
+ .
+ This package includes translated documentation for Portuguese.
+
+Package: gnome-user-guide-ru
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-guide (= ${source:Version}),
+         scrollkeeper,
+         yelp
+Conflicts: gnome-intro
+Replaces: gnome2-user-guide
+Description: GNOME user's guide (Russian)
+ Documentation for using the GNOME 2 desktop environment and its components.
+ It covers usage and setup of the core GNOME 2 programs.
+ .
+ This package includes translated documentation for Russian.
+
+Package: gnome-user-guide-sv
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-guide (= ${source:Version}),
+         scrollkeeper,
+         yelp
+Conflicts: gnome-intro
+Replaces: gnome2-user-guide
+Description: GNOME user's guide (Swedish)
+ Documentation for using the GNOME 2 desktop environment and its components.
+ It covers usage and setup of the core GNOME 2 programs.
+ .
+ This package includes translated documentation for Swedish.
+
+Package: gnome-user-guide-th
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-guide (= ${source:Version}),
+         scrollkeeper,
+         yelp
+Conflicts: gnome-intro
+Replaces: gnome2-user-guide
+Description: GNOME user's guide (Thai)
+ Documentation for using the GNOME 2 desktop environment and its components.
+ It covers usage and setup of the core GNOME 2 programs.
+ .
+ This package includes translated documentation for Thai.
+
+Package: gnome-user-guide-zh
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-guide (= ${source:Version}),
+         scrollkeeper,
+         yelp
+Conflicts: gnome-intro
+Replaces: gnome2-user-guide
+Description: GNOME user's guide (Chinese)
+ Documentation for using the GNOME 2 desktop environment and its components.
+ It covers usage and setup of the core GNOME 2 programs.
+ .
+ This package includes translated documentation for Chinese.
 
=== added file 'debian/control.in'
--- debian/control.in	1970-01-01 00:00:00 +0000
+++ debian/control.in	2009-03-30 12:45:35 +0000
@@ -0,0 +1,28 @@
+Source: gnome-user-docs
+Section: gnome
+Priority: optional
+Maintainer: Ubuntu Desktop Team <[e-mail]>
+XSBC-Original-Maintainer: Jose Carlos Garcia Sogo <[e-mail]>
+Standards-Version: 3.7.3
+Pre-Depends: dpkg (>= 1.10.24)
+Build-Depends: debhelper (>= 5),
+               cdbs
+Build-Depends-Indep: scrollkeeper,
+                     gnome-doc-utils,
+                     pkg-config,
+                     gnome-common,
+                     automake1.10,
+                     iso-codes
+Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-doc/gnome-user-docs/ubuntu-jaunty
+
+Package: gnome-user-guide
+Architecture: all
+Depends: ${misc:Depends},
+         scrollkeeper,
+         yelp
+Provides: gnome2-user-guide
+Conflicts: gnome-intro
+Replaces: gnome2-user-guide
+Description: GNOME user's guide
+ Documentation for using the GNOME 2 desktop environment and its components. 
+ It covers usage and setup of the core GNOME 2 programs.
 
=== added file 'debian/control.lang'
--- debian/control.lang	1970-01-01 00:00:00 +0000
+++ debian/control.lang	2009-03-30 11:32:11 +0000
@@ -0,0 +1,14 @@
+
+Package: gnome-user-guide-${ll}
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-user-guide (= ${source:Version}),
+         scrollkeeper,
+         yelp
+Conflicts: gnome-intro
+Replaces: gnome2-user-guide
+Description: GNOME user's guide (${lang})
+ Documentation for using the GNOME 2 desktop environment and its components.
+ It covers usage and setup of the core GNOME 2 programs.
+ .
+ This package includes translated documentation for ${lang}.
 
=== added file 'debian/gnome-user-guide.install'
--- debian/gnome-user-guide.install	1970-01-01 00:00:00 +0000
+++ debian/gnome-user-guide.install	2009-03-30 12:43:01 +0000
@@ -0,0 +1,1 @@
+/usr/share/gnome/help/*/C
 
=== modified file 'debian/rules'
--- debian/rules	2008-09-25 08:09:34 +0000
+++ debian/rules	2009-03-30 12:37:33 +0000
@@ -6,6 +6,7 @@
 
 DEB_DH_BUILDDEB_ARGS := -- -Zbzip2
 DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper
+DEB_DH_INSTALL_SOURCEDIR = debian/tmp
 
 makebuilddir/gnome-user-guide::
 	@gnome-autogen.sh --prefix=/usr --disable-scrollkeeper
@@ -20,14 +21,27 @@
 	@echo "Version should start with: `grep AC_INIT configure.in | cut -d'[' -f3 | cut -d']' -f1`+svn`head -n1 ChangeLog | cut -d' ' -f1 | sed s'/\-//g'` (add 'ubuntu<n>' as necessary)"
 	@echo "---"
 	rm -f debian/gnome-user-guide.links
+	rm -f debian/gnome-user-guide-*.install
 
 binary-post-install/gnome-user-guide::
 	rm -rf debian/gnome-user-guide/var/lib/scrollkeeper
 
-binary-fixup/gnome-user-guide::
-	unset LANG LC_ALL; cd debian/gnome-user-guide && fdupes -r1nq usr | while read s; do \
-	  set -- $$(echo $$s | tr ' ' '\n' | sort); \
-	  f=$$1; shift; \
-	  for d; do echo $$f $$d; done; \
-	done > $(CURDIR)/debian/gnome-user-guide.links
-	dh_link -pgnome-user-guide
+# This rule will fail if one language code is a prefix of another!
+# But we can't just add a match for ${lang}_*, because dh_install will
+# fail if there are no matches.
+common-install-indep::
+	for lang in $$(for ll in $$(sed -n -e's/^DOC_LINGUAS[[:space:]]*=[[:space:]]*//p' gnome2-*-guide/Makefile.am); \
+	               do echo $$ll; done | sed -e's/_.*//' | sort -u); \
+	do \
+		echo /usr/share/gnome/help/'*'/$${lang}* > debian/gnome-user-guide-$${lang}.install; \
+	done
+
+debian/control::
+	(cat debian/control.in; \
+	for lang in $$(for ll in $$(sed -n -e's/^DOC_LINGUAS[[:space:]]*=[[:space:]]*//p' gnome2-*-guide/Makefile.am); \
+	               do echo $$ll; done | sed -e's/_.*//' | sort -u); \
+	do \
+		name=$$(sed -n -e"/^#/d; s/;.*//; /\([[:space:]]\|^\)$$lang[[:space:]]/p" /usr/share/iso-codes/iso_639.tab |cut -f4-); \
+		sed -e"s/\$${ll}/$$lang/; s/\$${lang}/$$name/;" debian/control.lang; \
+	done) > debian/control.new
+	mv debian/control.new debian/control