diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-11-20 13:04:34 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-11-20 13:04:34 +0000 |
commit | 491c2e872f08f182d1a918daeefcd5225188cf2d (patch) | |
tree | f99583d3e0cdc568b81082a1f613010c638f1db8 /Build | |
parent | 695d20df01561e83122b87ddadad734195c6b9c8 (diff) |
libs/paper (paperconf): Avoid GNU getopt feature
git-svn-id: svn://tug.org/texlive/trunk@32192 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
5 files changed, 66 insertions, 35 deletions
diff --git a/Build/source/libs/paper/ChangeLog b/Build/source/libs/paper/ChangeLog index 4d4e2e96e51..1c6df7798c4 100644 --- a/Build/source/libs/paper/ChangeLog +++ b/Build/source/libs/paper/ChangeLog @@ -1,3 +1,8 @@ +2013-11-20 Peter Breitenlohner <peb@mppmu.mpg.de> + + * paper.test: Avoid GNU specific getopt features. + Problem reported by Marc Baudoin <babafou@babafou.eu.org>. + 2013-10-24 Peter Breitenlohner <peb@mppmu.mpg.de> Import libpaper-1.1.24+nmu2. diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES/ChangeLog b/Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES/ChangeLog index e6dc24f618b..18b208520a4 100644 --- a/Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES/ChangeLog +++ b/Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES/ChangeLog @@ -1,3 +1,7 @@ +2013-11-20 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-03-getopt: Adapt paperconf.1 to non-GNU getopt. + 2013-10-24 Peter Breitenlohner <peb@mppmu.mpg.de> Imported libpaper-1.1.24+nmu2 source tree from: diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES/patch-03-getopt b/Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES/patch-03-getopt new file mode 100644 index 00000000000..cec650d1108 --- /dev/null +++ b/Build/source/libs/paper/libpaper-1.1.24+nmu2-PATCHES/patch-03-getopt @@ -0,0 +1,49 @@ +diff -ur libpaper-1.1.24+nmu2.orig/man/paperconf.1.in libpaper-1.1.24+nmu2/man/paperconf.1.in +--- libpaper-1.1.24+nmu2.orig/man/paperconf.1.in 2013-10-25 08:27:54.000000000 +0200 ++++ libpaper-1.1.24+nmu2/man/paperconf.1.in 2013-11-20 13:59:18.000000000 +0100 +@@ -3,39 +3,12 @@ + .B paperconf + \- print paper configuration information + .SH SYNOPSIS +-.B paperconf +-[ +-[ +-.B \-p +-] +-.I paper +-| +-.B \-d +-| +-.B \-a +-] +-[ +-.B \-z +-] +-[ +-.B \-n +-| +-.B \-N +-] +-[ +-.B \-s +-| +-.B \-w +-| +-.B \-h +-] +-[ +-.B \-c +-| +-.B \-m +-| +-.B \-i +-] ++\fBpaperconf\fR ++[\fB\-z\fR] ++[\fB\-n\fR|\fB\-N\fR] ++[\fB\-s\fR|\fB\-w\fR|\fB\-h\fR] ++[\fB\-c\fR|\fB\-m\fR|\fB\-i\fR] ++[[\fB\-p\fR] \fIpaper\fR|\fB\-d\fR|\fB\-a\fR] + .SH DESCRIPTION + .B paperconf + prints information about a given paper. diff --git a/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperconf.1.in b/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperconf.1.in index 24cf8c13a85..53cecd83bdd 100644 --- a/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperconf.1.in +++ b/Build/source/libs/paper/libpaper-1.1.24+nmu2/man/paperconf.1.in @@ -3,39 +3,12 @@ .B paperconf \- print paper configuration information .SH SYNOPSIS -.B paperconf -[ -[ -.B \-p -] -.I paper -| -.B \-d -| -.B \-a -] -[ -.B \-z -] -[ -.B \-n -| -.B \-N -] -[ -.B \-s -| -.B \-w -| -.B \-h -] -[ -.B \-c -| -.B \-m -| -.B \-i -] +\fBpaperconf\fR +[\fB\-z\fR] +[\fB\-n\fR|\fB\-N\fR] +[\fB\-s\fR|\fB\-w\fR|\fB\-h\fR] +[\fB\-c\fR|\fB\-m\fR|\fB\-i\fR] +[[\fB\-p\fR] \fIpaper\fR|\fB\-d\fR|\fB\-a\fR] .SH DESCRIPTION .B paperconf prints information about a given paper. diff --git a/Build/source/libs/paper/paper.test b/Build/source/libs/paper/paper.test index d20ebbfec37..ea19f41adb2 100755 --- a/Build/source/libs/paper/paper.test +++ b/Build/source/libs/paper/paper.test @@ -13,7 +13,7 @@ PAPERSIZE=jisB5 ./paperconf -p lETTER -Nsi || exit 1 ./paperconf -dns -./paperconf FOLIO -nw +./paperconf -nw FOLIO -./paperconf legal -Nh +./paperconf -Nh legal |