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
=== modified file 'debian/changelog'
--- debian/changelog 2009-08-11 12:01:48 +0000
+++ debian/changelog 2009-08-11 15:34:02 +0000
@@ -1,3 +1,21 @@
1mozilla-devscripts (0.15) UNRELEASED; urgency=low
2
3 * packaging:
4 - break and sort Depends and Suggests
5 - update debian/control
6 - add ${misc:Depends} to Depends
7 - update debian/control
8 - wrap too long lines
9 - update debian/changelog
10 * build-system:
11 - make minefield-packager.mk executable
12 - update src/Makefile
13 * lp-locale-export.mk:
14 - remove shebang
15 - update src/lp-locale-export.mk
16
17 -- Benjamin Drung <bdrung@ubuntu.com> Tue, 11 Aug 2009 17:27:50 +0200
18
1mozilla-devscripts (0.14) unstable; urgency=low19mozilla-devscripts (0.14) unstable; urgency=low
220
3 [ Alexander Sack <asac@ubuntu.com> ]21 [ Alexander Sack <asac@ubuntu.com> ]
@@ -34,11 +52,11 @@
34 - fix LP: #411191 - webfav lp-locale-export.mk yields en-US.xpi with52 - fix LP: #411191 - webfav lp-locale-export.mk yields en-US.xpi with
35 .manifest files only - fix parsing bug for jar: protocol lines53 .manifest files only - fix parsing bug for jar: protocol lines
36 * packaging:54 * packaging:
37 - fix Vcs-Bzr: to point to a proper R/W location and use Vcs-Bzr-Browser for the55 - fix Vcs-Bzr: to point to a proper R/W location and use Vcs-Bzr-Browser for
38 browsable read-only location56 the browsable read-only location
39 - update debian/control57 - update debian/control
40 - add Benjamin Drung <bdrung@ubuntu.com> to Uploaders and also add my @ubuntu.com58 - add Benjamin Drung <bdrung@ubuntu.com> to Uploaders and also add my
41 address work-time uploads won't count as NMU59 @ubuntu.com address work-time uploads won't count as NMU
42 - update debian/control60 - update debian/control
4361
44 [ Benjamin Drung <bdrung@ubuntu.com> ]62 [ Benjamin Drung <bdrung@ubuntu.com> ]
@@ -116,7 +134,8 @@
116 - don't run MOZCLIENT_EXCLUDE_SCRIPT if does not exist as it creates134 - don't run MOZCLIENT_EXCLUDE_SCRIPT if does not exist as it creates
117 false positives135 false positives
118 - update src/mozclient/lib/MozClient/VCS.pm136 - update src/mozclient/lib/MozClient/VCS.pm
119 - drop $(EXT), left-over from when mozclient.pl was substed and use -c instead137 - drop $(EXT), left-over from when mozclient.pl was substed and use -c
138 instead
120 - update src/mozclient.mk.in139 - update src/mozclient.mk.in
121 - add support for git140 - add support for git
122 - add src/mozclient/lib/MozClient/Git.pm141 - add src/mozclient/lib/MozClient/Git.pm
@@ -140,7 +159,8 @@
140 for extensions built with xulapp.mk159 for extensions built with xulapp.mk
141 - update src/xpi.mk160 - update src/xpi.mk
142 * [ xulapp ]161 * [ xulapp ]
143 - allow caller to specify the xulrunner version by pre-setting DEBIAN_XUL_VER162 - allow caller to specify the xulrunner version by pre-setting
163 DEBIAN_XUL_VER
144 - update src/xulapp.mk.in164 - update src/xulapp.mk.in
145 - add confdefs.h and a.out to the clean rule165 - add confdefs.h and a.out to the clean rule
146 - update src/xulapp.mk.in166 - update src/xulapp.mk.in
@@ -238,9 +258,9 @@
238258
239 [ Alexander Sack ]259 [ Alexander Sack ]
240 * add .NOTPARALLEL target to make mozclient.mk more reliable in parallel260 * add .NOTPARALLEL target to make mozclient.mk more reliable in parallel
241 make runs. We don't want parallel execution within the scope of mozclient.mk.261 make runs. We don't want parallel execution within the scope of
242 Maybe noteworthy that this doesn't prevent clients to invoke get-orig-source262 mozclient.mk. Maybe noteworthy that this doesn't prevent clients to
243 with distinct parameters in parallel.263 invoke get-orig-source with distinct parameters in parallel.
244 - update src/mozclient.mk.in264 - update src/mozclient.mk.in
245265
246 [ Fabien Tassin ]266 [ Fabien Tassin ]
@@ -272,7 +292,7 @@
272 - add src/xulrunner-1.9.1.mk.in292 - add src/xulrunner-1.9.1.mk.in
273 - add src/xulrunner-2.0.mk.in293 - add src/xulrunner-2.0.mk.in
274 - update src/Makefile294 - update src/Makefile
275 + add a variable called DEBIAN_KEEP_VCS to preserve the VCS files such as 295 + add a variable called DEBIAN_KEEP_VCS to preserve the VCS files such as
276 */CVS or .hg296 */CVS or .hg
277 - update src/mozclient.mk.in297 - update src/mozclient.mk.in
278 - update README298 - update README
@@ -309,8 +329,8 @@
309 [ Alexander Sack ]329 [ Alexander Sack ]
310 * [ xpi ]:330 * [ xpi ]:
311 + introduce support to extract xpi translations from any build tree that331 + introduce support to extract xpi translations from any build tree that
312 ships chrome.manifest indexed xul/xpi translations. This feature is ment to332 ships chrome.manifest indexed xul/xpi translations. This feature is ment
313 be hooked into install phase of then package build. cdbs users can just333 to be hooked into install phase of then package build. cdbs users can just
314 include this helper as we ship the appropriate cdbs hooks.334 include this helper as we ship the appropriate cdbs hooks.
315 - add src/lp-locale-export.mk335 - add src/lp-locale-export.mk
316 * [ lp-locale-export ]:336 * [ lp-locale-export ]:
@@ -384,8 +404,8 @@
384 - update debian/control404 - update debian/control
385 * add unzip (needed by xpi.mk) to Depends: of mozilla-devscript binary package405 * add unzip (needed by xpi.mk) to Depends: of mozilla-devscript binary package
386 - update debian/control406 - update debian/control
387 * introduce MOZ_XPI_MOZILLA_DIRS in xpi.mk with default values: "firefox-addons407 * introduce MOZ_XPI_MOZILLA_DIRS in xpi.mk with default values:
388 firefox"408 "firefox-addons firefox"
389 - update src/xpi.mk409 - update src/xpi.mk
390 * document xpi.mk in README410 * document xpi.mk in README
391 - update README411 - update README
392412
=== modified file 'debian/control'
--- debian/control 2009-08-11 12:01:14 +0000
+++ debian/control 2009-08-11 14:41:14 +0000
@@ -3,9 +3,9 @@
3Priority: optional3Priority: optional
4Maintainer: Ubuntu Mozilla Team <ubuntu-mozillateam@lists.ubuntu.com>4Maintainer: Ubuntu Mozilla Team <ubuntu-mozillateam@lists.ubuntu.com>
5Uploaders: Fabien Tassin <fta@ubuntu.com>,5Uploaders: Fabien Tassin <fta@ubuntu.com>,
6 Alexander Sack <asac@debian.org>,6 Alexander Sack <asac@debian.org>,
7 Alexander Sack <asac@ubuntu.com>,7 Alexander Sack <asac@ubuntu.com>,
8 Benjamin Drung <bdrung@ubuntu.com>8 Benjamin Drung <bdrung@ubuntu.com>
9Build-Depends: debhelper (>= 5), cdbs9Build-Depends: debhelper (>= 5), cdbs
10Standards-Version: 3.8.210Standards-Version: 3.8.2
11Vcs-Bzr: lp:mozilla-devscripts11Vcs-Bzr: lp:mozilla-devscripts
@@ -13,8 +13,18 @@
1313
14Package: mozilla-devscripts14Package: mozilla-devscripts
15Architecture: all15Architecture: all
16Depends: wget, quilt, libxml-xpath-perl, zip, unzip, dpkg-dev, fakeroot, python16Depends: dpkg-dev,
17Suggests: cvs, mercurial, git-core17 fakeroot,
18 libxml-xpath-perl,
19 python,
20 quilt,
21 unzip,
22 wget,
23 zip,
24 ${misc:Depends}
25Suggests: cvs,
26 git-core,
27 mercurial
18Description: Collection of dev scripts used by Ubuntu Mozilla packages28Description: Collection of dev scripts used by Ubuntu Mozilla packages
19 This package contains mozilla-devscripts, a collection of scripts29 This package contains mozilla-devscripts, a collection of scripts
20 based on Makefile inheritance which provides targets usable by Mozilla30 based on Makefile inheritance which provides targets usable by Mozilla
2131
=== modified file 'src/Makefile'
--- src/Makefile 2009-08-03 23:37:38 +0000
+++ src/Makefile 2009-08-11 15:24:15 +0000
@@ -83,6 +83,7 @@
83 install -m 644 `echo $$dir/*` $(DESTDIR)$(DATADIR)/$$dir ; \83 install -m 644 `echo $$dir/*` $(DESTDIR)$(DATADIR)/$$dir ; \
84 done84 done
85 find $(DESTDIR)$(DATADIR) -type f \( -name \*.pl -o -name \*.sh \) -exec chmod -v 755 {} \;85 find $(DESTDIR)$(DATADIR) -type f \( -name \*.pl -o -name \*.sh \) -exec chmod -v 755 {} \;
86 chmod 755 $(DESTDIR)$(DATADIR)/minefield-packager.mk
8687
87clean:88clean:
88 rm -f $(subst_files)89 rm -f $(subst_files)
8990
=== modified file 'src/lp-locale-export.mk'
--- src/lp-locale-export.mk 2009-08-09 22:57:56 +0000
+++ src/lp-locale-export.mk 2009-08-11 15:34:02 +0000
@@ -1,4 +1,3 @@
1#!/usr/bin/make -f
2# -*- mode: makefile; coding: utf-8 -*-1# -*- mode: makefile; coding: utf-8 -*-
32
4# Copyright (c) 2008 Canonical Ltd.3# Copyright (c) 2008 Canonical Ltd.

Subscribers

People subscribed via source and target branches

to all changes: