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
1=== modified file 'debian/changelog'
2--- debian/changelog 2009-08-11 12:01:48 +0000
3+++ debian/changelog 2009-08-12 00:21:56 +0000
4@@ -1,3 +1,30 @@
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+ - fix Vcs-Bzr-Browser field to Vcs-Browser
15+ - update debian/control
16+ - all files are directly installed into debian/mozilla-devscripts
17+ - update debian/rules
18+ - remove debian/mozilla-devscripts.install
19+ * build-system:
20+ - make minefield-packager.mk executable
21+ - update src/Makefile
22+ * lp-locale-export.mk:
23+ - remove shebang
24+ - update src/lp-locale-export.mk
25+ * moz-version:
26+ - wrote man page for moz-version
27+ - add man/moz-version.1
28+ - update src/Makefile
29+
30+ -- Benjamin Drung <bdrung@ubuntu.com> Wed, 12 Aug 2009 02:21:37 +0200
31+
32 mozilla-devscripts (0.14) unstable; urgency=low
33
34 [ Alexander Sack <asac@ubuntu.com> ]
35@@ -34,11 +61,11 @@
36 - fix LP: #411191 - webfav lp-locale-export.mk yields en-US.xpi with
37 .manifest files only - fix parsing bug for jar: protocol lines
38 * packaging:
39- - fix Vcs-Bzr: to point to a proper R/W location and use Vcs-Bzr-Browser for the
40- browsable read-only location
41+ - fix Vcs-Bzr: to point to a proper R/W location and use Vcs-Bzr-Browser for
42+ the browsable read-only location
43 - update debian/control
44- - add Benjamin Drung <bdrung@ubuntu.com> to Uploaders and also add my @ubuntu.com
45- address work-time uploads won't count as NMU
46+ - add Benjamin Drung <bdrung@ubuntu.com> to Uploaders and also add my
47+ @ubuntu.com address work-time uploads won't count as NMU
48 - update debian/control
49
50 [ Benjamin Drung <bdrung@ubuntu.com> ]
51@@ -116,7 +143,8 @@
52 - don't run MOZCLIENT_EXCLUDE_SCRIPT if does not exist as it creates
53 false positives
54 - update src/mozclient/lib/MozClient/VCS.pm
55- - drop $(EXT), left-over from when mozclient.pl was substed and use -c instead
56+ - drop $(EXT), left-over from when mozclient.pl was substed and use -c
57+ instead
58 - update src/mozclient.mk.in
59 - add support for git
60 - add src/mozclient/lib/MozClient/Git.pm
61@@ -140,7 +168,8 @@
62 for extensions built with xulapp.mk
63 - update src/xpi.mk
64 * [ xulapp ]
65- - allow caller to specify the xulrunner version by pre-setting DEBIAN_XUL_VER
66+ - allow caller to specify the xulrunner version by pre-setting
67+ DEBIAN_XUL_VER
68 - update src/xulapp.mk.in
69 - add confdefs.h and a.out to the clean rule
70 - update src/xulapp.mk.in
71@@ -238,9 +267,9 @@
72
73 [ Alexander Sack ]
74 * add .NOTPARALLEL target to make mozclient.mk more reliable in parallel
75- make runs. We don't want parallel execution within the scope of mozclient.mk.
76- Maybe noteworthy that this doesn't prevent clients to invoke get-orig-source
77- with distinct parameters in parallel.
78+ make runs. We don't want parallel execution within the scope of
79+ mozclient.mk. Maybe noteworthy that this doesn't prevent clients to
80+ invoke get-orig-source with distinct parameters in parallel.
81 - update src/mozclient.mk.in
82
83 [ Fabien Tassin ]
84@@ -272,7 +301,7 @@
85 - add src/xulrunner-1.9.1.mk.in
86 - add src/xulrunner-2.0.mk.in
87 - update src/Makefile
88- + add a variable called DEBIAN_KEEP_VCS to preserve the VCS files such as
89+ + add a variable called DEBIAN_KEEP_VCS to preserve the VCS files such as
90 */CVS or .hg
91 - update src/mozclient.mk.in
92 - update README
93@@ -309,8 +338,8 @@
94 [ Alexander Sack ]
95 * [ xpi ]:
96 + introduce support to extract xpi translations from any build tree that
97- ships chrome.manifest indexed xul/xpi translations. This feature is ment to
98- be hooked into install phase of then package build. cdbs users can just
99+ ships chrome.manifest indexed xul/xpi translations. This feature is ment
100+ to be hooked into install phase of then package build. cdbs users can just
101 include this helper as we ship the appropriate cdbs hooks.
102 - add src/lp-locale-export.mk
103 * [ lp-locale-export ]:
104@@ -384,8 +413,8 @@
105 - update debian/control
106 * add unzip (needed by xpi.mk) to Depends: of mozilla-devscript binary package
107 - update debian/control
108- * introduce MOZ_XPI_MOZILLA_DIRS in xpi.mk with default values: "firefox-addons
109- firefox"
110+ * introduce MOZ_XPI_MOZILLA_DIRS in xpi.mk with default values:
111+ "firefox-addons firefox"
112 - update src/xpi.mk
113 * document xpi.mk in README
114 - update README
115
116=== modified file 'debian/control'
117--- debian/control 2009-08-11 12:01:14 +0000
118+++ debian/control 2009-08-11 21:52:42 +0000
119@@ -3,18 +3,28 @@
120 Priority: optional
121 Maintainer: Ubuntu Mozilla Team <ubuntu-mozillateam@lists.ubuntu.com>
122 Uploaders: Fabien Tassin <fta@ubuntu.com>,
123- Alexander Sack <asac@debian.org>,
124- Alexander Sack <asac@ubuntu.com>,
125- Benjamin Drung <bdrung@ubuntu.com>
126+ Alexander Sack <asac@debian.org>,
127+ Alexander Sack <asac@ubuntu.com>,
128+ Benjamin Drung <bdrung@ubuntu.com>
129 Build-Depends: debhelper (>= 5), cdbs
130 Standards-Version: 3.8.2
131 Vcs-Bzr: lp:mozilla-devscripts
132-Vcs-Bzr-Browser: https://code.launchpad.net/~mozillateam/mozilla-devscripts/mozilla-devscripts
133+Vcs-Browser: https://code.launchpad.net/~mozillateam/mozilla-devscripts/mozilla-devscripts
134
135 Package: mozilla-devscripts
136 Architecture: all
137-Depends: wget, quilt, libxml-xpath-perl, zip, unzip, dpkg-dev, fakeroot, python
138-Suggests: cvs, mercurial, git-core
139+Depends: dpkg-dev,
140+ fakeroot,
141+ libxml-xpath-perl,
142+ python,
143+ quilt,
144+ unzip,
145+ wget,
146+ zip,
147+ ${misc:Depends}
148+Suggests: cvs,
149+ git-core,
150+ mercurial
151 Description: Collection of dev scripts used by Ubuntu Mozilla packages
152 This package contains mozilla-devscripts, a collection of scripts
153 based on Makefile inheritance which provides targets usable by Mozilla
154
155=== removed file 'debian/mozilla-devscripts.install'
156--- debian/mozilla-devscripts.install 2009-07-28 23:31:43 +0000
157+++ debian/mozilla-devscripts.install 1970-01-01 00:00:00 +0000
158@@ -1,2 +0,0 @@
159-debian/tmp/usr/share/mozilla-devscripts
160-debian/tmp/usr/bin
161
162=== modified file 'debian/rules'
163--- debian/rules 2008-01-09 08:57:23 +0000
164+++ debian/rules 2009-08-12 00:21:56 +0000
165@@ -28,7 +28,7 @@
166
167 DEB_SRCDIR := $(CURDIR)/src
168 DEB_MAKE_BUILD_TARGET := build
169-DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/tmp/
170+DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/mozilla-devscripts/
171 DEB_MAKE_CHECK_TARGET := $(NULL)
172
173 DEB_INSTALL_DOCS_ALL := README
174
175=== added directory 'man'
176=== added file 'man/moz-version.1'
177--- man/moz-version.1 1970-01-01 00:00:00 +0000
178+++ man/moz-version.1 2009-08-12 00:18:05 +0000
179@@ -0,0 +1,49 @@
180+.\"Copyright (c) 2009 Benjamin Drung <bdrung@ubuntu.com>
181+.\"
182+.\"Permission is hereby granted, free of charge, to any person obtaining a copy
183+.\"of this software and associated documentation files (the "Software"), to deal
184+.\"in the Software without restriction, including without limitation the rights
185+.\"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
186+.\"copies of the Software, and to permit persons to whom the Software is
187+.\"furnished to do so, subject to the following conditions:
188+.\"
189+.\"The above copyright notice and this permission notice shall be included in
190+.\"all copies or substantial portions of the Software.
191+.\"
192+.\"THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
193+.\"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
194+.\"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
195+.\"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
196+.\"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
197+.\"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
198+.\"THE SOFTWARE.
199+.TH MOZ-VERSION "1" "August 2009" "moz-version" "mozilla-devscripts suite"
200+.SH NAME
201+moz-version \- version format handling tool
202+.SH SYNOPSIS
203+.B moz-version
204+[\fIoptions\fP]
205+\fI--compare ver1 comparator ver2\fR
206+.SH DESCRIPTION
207+.B moz-version
208+is a tool for working with version string from the Mozilla suite.
209+Currently it can only compare versions.
210+.SH ACTIONS
211+.TP
212+.B \-\-compare \fIver1 comparator ver2\fP
213+Compare version numbers, where \fIcomparator\fP is a binary operator.
214+\fBmoz-version\fP returns success (zero result) if the specified condition is
215+satisfied, and failure (nonzero result) otherwise. The comparator must be one of
216+\fBlt le eq ne ge gt\fP.
217+.SH OPTIONS
218+.TP
219+\fB\-h\fR, \fB\-\-help\fR
220+Display a brief help message.
221+.TP
222+\fB\-s\fR, \fB\-\-silent\fR
223+Do not print anything and die silent on errors.
224+.TP
225+\fB\-v\fR, \fB\-\-verbose\fR
226+Print more information.
227+.SH AUTHOR
228+Benjamin Drung <bdrung@gmail.com>
229
230=== modified file 'src/Makefile'
231--- src/Makefile 2009-08-03 23:37:38 +0000
232+++ src/Makefile 2009-08-12 00:18:05 +0000
233@@ -19,6 +19,7 @@
234
235 PREFIX ?= /usr
236 BINDIR ?= $(PREFIX)/bin
237+MANDIR ?= $(PREFIX)/share/man
238
239 DATADIR = $(PREFIX)/share/mozilla-devscripts
240
241@@ -74,7 +75,7 @@
242
243 build: $(subst_files)
244
245-install: $(subst_files) $(extra_files) $(foreach dir,$(extra_dirs),$(wildcard $(dir)/*))
246+install: $(subst_files) $(extra_files) $(foreach dir,$(extra_dirs),$(wildcard $(dir)/*)) install-man
247 install -m 755 -d $(DESTDIR)$(DATADIR) $(foreach dir,$(extra_dirs),$(DESTDIR)$(DATADIR)/$(dir))
248 install -m 644 $(subst_files) $(extra_files) $(DESTDIR)$(DATADIR)
249 install -m 755 -d $(DESTDIR)$(BINDIR)
250@@ -83,6 +84,12 @@
251 install -m 644 `echo $$dir/*` $(DESTDIR)$(DATADIR)/$$dir ; \
252 done
253 find $(DESTDIR)$(DATADIR) -type f \( -name \*.pl -o -name \*.sh \) -exec chmod -v 755 {} \;
254+ chmod 755 $(DESTDIR)$(DATADIR)/minefield-packager.mk
255+
256+install-man:
257+ install -D -m 644 ../man/moz-version.1 $(DESTDIR)$(MANDIR)/man1/moz-version.1
258
259 clean:
260 rm -f $(subst_files)
261+
262+.PHONY: clean install install-man
263
264=== modified file 'src/lp-locale-export.mk'
265--- src/lp-locale-export.mk 2009-08-09 22:57:56 +0000
266+++ src/lp-locale-export.mk 2009-08-11 15:34:02 +0000
267@@ -1,4 +1,3 @@
268-#!/usr/bin/make -f
269 # -*- mode: makefile; coding: utf-8 -*-
270
271 # Copyright (c) 2008 Canonical Ltd.

Subscribers

People subscribed via source and target branches

to all changes: