summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSasa Bodiroza <jazzva@gmail.com>2009-08-13 15:59:13 +0200
committerSasa Bodiroza <jazzva@gmail.com>2009-08-13 15:59:13 +0200
commit0733b22e39e2abb9d0c8df7cc7b297817e86dc01 (patch)
tree928dda5433514d4fc64208ad305c96a21c1834b5
parent477230f05d0d8fcbbcd9c31f5f705e6472092ad8 (diff)
parent77b8e18cf0a9edeef514ddb98c6efd9311a8757c (diff)
Merge with lp:~bdrung/mozilla-devscripts/lintian
-rw-r--r--debian/changelog50
-rw-r--r--debian/control22
-rw-r--r--src/Makefile1
-rw-r--r--src/lp-locale-export.mk1
4 files changed, 53 insertions, 21 deletions
diff --git a/debian/changelog b/debian/changelog
index e37801f..489c171 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+mozilla-devscripts (0.15) UNRELEASED; urgency=low
+
+ * packaging:
+ - break and sort Depends and Suggests
+ - update debian/control
+ - add ${misc:Depends} to Depends
+ - update debian/control
+ - wrap too long lines
+ - update debian/changelog
+ - fix Vcs-Bzr-Browser field to Vcs-Browser
+ - update debian/control
+ * build-system:
+ - make minefield-packager.mk executable
+ - update src/Makefile
+ * lp-locale-export.mk:
+ - remove shebang
+ - update src/lp-locale-export.mk
+
+ -- Benjamin Drung <bdrung@ubuntu.com> Tue, 11 Aug 2009 23:50:45 +0200
+
mozilla-devscripts (0.14) unstable; urgency=low
[ Alexander Sack <asac@ubuntu.com> ]
@@ -34,11 +54,11 @@ mozilla-devscripts (0.14) unstable; urgency=low
- fix LP: #411191 - webfav lp-locale-export.mk yields en-US.xpi with
.manifest files only - fix parsing bug for jar: protocol lines
* packaging:
- - fix Vcs-Bzr: to point to a proper R/W location and use Vcs-Bzr-Browser for the
- browsable read-only location
+ - fix Vcs-Bzr: to point to a proper R/W location and use Vcs-Bzr-Browser for
+ the browsable read-only location
- update debian/control
- - add Benjamin Drung <bdrung@ubuntu.com> to Uploaders and also add my @ubuntu.com
- address work-time uploads won't count as NMU
+ - add Benjamin Drung <bdrung@ubuntu.com> to Uploaders and also add my
+ @ubuntu.com address work-time uploads won't count as NMU
- update debian/control
[ Benjamin Drung <bdrung@ubuntu.com> ]
@@ -116,7 +136,8 @@ mozilla-devscripts (0.11) jaunty; urgency=low
- don't run MOZCLIENT_EXCLUDE_SCRIPT if does not exist as it creates
false positives
- update src/mozclient/lib/MozClient/VCS.pm
- - drop $(EXT), left-over from when mozclient.pl was substed and use -c instead
+ - drop $(EXT), left-over from when mozclient.pl was substed and use -c
+ instead
- update src/mozclient.mk.in
- add support for git
- add src/mozclient/lib/MozClient/Git.pm
@@ -140,7 +161,8 @@ mozilla-devscripts (0.11) jaunty; urgency=low
for extensions built with xulapp.mk
- update src/xpi.mk
* [ xulapp ]
- - allow caller to specify the xulrunner version by pre-setting DEBIAN_XUL_VER
+ - allow caller to specify the xulrunner version by pre-setting
+ DEBIAN_XUL_VER
- update src/xulapp.mk.in
- add confdefs.h and a.out to the clean rule
- update src/xulapp.mk.in
@@ -238,9 +260,9 @@ mozilla-devscripts (0.08) intrepid; urgency=low
[ Alexander Sack ]
* add .NOTPARALLEL target to make mozclient.mk more reliable in parallel
- make runs. We don't want parallel execution within the scope of mozclient.mk.
- Maybe noteworthy that this doesn't prevent clients to invoke get-orig-source
- with distinct parameters in parallel.
+ make runs. We don't want parallel execution within the scope of
+ mozclient.mk. Maybe noteworthy that this doesn't prevent clients to
+ invoke get-orig-source with distinct parameters in parallel.
- update src/mozclient.mk.in
[ Fabien Tassin ]
@@ -272,7 +294,7 @@ mozilla-devscripts (0.08) intrepid; urgency=low
- add src/xulrunner-1.9.1.mk.in
- add src/xulrunner-2.0.mk.in
- update src/Makefile
- + add a variable called DEBIAN_KEEP_VCS to preserve the VCS files such as
+ + add a variable called DEBIAN_KEEP_VCS to preserve the VCS files such as
*/CVS or .hg
- update src/mozclient.mk.in
- update README
@@ -309,8 +331,8 @@ mozilla-devscripts (0.06) hardy; urgency=low
[ Alexander Sack ]
* [ xpi ]:
+ introduce support to extract xpi translations from any build tree that
- ships chrome.manifest indexed xul/xpi translations. This feature is ment to
- be hooked into install phase of then package build. cdbs users can just
+ ships chrome.manifest indexed xul/xpi translations. This feature is ment
+ to be hooked into install phase of then package build. cdbs users can just
include this helper as we ship the appropriate cdbs hooks.
- add src/lp-locale-export.mk
* [ lp-locale-export ]:
@@ -384,8 +406,8 @@ mozilla-devscripts (0.05) hardy; urgency=low
- update debian/control
* add unzip (needed by xpi.mk) to Depends: of mozilla-devscript binary package
- update debian/control
- * introduce MOZ_XPI_MOZILLA_DIRS in xpi.mk with default values: "firefox-addons
- firefox"
+ * introduce MOZ_XPI_MOZILLA_DIRS in xpi.mk with default values:
+ "firefox-addons firefox"
- update src/xpi.mk
* document xpi.mk in README
- update README
diff --git a/debian/control b/debian/control
index 811c9ad..8365b1f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,18 +3,28 @@ Section: devel
Priority: optional
Maintainer: Ubuntu Mozilla Team <ubuntu-mozillateam@lists.ubuntu.com>
Uploaders: Fabien Tassin <fta@ubuntu.com>,
- Alexander Sack <asac@debian.org>,
- Alexander Sack <asac@ubuntu.com>,
- Benjamin Drung <bdrung@ubuntu.com>
+ Alexander Sack <asac@debian.org>,
+ Alexander Sack <asac@ubuntu.com>,
+ Benjamin Drung <bdrung@ubuntu.com>
Build-Depends: debhelper (>= 5), cdbs
Standards-Version: 3.8.2
Vcs-Bzr: lp:mozilla-devscripts
-Vcs-Bzr-Browser: https://code.launchpad.net/~mozillateam/mozilla-devscripts/mozilla-devscripts
+Vcs-Browser: https://code.launchpad.net/~mozillateam/mozilla-devscripts/mozilla-devscripts
Package: mozilla-devscripts
Architecture: all
-Depends: wget, quilt, libxml-xpath-perl, zip, unzip, dpkg-dev, fakeroot, python
-Suggests: cvs, mercurial, git-core
+Depends: dpkg-dev,
+ fakeroot,
+ libxml-xpath-perl,
+ python,
+ quilt,
+ unzip,
+ wget,
+ zip,
+ ${misc:Depends}
+Suggests: cvs,
+ git-core,
+ mercurial
Description: Collection of dev scripts used by Ubuntu Mozilla packages
This package contains mozilla-devscripts, a collection of scripts
based on Makefile inheritance which provides targets usable by Mozilla
diff --git a/src/Makefile b/src/Makefile
index 51e8ede..ae7281d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -83,6 +83,7 @@ install: $(subst_files) $(extra_files) $(foreach dir,$(extra_dirs),$(wildcard $(
install -m 644 `echo $$dir/*` $(DESTDIR)$(DATADIR)/$$dir ; \
done
find $(DESTDIR)$(DATADIR) -type f \( -name \*.pl -o -name \*.sh \) -exec chmod -v 755 {} \;
+ chmod 755 $(DESTDIR)$(DATADIR)/minefield-packager.mk
clean:
rm -f $(subst_files)
diff --git a/src/lp-locale-export.mk b/src/lp-locale-export.mk
index 23125fe..096f205 100644
--- a/src/lp-locale-export.mk
+++ b/src/lp-locale-export.mk
@@ -1,4 +1,3 @@
-#!/usr/bin/make -f
# -*- mode: makefile; coding: utf-8 -*-
# Copyright (c) 2008 Canonical Ltd.