Package: weightwatcher / 1.12+dfsg-3

Don-t-use-up-a-valuable-2-letter-command-name.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
From: Ole Streicher <olebole@debian.org>
Date: Mon, 11 Dec 2017 10:26:01 +0100
Subject: Don't use up a valuable 2-letter command-name

---
 man/Makefile.am | 4 +++-
 man/ww.1.in     | 8 ++++----
 src/Makefile.am | 6 +++---
 src/define.h    | 2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/man/Makefile.am b/man/Makefile.am
index 97c917e..a31653b 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -25,5 +25,7 @@
 #
 #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-dist_man_MANS = ww.1 ww.x
+dist_man_MANS = weightwatcher.1
 
+weightwatcher.1: ww.1
+	cp -f  $< $@
diff --git a/man/ww.1.in b/man/ww.1.in
index eee6274..46dfb40 100644
--- a/man/ww.1.in
+++ b/man/ww.1.in
@@ -1,12 +1,12 @@
-.TH WW "1" "@DATE3@" "WW @PACKAGE_VERSION@" "User Commands"
+.TH WeightWatcher "1" "@DATE3@" "WeightWatcher @PACKAGE_VERSION@" "User Commands"
 .SH NAME
-ww \- combine weight-maps, flag-maps and polygon data
+weightwatcher \- combine weight-maps, flag-maps and polygon data
 .SH SYNOPSIS
-.B ww
+.B weightwatcher
 [\fI-c configuration-file\fR] [\fI-parameter1 value1 -parameter2 value2 ...\fR]
 .RE
 .TP
-.B ww \fI-d\fR
+.B weightwatcher \fI-d\fR
 .SH DESCRIPTION
 WeightWatcher is a program that combines weight-maps, flag-maps and
 polygon data in order to produce control maps which can directly be
diff --git a/src/Makefile.am b/src/Makefile.am
index d711d20..bac2bbc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,12 +26,12 @@
 #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 SUBDIRS			= fits wcs
-bin_PROGRAMS		= ww
-ww_SOURCES		= field.c main.c makeit.c prefs.c readimage.c \
+bin_PROGRAMS		= weightwatcher
+weightwatcher_SOURCES	= field.c main.c makeit.c prefs.c readimage.c \
 			  vector.c \
 			  define.h field.h globals.h key.h prefs.h preflist.h \
 			  readimage.h types.h vector.h fitswcs.c fitswcs.h \
                           wcscelsys.h xml.h xml.c
-ww_LDADD		= $(top_builddir)/src/fits/libfits.a $(top_builddir)/src/wcs/libwcs_c.a
+weightwatcher_LDADD	= $(top_builddir)/src/fits/libfits.a $(top_builddir)/src/wcs/libwcs_c.a
 DATE=`date +"%Y-%m-%d"`
 
diff --git a/src/define.h b/src/define.h
index f5f1209..f90bf3d 100644
--- a/src/define.h
+++ b/src/define.h
@@ -36,7 +36,7 @@
 /*------------------------ what, who, when and where ------------------------*/
 
 #define         BANNER          "WeightWatcher"
-#define		EXECUTABLE	"ww"
+#define		EXECUTABLE	"weightwatcher"
 #define		MYVERSION	VERSION
 #define		COPYRIGHT	"2010 IAP/CNRS/UPMC"
 #define		DISCLAIMER	BANNER " comes with ABSOLUTELY NO WARRANTY\n" \