mozilla-devscripts

Merge lp:~bdrung/mozilla-devscripts/lintian into lp:~mozillateam/mozilla-devscripts/mozilla-devscripts

  1. lintian
  2. Merge into mozilla-devscripts
Proposed by Alexander Sack
Status: Merged
Merged at revision: not available
Proposed branch: lp:~bdrung/mozilla-devscripts/lintian
Merge into: lp:~mozillateam/mozilla-devscripts/mozilla-devscripts
Diff against target: None lines
To merge this branch: bzr merge lp:~bdrung/mozilla-devscripts/lintian
Reviewer Review Type Date Requested Status
Mozilla Team Pending
Review via email: mp+9978@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alexander Sack (asac) wrote :

request a merge on behalf of benjamin

lp:~bdrung/mozilla-devscripts/lintian updated
232. By Benjamin Drung

  - fix Vcs-Bzr-Browser field to Vcs-Browser
    - update debian/control

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 2009-08-11 12:01:48 +0000
3+++ debian/changelog 2009-08-11 15:34:02 +0000
4@@ -1,3 +1,21 @@
5+mozilla-devscripts (0.15) UNRELEASED; urgency=low
6+
7+ * packaging:
8+ - break and sort Depends and Suggests
9+ - update debian/control
10+ - add ${misc:Depends} to Depends
11+ - update debian/control
12+ - wrap too long lines
13+ - update debian/changelog
14+ * build-system:
15+ - make minefield-packager.mk executable
16+ - update src/Makefile
17+ * lp-locale-export.mk:
18+ - remove shebang
19+ - update src/lp-locale-export.mk
20+
21+ -- Benjamin Drung <bdrung@ubuntu.com> Tue, 11 Aug 2009 17:27:50 +0200
22+
23 mozilla-devscripts (0.14) unstable; urgency=low
24
25 [ Alexander Sack <asac@ubuntu.com> ]
26@@ -34,11 +52,11 @@
27 - fix LP: #411191 - webfav lp-locale-export.mk yields en-US.xpi with
28 .manifest files only - fix parsing bug for jar: protocol lines
29 * packaging:
30- - fix Vcs-Bzr: to point to a proper R/W location and use Vcs-Bzr-Browser for the
31- browsable read-only location
32+ - fix Vcs-Bzr: to point to a proper R/W location and use Vcs-Bzr-Browser for
33+ the browsable read-only location
34 - update debian/control
35- - add Benjamin Drung <bdrung@ubuntu.com> to Uploaders and also add my @ubuntu.com
36- address work-time uploads won't count as NMU
37+ - add Benjamin Drung <bdrung@ubuntu.com> to Uploaders and also add my
38+ @ubuntu.com address work-time uploads won't count as NMU
39 - update debian/control
40
41 [ Benjamin Drung <bdrung@ubuntu.com> ]
42@@ -116,7 +134,8 @@
43 - don't run MOZCLIENT_EXCLUDE_SCRIPT if does not exist as it creates
44 false positives
45 - update src/mozclient/lib/MozClient/VCS.pm
46- - drop $(EXT), left-over from when mozclient.pl was substed and use -c instead
47+ - drop $(EXT), left-over from when mozclient.pl was substed and use -c
48+ instead
49 - update src/mozclient.mk.in
50 - add support for git
51 - add src/mozclient/lib/MozClient/Git.pm
52@@ -140,7 +159,8 @@
53 for extensions built with xulapp.mk
54 - update src/xpi.mk
55 * [ xulapp ]
56- - allow caller to specify the xulrunner version by pre-setting DEBIAN_XUL_VER
57+ - allow caller to specify the xulrunner version by pre-setting
58+ DEBIAN_XUL_VER
59 - update src/xulapp.mk.in
60 - add confdefs.h and a.out to the clean rule
61 - update src/xulapp.mk.in
62@@ -238,9 +258,9 @@
63
64 [ Alexander Sack ]
65 * add .NOTPARALLEL target to make mozclient.mk more reliable in parallel
66- make runs. We don't want parallel execution within the scope of mozclient.mk.
67- Maybe noteworthy that this doesn't prevent clients to invoke get-orig-source
68- with distinct parameters in parallel.
69+ make runs. We don't want parallel execution within the scope of
70+ mozclient.mk. Maybe noteworthy that this doesn't prevent clients to
71+ invoke get-orig-source with distinct parameters in parallel.
72 - update src/mozclient.mk.in
73
74 [ Fabien Tassin ]
75@@ -272,7 +292,7 @@
76 - add src/xulrunner-1.9.1.mk.in
77 - add src/xulrunner-2.0.mk.in
78 - update src/Makefile
79- + add a variable called DEBIAN_KEEP_VCS to preserve the VCS files such as
80+ + add a variable called DEBIAN_KEEP_VCS to preserve the VCS files such as
81 */CVS or .hg
82 - update src/mozclient.mk.in
83 - update README
84@@ -309,8 +329,8 @@
85 [ Alexander Sack ]
86 * [ xpi ]:
87 + introduce support to extract xpi translations from any build tree that
88- ships chrome.manifest indexed xul/xpi translations. This feature is ment to
89- be hooked into install phase of then package build. cdbs users can just
90+ ships chrome.manifest indexed xul/xpi translations. This feature is ment
91+ to be hooked into install phase of then package build. cdbs users can just
92 include this helper as we ship the appropriate cdbs hooks.
93 - add src/lp-locale-export.mk
94 * [ lp-locale-export ]:
95@@ -384,8 +404,8 @@
96 - update debian/control
97 * add unzip (needed by xpi.mk) to Depends: of mozilla-devscript binary package
98 - update debian/control
99- * introduce MOZ_XPI_MOZILLA_DIRS in xpi.mk with default values: "firefox-addons
100- firefox"
101+ * introduce MOZ_XPI_MOZILLA_DIRS in xpi.mk with default values:
102+ "firefox-addons firefox"
103 - update src/xpi.mk
104 * document xpi.mk in README
105 - update README
106
107=== modified file 'debian/control'
108--- debian/control 2009-08-11 12:01:14 +0000
109+++ debian/control 2009-08-11 14:41:14 +0000
110@@ -3,9 +3,9 @@
111 Priority: optional
112 Maintainer: Ubuntu Mozilla Team <ubuntu-mozillateam@lists.ubuntu.com>
113 Uploaders: Fabien Tassin <fta@ubuntu.com>,
114- Alexander Sack <asac@debian.org>,
115- Alexander Sack <asac@ubuntu.com>,
116- Benjamin Drung <bdrung@ubuntu.com>
117+ Alexander Sack <asac@debian.org>,
118+ Alexander Sack <asac@ubuntu.com>,
119+ Benjamin Drung <bdrung@ubuntu.com>
120 Build-Depends: debhelper (>= 5), cdbs
121 Standards-Version: 3.8.2
122 Vcs-Bzr: lp:mozilla-devscripts
123@@ -13,8 +13,18 @@
124
125 Package: mozilla-devscripts
126 Architecture: all
127-Depends: wget, quilt, libxml-xpath-perl, zip, unzip, dpkg-dev, fakeroot, python
128-Suggests: cvs, mercurial, git-core
129+Depends: dpkg-dev,
130+ fakeroot,
131+ libxml-xpath-perl,
132+ python,
133+ quilt,
134+ unzip,
135+ wget,
136+ zip,
137+ ${misc:Depends}
138+Suggests: cvs,
139+ git-core,
140+ mercurial
141 Description: Collection of dev scripts used by Ubuntu Mozilla packages
142 This package contains mozilla-devscripts, a collection of scripts
143 based on Makefile inheritance which provides targets usable by Mozilla
144
145=== modified file 'src/Makefile'
146--- src/Makefile 2009-08-03 23:37:38 +0000
147+++ src/Makefile 2009-08-11 15:24:15 +0000
148@@ -83,6 +83,7 @@
149 install -m 644 `echo $$dir/*` $(DESTDIR)$(DATADIR)/$$dir ; \
150 done
151 find $(DESTDIR)$(DATADIR) -type f \( -name \*.pl -o -name \*.sh \) -exec chmod -v 755 {} \;
152+ chmod 755 $(DESTDIR)$(DATADIR)/minefield-packager.mk
153
154 clean:
155 rm -f $(subst_files)
156
157=== modified file 'src/lp-locale-export.mk'
158--- src/lp-locale-export.mk 2009-08-09 22:57:56 +0000
159+++ src/lp-locale-export.mk 2009-08-11 15:34:02 +0000
160@@ -1,4 +1,3 @@
161-#!/usr/bin/make -f
162 # -*- mode: makefile; coding: utf-8 -*-
163
164 # Copyright (c) 2008 Canonical Ltd.

Subscribers

People subscribed via source and target branches

to all changes: