Skip to content

Commit

Permalink
*) Make help2man optional if manpages are already
Browse files Browse the repository at this point in the history
     generated.
  *) Update ubuntu packaging support.
  • Loading branch information
minfrin committed Jan 15, 2020
1 parent 0ac82f6 commit 42d4dd5
Show file tree
Hide file tree
Showing 11 changed files with 32 additions and 15 deletions.
7 changes: 7 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@

Changes with v1.0.4

*) Make help2man optional if manpages are already
generated. [Graham Leggett]

*) Update ubuntu packaging support. [Graham Leggett]

Changes with v1.0.3

*) Update autoconf minimum to v2.69. [Graham Leggett]
Expand Down
8 changes: 4 additions & 4 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ tardemux_LDADD = ${libarchive_LIBS}
EXTRA_DIST = tarmux.spec debian/changelog debian/compat debian/control debian/copyright debian/docs debian/tarmux.dirs debian/rules debian/source/format
dist_man_MANS = tarmux.1 tardemux.1

tarmux.1: tarmux
which help2man && help2man ./tarmux > tarmux.1 || true
tarmux.1: tarmux.c $(top_srcdir)/configure.ac
which help2man && help2man -n "Multiplex streams using tar file fragments." ./tarmux > tarmux.1 || true

tardemux.1: tardemux
which help2man && help2man ./tardemux > tardemux.1 || true
tardemux.1: tardemux.c $(top_srcdir)/configure.ac
which help2man && help2man -n "Demultiplex streams using tar file fragments." ./tardemux > tardemux.1 || true

2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.

AC_PREREQ([2.69])
AC_INIT([tarmux],[1.0.3],[minfrin@sharp.fm])
AC_INIT([tarmux],[1.0.4],[minfrin@sharp.fm])
AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE([dist-bzip2])
AC_CONFIG_HEADERS([config.h])
Expand Down
5 changes: 5 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
tarmux (1.0.4) bionic; urgency=low

* Packaging Release.

-- Graham Leggett <minfrin@sharp.fm> Wed, 15 Jan 2020 00:00:00 +0000
tarmux (1.0.3) stable; urgency=low

* Bugfix Release.
Expand Down
9 changes: 5 additions & 4 deletions debian/control
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Source: tarmux
Priority: extra
Priority: optional
Maintainer: Graham Leggett <minfrin@sharp.fm>
Build-Depends: debhelper (>= 8.0.0), autotools-dev, libarchive-dev, pkg-config
Standards-Version: 3.9.4
Build-Depends: debhelper (>= 8.0.0), autotools-dev, libarchive-dev, pkg-config, help2man
Standards-Version: 4.1.4
Section: utils
Homepage: https://github.com/minfrin/tarmux

Expand All @@ -11,4 +11,5 @@ Section: utils
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Multiplex and demultiplex streams using tar file fragments.

Allows large files to be multiplexed to and demultiplexed from a pipe
or a stream where the stream is too large to fit on disk.
2 changes: 0 additions & 2 deletions debian/copyright
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,3 @@ License: Apache-2.0
On Debian systems, the complete text of the Apache version 2.0 license
can be found in "/usr/share/common-licenses/Apache-2.0".

# Please also look if there are files or directories which have a
# different copyright/license attached and list them here.
1 change: 1 addition & 0 deletions debian/files
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
tarmux_1.0.4_source.buildinfo utils optional
3 changes: 3 additions & 0 deletions debian/install
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
tarmux usr/bin
tardemux usr/bin

2 changes: 2 additions & 0 deletions debian/manpages
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
tarmux.1
tardemux.1
4 changes: 2 additions & 2 deletions tardemux.1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
.TH TARMUX "1" "January 2020" "tarmux 1.0.3" "User Commands"
.TH TARMUX "1" "January 2020" "tarmux 1.0.4" "User Commands"
.SH NAME
tarmux \- manual page for tarmux 1.0.3
tarmux \- Demultiplex streams using tar file fragments.
.SH SYNOPSIS
.B tardemux
[\fI\,-f streamname\/\fR] [\fI\,-a\/\fR] [\fI\,-r\/\fR] [\fI\,file1\/\fR] [\fI\,file2\/\fR] [...]
Expand Down
4 changes: 2 additions & 2 deletions tarmux.1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
.TH TARMUX "1" "January 2020" "tarmux 1.0.3" "User Commands"
.TH TARMUX "1" "January 2020" "tarmux 1.0.4" "User Commands"
.SH NAME
tarmux \- manual page for tarmux 1.0.3
tarmux \- Multiplex streams using tar file fragments.
.SH SYNOPSIS
.B tarmux
[\fI\,-r\/\fR] [\fI\,-f streamname\/\fR] [\fI\,-n sourcename\/\fR] [\fI\,file1\/\fR] [\fI\,file2\/\fR] [...]
Expand Down

0 comments on commit 42d4dd5

Please sign in to comment.