Merge lp:~glen666/chromium-browser/head.daily into lp:chromium-browser

[Elan Ruusamäe]

here some fixes for creating tarballs:

- bugfix for disabling launchpad translations
- allow .xz source internally

[Micah Gersten (micahg)]

Thank you for your interest in Chromium.
We won't take the xz src fix until Lucid is EOL since xz-utils only became part of the minimal task in Maverick. Also, we want the translations in the source file, but not necessarily applied in the build. This is due to launchpad only liking a single original tarball per version. In the future, please propose merges based on lp:chromium-browser. Feel free to ask in #ubuntu-mozillateam on freenode IRC or reply here with any questions.

review: Disapprove

[Elan Ruusamäe (glen666)]

i used this code branch to make source tarballs after they were stopped for some period

the options that got added default to OFF, so they should be fine to merge? or you don't accept anything that is outside Ubuntu?

Unmerged revisions

876. By Elan Ruusamäe on 2011-11-05

- add WANT_XZ_SRC, make WANT_LP_TRANSLATIONS work properly

=== modified file 'debian/changelog'
--- debian/changelog	2011-10-20 22:51:47 +0000
+++ debian/changelog	2011-11-05 18:25:26 +0000
@@ -1,4 +1,4 @@
-chromium-browser (15.0.870.0~svn20110903r99510-0ubuntu1) UNRELEASED; urgency=low
+chromium-browser (17.0.930.0~svn20111105r108777-0ubuntu1) UNRELEASED; urgency=low
 
   [ Fabien Tassin <[e-mail]> ]
   * Disable NaCl until we figure out what to do with the private toolchain
@@ -33,7 +33,7 @@
     - update debian/rules
     - update debian/cdbs/tarball.mk
 
- -- Chris Coulson <[e-mail]>  Thu, 20 Oct 2011 23:51:34 +0100
+ -- Chris Coulson <chrisbot@chinstrap>  Sat, 05 Nov 2011 06:00:08 +0000
 
 chromium-browser (13.0.782.215~r97094-0ubuntu1) oneiric; urgency=high
 
 
=== modified file 'debian/rules'
--- debian/rules	2011-10-20 22:49:22 +0000
+++ debian/rules	2011-11-05 18:25:26 +0000
@@ -20,6 +20,7 @@
 # Whitelist LP provided new langs only in release builds, PPAs ship them all
 WANT_ONLY_WHITELISTED_NEW_LANGS ?= 0
 
+WANT_XZ_SRC      ?= 0
 WANT_LZMA_SRC    ?= 1
 WANT_LZMA_DEBS   ?= 1
 WANT_DEBUG       := 0
@@ -153,6 +154,12 @@
 GYP_DEFINES += werror=$(NULL)
 endif
 
+ifeq (1,$(WANT_XZ_SRC))
+TAR_EXT   := xz
+TAR_FLAGS := --xz
+COMPRESS  := xz
+DEB_TARBALL = $(wildcard *.tar.bz2 *.tar.$(TAR_EXT))
+else
 ifeq (1,$(WANT_LZMA_SRC))
 TAR_EXT   := lzma
 TAR_FLAGS := --lzma
@@ -163,6 +170,7 @@
 TAR_FLAGS := -j
 COMPRESS  := bzip2
 endif
+endif
 
 post-patches::
 	perl $(CURDIR)/debian/enable-dist-patches.pl $(DEBIAN_DIST_VERSION) $(CURDIR)/debian/patches/series
@@ -710,6 +718,7 @@
 endif
 endif
 gos-pack:
+ifeq (1,$(WANT_LP_TRANSLATIONS))
 ifneq (,$(findstring Ubuntu,$(DEBIAN_DIST)))
 	# Merge Translations from Launchpad
 	bzr export $(TMP_DIR)/translations-tools $(TRANSLATIONS_TOOLS_BRANCH)
@@ -718,6 +727,7 @@
 	# Patches created:
 	@( cd $(TMP_DIR)/src ; find translations-patches -type f | xargs --verbose -n 1 diffstat -p 1 )
 endif
+endif
 	# Pack
 	if [ src != $(DEB_TAR_SRCDIR) ] ; then mv $(TMP_DIR)/src $(TMP_DIR)/$(DEB_TAR_SRCDIR) ; fi
 	mv $(TMP_DIR)/tools/depot_tools $(TMP_DIR)/$(DEB_TAR_SRCDIR)/depot_tools