mozilla-devscripts

Merge lp:~bdrung/mozilla-devscripts/moz-version-manpage into lp:~mozillateam/mozilla-devscripts/mozilla-devscripts

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

This branch provides a man page for moz-version. It's based on the lintian branch.

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-12 00:21:56 +0000
@@ -1,3 +1,30 @@
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 - fix Vcs-Bzr-Browser field to Vcs-Browser
11 - update debian/control
12 - all files are directly installed into debian/mozilla-devscripts
13 - update debian/rules
14 - remove debian/mozilla-devscripts.install
15 * build-system:
16 - make minefield-packager.mk executable
17 - update src/Makefile
18 * lp-locale-export.mk:
19 - remove shebang
20 - update src/lp-locale-export.mk
21 * moz-version:
22 - wrote man page for moz-version
23 - add man/moz-version.1
24 - update src/Makefile
25
26 -- Benjamin Drung <bdrung@ubuntu.com> Wed, 12 Aug 2009 02:21:37 +0200
27
1mozilla-devscripts (0.14) unstable; urgency=low28mozilla-devscripts (0.14) unstable; urgency=low
229
3 [ Alexander Sack <asac@ubuntu.com> ]30 [ Alexander Sack <asac@ubuntu.com> ]
@@ -34,11 +61,11 @@
34 - fix LP: #411191 - webfav lp-locale-export.mk yields en-US.xpi with61 - fix LP: #411191 - webfav lp-locale-export.mk yields en-US.xpi with
35 .manifest files only - fix parsing bug for jar: protocol lines62 .manifest files only - fix parsing bug for jar: protocol lines
36 * packaging:63 * packaging:
37 - fix Vcs-Bzr: to point to a proper R/W location and use Vcs-Bzr-Browser for the64 - fix Vcs-Bzr: to point to a proper R/W location and use Vcs-Bzr-Browser for
38 browsable read-only location65 the browsable read-only location
39 - update debian/control66 - update debian/control
40 - add Benjamin Drung <bdrung@ubuntu.com> to Uploaders and also add my @ubuntu.com67 - add Benjamin Drung <bdrung@ubuntu.com> to Uploaders and also add my
41 address work-time uploads won't count as NMU68 @ubuntu.com address work-time uploads won't count as NMU
42 - update debian/control69 - update debian/control
4370
44 [ Benjamin Drung <bdrung@ubuntu.com> ]71 [ Benjamin Drung <bdrung@ubuntu.com> ]
@@ -116,7 +143,8 @@
116 - don't run MOZCLIENT_EXCLUDE_SCRIPT if does not exist as it creates143 - don't run MOZCLIENT_EXCLUDE_SCRIPT if does not exist as it creates
117 false positives144 false positives
118 - update src/mozclient/lib/MozClient/VCS.pm145 - update src/mozclient/lib/MozClient/VCS.pm
119 - drop $(EXT), left-over from when mozclient.pl was substed and use -c instead146 - drop $(EXT), left-over from when mozclient.pl was substed and use -c
147 instead
120 - update src/mozclient.mk.in148 - update src/mozclient.mk.in
121 - add support for git149 - add support for git
122 - add src/mozclient/lib/MozClient/Git.pm150 - add src/mozclient/lib/MozClient/Git.pm
@@ -140,7 +168,8 @@
140 for extensions built with xulapp.mk168 for extensions built with xulapp.mk
141 - update src/xpi.mk169 - update src/xpi.mk
142 * [ xulapp ]170 * [ xulapp ]
143 - allow caller to specify the xulrunner version by pre-setting DEBIAN_XUL_VER171 - allow caller to specify the xulrunner version by pre-setting
172 DEBIAN_XUL_VER
144 - update src/xulapp.mk.in173 - update src/xulapp.mk.in
145 - add confdefs.h and a.out to the clean rule174 - add confdefs.h and a.out to the clean rule
146 - update src/xulapp.mk.in175 - update src/xulapp.mk.in
@@ -238,9 +267,9 @@
238267
239 [ Alexander Sack ]268 [ Alexander Sack ]
240 * add .NOTPARALLEL target to make mozclient.mk more reliable in parallel269 * 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.270 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-source271 mozclient.mk. Maybe noteworthy that this doesn't prevent clients to
243 with distinct parameters in parallel.272 invoke get-orig-source with distinct parameters in parallel.
244 - update src/mozclient.mk.in273 - update src/mozclient.mk.in
245274
246 [ Fabien Tassin ]275 [ Fabien Tassin ]
@@ -272,7 +301,7 @@
272 - add src/xulrunner-1.9.1.mk.in301 - add src/xulrunner-1.9.1.mk.in
273 - add src/xulrunner-2.0.mk.in302 - add src/xulrunner-2.0.mk.in
274 - update src/Makefile303 - update src/Makefile
275 + add a variable called DEBIAN_KEEP_VCS to preserve the VCS files such as 304 + add a variable called DEBIAN_KEEP_VCS to preserve the VCS files such as
276 */CVS or .hg305 */CVS or .hg
277 - update src/mozclient.mk.in306 - update src/mozclient.mk.in
278 - update README307 - update README
@@ -309,8 +338,8 @@
309 [ Alexander Sack ]338 [ Alexander Sack ]
310 * [ xpi ]:339 * [ xpi ]:
311 + introduce support to extract xpi translations from any build tree that340 + introduce support to extract xpi translations from any build tree that
312 ships chrome.manifest indexed xul/xpi translations. This feature is ment to341 ships chrome.manifest indexed xul/xpi translations. This feature is ment
313 be hooked into install phase of then package build. cdbs users can just342 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.343 include this helper as we ship the appropriate cdbs hooks.
315 - add src/lp-locale-export.mk344 - add src/lp-locale-export.mk
316 * [ lp-locale-export ]:345 * [ lp-locale-export ]:
@@ -384,8 +413,8 @@
384 - update debian/control413 - update debian/control
385 * add unzip (needed by xpi.mk) to Depends: of mozilla-devscript binary package414 * add unzip (needed by xpi.mk) to Depends: of mozilla-devscript binary package
386 - update debian/control415 - update debian/control
387 * introduce MOZ_XPI_MOZILLA_DIRS in xpi.mk with default values: "firefox-addons416 * introduce MOZ_XPI_MOZILLA_DIRS in xpi.mk with default values:
388 firefox"417 "firefox-addons firefox"
389 - update src/xpi.mk418 - update src/xpi.mk
390 * document xpi.mk in README419 * document xpi.mk in README
391 - update README420 - update README
392421
=== modified file 'debian/control'
--- debian/control 2009-08-11 12:01:14 +0000
+++ debian/control 2009-08-11 21:52:42 +0000
@@ -3,18 +3,28 @@
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
12Vcs-Bzr-Browser: https://code.launchpad.net/~mozillateam/mozilla-devscripts/mozilla-devscripts12Vcs-Browser: https://code.launchpad.net/~mozillateam/mozilla-devscripts/mozilla-devscripts
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
=== removed file 'debian/mozilla-devscripts.install'
--- debian/mozilla-devscripts.install 2009-07-28 23:31:43 +0000
+++ debian/mozilla-devscripts.install 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
1debian/tmp/usr/share/mozilla-devscripts
2debian/tmp/usr/bin
30
=== modified file 'debian/rules'
--- debian/rules 2008-01-09 08:57:23 +0000
+++ debian/rules 2009-08-12 00:21:56 +0000
@@ -28,7 +28,7 @@
2828
29DEB_SRCDIR := $(CURDIR)/src29DEB_SRCDIR := $(CURDIR)/src
30DEB_MAKE_BUILD_TARGET := build30DEB_MAKE_BUILD_TARGET := build
31DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/tmp/31DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/mozilla-devscripts/
32DEB_MAKE_CHECK_TARGET := $(NULL)32DEB_MAKE_CHECK_TARGET := $(NULL)
3333
34DEB_INSTALL_DOCS_ALL := README34DEB_INSTALL_DOCS_ALL := README
3535
=== added directory 'man'
=== added file 'man/moz-version.1'
--- man/moz-version.1 1970-01-01 00:00:00 +0000
+++ man/moz-version.1 2009-08-12 00:18:05 +0000
@@ -0,0 +1,49 @@
1.\"Copyright (c) 2009 Benjamin Drung <bdrung@ubuntu.com>
2.\"
3.\"Permission is hereby granted, free of charge, to any person obtaining a copy
4.\"of this software and associated documentation files (the "Software"), to deal
5.\"in the Software without restriction, including without limitation the rights
6.\"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7.\"copies of the Software, and to permit persons to whom the Software is
8.\"furnished to do so, subject to the following conditions:
9.\"
10.\"The above copyright notice and this permission notice shall be included in
11.\"all copies or substantial portions of the Software.
12.\"
13.\"THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14.\"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15.\"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16.\"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17.\"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18.\"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
19.\"THE SOFTWARE.
20.TH MOZ-VERSION "1" "August 2009" "moz-version" "mozilla-devscripts suite"
21.SH NAME
22moz-version \- version format handling tool
23.SH SYNOPSIS
24.B moz-version
25[\fIoptions\fP]
26\fI--compare ver1 comparator ver2\fR
27.SH DESCRIPTION
28.B moz-version
29is a tool for working with version string from the Mozilla suite.
30Currently it can only compare versions.
31.SH ACTIONS
32.TP
33.B \-\-compare \fIver1 comparator ver2\fP
34Compare version numbers, where \fIcomparator\fP is a binary operator.
35\fBmoz-version\fP returns success (zero result) if the specified condition is
36satisfied, and failure (nonzero result) otherwise. The comparator must be one of
37\fBlt le eq ne ge gt\fP.
38.SH OPTIONS
39.TP
40\fB\-h\fR, \fB\-\-help\fR
41Display a brief help message.
42.TP
43\fB\-s\fR, \fB\-\-silent\fR
44Do not print anything and die silent on errors.
45.TP
46\fB\-v\fR, \fB\-\-verbose\fR
47Print more information.
48.SH AUTHOR
49Benjamin Drung <bdrung@gmail.com>
050
=== modified file 'src/Makefile'
--- src/Makefile 2009-08-03 23:37:38 +0000
+++ src/Makefile 2009-08-12 00:18:05 +0000
@@ -19,6 +19,7 @@
1919
20PREFIX ?= /usr20PREFIX ?= /usr
21BINDIR ?= $(PREFIX)/bin21BINDIR ?= $(PREFIX)/bin
22MANDIR ?= $(PREFIX)/share/man
2223
23DATADIR = $(PREFIX)/share/mozilla-devscripts24DATADIR = $(PREFIX)/share/mozilla-devscripts
2425
@@ -74,7 +75,7 @@
7475
75build: $(subst_files)76build: $(subst_files)
7677
77install: $(subst_files) $(extra_files) $(foreach dir,$(extra_dirs),$(wildcard $(dir)/*))78install: $(subst_files) $(extra_files) $(foreach dir,$(extra_dirs),$(wildcard $(dir)/*)) install-man
78 install -m 755 -d $(DESTDIR)$(DATADIR) $(foreach dir,$(extra_dirs),$(DESTDIR)$(DATADIR)/$(dir))79 install -m 755 -d $(DESTDIR)$(DATADIR) $(foreach dir,$(extra_dirs),$(DESTDIR)$(DATADIR)/$(dir))
79 install -m 644 $(subst_files) $(extra_files) $(DESTDIR)$(DATADIR)80 install -m 644 $(subst_files) $(extra_files) $(DESTDIR)$(DATADIR)
80 install -m 755 -d $(DESTDIR)$(BINDIR) 81 install -m 755 -d $(DESTDIR)$(BINDIR)
@@ -83,6 +84,12 @@
83 install -m 644 `echo $$dir/*` $(DESTDIR)$(DATADIR)/$$dir ; \84 install -m 644 `echo $$dir/*` $(DESTDIR)$(DATADIR)/$$dir ; \
84 done85 done
85 find $(DESTDIR)$(DATADIR) -type f \( -name \*.pl -o -name \*.sh \) -exec chmod -v 755 {} \;86 find $(DESTDIR)$(DATADIR) -type f \( -name \*.pl -o -name \*.sh \) -exec chmod -v 755 {} \;
87 chmod 755 $(DESTDIR)$(DATADIR)/minefield-packager.mk
88
89install-man:
90 install -D -m 644 ../man/moz-version.1 $(DESTDIR)$(MANDIR)/man1/moz-version.1
8691
87clean:92clean:
88 rm -f $(subst_files)93 rm -f $(subst_files)
94
95.PHONY: clean install install-man
8996
=== 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: