diff options
author | Sasa Bodiroza <jazzva@gmail.com> | 2009-08-13 16:03:53 +0200 |
---|---|---|
committer | Sasa Bodiroza <jazzva@gmail.com> | 2009-08-13 16:03:53 +0200 |
commit | 7ab8ae21d3ea12cd8dc5d77f15d442b0cb6adc65 (patch) | |
tree | 5965a99a958414d919ccb90243ca31dc5ac2708f | |
parent | 0733b22e39e2abb9d0c8df7cc7b297817e86dc01 (diff) | |
parent | ce093b5dc7a9847c4ec0afb84877a6c5c14b9ea1 (diff) |
Merge with lp:~bdrung/mozilla-devscripts/moz-version-manpage
-rw-r--r-- | debian/changelog | 9 | ||||
-rw-r--r-- | debian/mozilla-devscripts.install | 2 | ||||
-rwxr-xr-x | debian/rules | 2 | ||||
-rw-r--r-- | man/moz-version.1 | 49 | ||||
-rw-r--r-- | src/Makefile | 8 |
5 files changed, 65 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index 489c171..f093448 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,14 +9,21 @@ mozilla-devscripts (0.15) UNRELEASED; urgency=low - update debian/changelog - fix Vcs-Bzr-Browser field to Vcs-Browser - update debian/control + - all files are directly installed into debian/mozilla-devscripts + - update debian/rules + - remove debian/mozilla-devscripts.install * build-system: - make minefield-packager.mk executable - update src/Makefile * lp-locale-export.mk: - remove shebang - update src/lp-locale-export.mk + * moz-version: + - wrote man page for moz-version + - add man/moz-version.1 + - update src/Makefile - -- Benjamin Drung <bdrung@ubuntu.com> Tue, 11 Aug 2009 23:50:45 +0200 + -- Benjamin Drung <bdrung@ubuntu.com> Wed, 12 Aug 2009 02:21:37 +0200 mozilla-devscripts (0.14) unstable; urgency=low diff --git a/debian/mozilla-devscripts.install b/debian/mozilla-devscripts.install deleted file mode 100644 index 412da21..0000000 --- a/debian/mozilla-devscripts.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/tmp/usr/share/mozilla-devscripts -debian/tmp/usr/bin diff --git a/debian/rules b/debian/rules index 77e4ec0..2d6256a 100755 --- a/debian/rules +++ b/debian/rules @@ -28,7 +28,7 @@ include /usr/share/cdbs/1/class/makefile.mk DEB_SRCDIR := $(CURDIR)/src DEB_MAKE_BUILD_TARGET := build -DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/tmp/ +DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/mozilla-devscripts/ DEB_MAKE_CHECK_TARGET := $(NULL) DEB_INSTALL_DOCS_ALL := README diff --git a/man/moz-version.1 b/man/moz-version.1 new file mode 100644 index 0000000..bd820fd --- /dev/null +++ b/man/moz-version.1 @@ -0,0 +1,49 @@ +.\"Copyright (c) 2009 Benjamin Drung <bdrung@ubuntu.com> +.\" +.\"Permission is hereby granted, free of charge, to any person obtaining a copy +.\"of this software and associated documentation files (the "Software"), to deal +.\"in the Software without restriction, including without limitation the rights +.\"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +.\"copies of the Software, and to permit persons to whom the Software is +.\"furnished to do so, subject to the following conditions: +.\" +.\"The above copyright notice and this permission notice shall be included in +.\"all copies or substantial portions of the Software. +.\" +.\"THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +.\"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +.\"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +.\"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +.\"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +.\"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +.\"THE SOFTWARE. +.TH MOZ-VERSION "1" "August 2009" "moz-version" "mozilla-devscripts suite" +.SH NAME +moz-version \- version format handling tool +.SH SYNOPSIS +.B moz-version +[\fIoptions\fP] +\fI--compare ver1 comparator ver2\fR +.SH DESCRIPTION +.B moz-version +is a tool for working with version string from the Mozilla suite. +Currently it can only compare versions. +.SH ACTIONS +.TP +.B \-\-compare \fIver1 comparator ver2\fP +Compare version numbers, where \fIcomparator\fP is a binary operator. +\fBmoz-version\fP returns success (zero result) if the specified condition is +satisfied, and failure (nonzero result) otherwise. The comparator must be one of +\fBlt le eq ne ge gt\fP. +.SH OPTIONS +.TP +\fB\-h\fR, \fB\-\-help\fR +Display a brief help message. +.TP +\fB\-s\fR, \fB\-\-silent\fR +Do not print anything and die silent on errors. +.TP +\fB\-v\fR, \fB\-\-verbose\fR +Print more information. +.SH AUTHOR +Benjamin Drung <bdrung@gmail.com> diff --git a/src/Makefile b/src/Makefile index ae7281d..3149cc6 100644 --- a/src/Makefile +++ b/src/Makefile @@ -19,6 +19,7 @@ PREFIX ?= /usr BINDIR ?= $(PREFIX)/bin +MANDIR ?= $(PREFIX)/share/man DATADIR = $(PREFIX)/share/mozilla-devscripts @@ -74,7 +75,7 @@ extra_dirs = \ build: $(subst_files) -install: $(subst_files) $(extra_files) $(foreach dir,$(extra_dirs),$(wildcard $(dir)/*)) +install: $(subst_files) $(extra_files) $(foreach dir,$(extra_dirs),$(wildcard $(dir)/*)) install-man install -m 755 -d $(DESTDIR)$(DATADIR) $(foreach dir,$(extra_dirs),$(DESTDIR)$(DATADIR)/$(dir)) install -m 644 $(subst_files) $(extra_files) $(DESTDIR)$(DATADIR) install -m 755 -d $(DESTDIR)$(BINDIR) @@ -85,5 +86,10 @@ install: $(subst_files) $(extra_files) $(foreach dir,$(extra_dirs),$(wildcard $( find $(DESTDIR)$(DATADIR) -type f \( -name \*.pl -o -name \*.sh \) -exec chmod -v 755 {} \; chmod 755 $(DESTDIR)$(DATADIR)/minefield-packager.mk +install-man: + install -D -m 644 ../man/moz-version.1 $(DESTDIR)$(MANDIR)/man1/moz-version.1 + clean: rm -f $(subst_files) + +.PHONY: clean install install-man |