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

Proposed by Elan Ruusamäe on 2011-11-05
Status: Needs review
Proposed branch: lp:~glen666/chromium-browser/head.daily
Merge into: lp:chromium-browser
Diff against target: 67 lines (+12/-2)
2 files modified
debian/changelog (+2/-2)
debian/rules (+10/-0)
To merge this branch: bzr merge lp:~glen666/chromium-browser/head.daily
Reviewer Review Type Date Requested Status
Micah Gersten 2011-11-05 Disapprove on 2011-11-06
Review via email: mp+81369@code.launchpad.net

Description of the change

here some fixes for creating tarballs:

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

To post a comment you must log in.
Micah Gersten (micahg) wrote :

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) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-10-20 22:51:47 +0000
3+++ debian/changelog 2011-11-05 18:25:26 +0000
4@@ -1,4 +1,4 @@
5-chromium-browser (15.0.870.0~svn20110903r99510-0ubuntu1) UNRELEASED; urgency=low
6+chromium-browser (17.0.930.0~svn20111105r108777-0ubuntu1) UNRELEASED; urgency=low
7
8 [ Fabien Tassin <fta@ubuntu.com> ]
9 * Disable NaCl until we figure out what to do with the private toolchain
10@@ -33,7 +33,7 @@
11 - update debian/rules
12 - update debian/cdbs/tarball.mk
13
14- -- Chris Coulson <chris.coulson@canonical.com> Thu, 20 Oct 2011 23:51:34 +0100
15+ -- Chris Coulson <chrisbot@chinstrap> Sat, 05 Nov 2011 06:00:08 +0000
16
17 chromium-browser (13.0.782.215~r97094-0ubuntu1) oneiric; urgency=high
18
19
20=== modified file 'debian/rules'
21--- debian/rules 2011-10-20 22:49:22 +0000
22+++ debian/rules 2011-11-05 18:25:26 +0000
23@@ -20,6 +20,7 @@
24 # Whitelist LP provided new langs only in release builds, PPAs ship them all
25 WANT_ONLY_WHITELISTED_NEW_LANGS ?= 0
26
27+WANT_XZ_SRC ?= 0
28 WANT_LZMA_SRC ?= 1
29 WANT_LZMA_DEBS ?= 1
30 WANT_DEBUG := 0
31@@ -153,6 +154,12 @@
32 GYP_DEFINES += werror=$(NULL)
33 endif
34
35+ifeq (1,$(WANT_XZ_SRC))
36+TAR_EXT := xz
37+TAR_FLAGS := --xz
38+COMPRESS := xz
39+DEB_TARBALL = $(wildcard *.tar.bz2 *.tar.$(TAR_EXT))
40+else
41 ifeq (1,$(WANT_LZMA_SRC))
42 TAR_EXT := lzma
43 TAR_FLAGS := --lzma
44@@ -163,6 +170,7 @@
45 TAR_FLAGS := -j
46 COMPRESS := bzip2
47 endif
48+endif
49
50 post-patches::
51 perl $(CURDIR)/debian/enable-dist-patches.pl $(DEBIAN_DIST_VERSION) $(CURDIR)/debian/patches/series
52@@ -710,6 +718,7 @@
53 endif
54 endif
55 gos-pack:
56+ifeq (1,$(WANT_LP_TRANSLATIONS))
57 ifneq (,$(findstring Ubuntu,$(DEBIAN_DIST)))
58 # Merge Translations from Launchpad
59 bzr export $(TMP_DIR)/translations-tools $(TRANSLATIONS_TOOLS_BRANCH)
60@@ -718,6 +727,7 @@
61 # Patches created:
62 @( cd $(TMP_DIR)/src ; find translations-patches -type f | xargs --verbose -n 1 diffstat -p 1 )
63 endif
64+endif
65 # Pack
66 if [ src != $(DEB_TAR_SRCDIR) ] ; then mv $(TMP_DIR)/src $(TMP_DIR)/$(DEB_TAR_SRCDIR) ; fi
67 mv $(TMP_DIR)/tools/depot_tools $(TMP_DIR)/$(DEB_TAR_SRCDIR)/depot_tools

Subscribers

People subscribed via source and target branches

to status/vote changes: