From 6cf54d6515536adaa996833e5c23b0beacb865aa Mon Sep 17 00:00:00 2001
From: TingPing <tingping@tingping.se>
Date: Sun, 1 Jun 2014 11:29:20 -0400
Subject: Remove some hardcoded version numbers

- man page
- makebundle.sh
---
 .gitignore            |  1 +
 configure.ac          |  1 +
 data/man/Makefile.am  |  2 ++
 data/man/hexchat.1    | 55 ---------------------------------------------------
 data/man/hexchat.1.in | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++
 osx/makebundle.sh     |  3 ++-
 6 files changed, 61 insertions(+), 56 deletions(-)
 delete mode 100644 data/man/hexchat.1
 create mode 100644 data/man/hexchat.1.in

diff --git a/.gitignore b/.gitignore
index fa424ecf..268ec4fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,6 +38,7 @@ po/POTFILES
 po/remove-potcdate.sed
 po/stamp-*
 osx/Info.plist
+data/man/hexchat.1
 data/pkgconfig/hexchat-plugin.pc
 data/misc/hexchat.appdata.xml
 data/misc/hexchat.desktop
diff --git a/configure.ac b/configure.ac
index eed360be..60041231 100644
--- a/configure.ac
+++ b/configure.ac
@@ -829,6 +829,7 @@ data/Makefile
 data/icons/Makefile
 data/misc/Makefile
 data/man/Makefile
+data/man/hexchat.1
 data/pkgconfig/Makefile
 data/pkgconfig/hexchat-plugin.pc
 src/Makefile
diff --git a/data/man/Makefile.am b/data/man/Makefile.am
index f833cfe1..a967701c 100644
--- a/data/man/Makefile.am
+++ b/data/man/Makefile.am
@@ -1 +1,3 @@
 man_MANS = hexchat.1
+
+EXTRA_DIST = hexchat.1.in
diff --git a/data/man/hexchat.1 b/data/man/hexchat.1
deleted file mode 100644
index 4208238d..00000000
--- a/data/man/hexchat.1
+++ /dev/null
@@ -1,55 +0,0 @@
-.TH HEXCHAT "1" "April 2013" "HexChat 2.9.6" "User Commands"
-.SH NAME
-HexChat \- IRC Client
-.SH DESCRIPTION
-.SS "Usage:"
-.IP
-hexchat [OPTION...] URL
-.SS "Help Options:"
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-Show help options
-.TP
-\fB\-\-help\-all\fR
-Show all help options
-.TP
-\fB\-\-help\-gtk\fR
-Show GTK+ Options
-.SS "Application Options:"
-.TP
-\fB\-a\fR, \fB\-\-no\-auto\fR
-Don't auto connect to servers
-.TP
-\fB\-d\fR, \fB\-\-cfgdir\fR=\fIPATH\fR
-Use a different config directory
-.TP
-\fB\-n\fR, \fB\-\-no\-plugins\fR
-Don't auto load any plugins
-.TP
-\fB\-p\fR, \fB\-\-plugindir\fR
-Show plugin auto\-load directory
-.TP
-\fB\-u\fR, \fB\-\-configdir\fR
-Show user config directory
-.TP
-\fB\-\-url\fR=\fIURL\fR
-Open an irc://server:port/channel?key URL
-.TP
-\fB\-c\fR, \fB\-\-command\fR=\fICOMMAND\fR
-Execute command:
-.TP
-\fB\-e\fR, \fB\-\-existing\fR
-Open URL or execute command in an existing HexChat
-.TP
-\fB\-\-minimize\fR=\fIlevel\fR
-Begin minimized. Level 0=Normal 1=Iconified 2=Tray
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Show version information
-.TP
-\fB\-\-display\fR=\fIDISPLAY\fR
-X display to use
-
-.SH AUTHOR
-This manual page was written by Davide Puricelli <evo@debian.org> for the Debian GNU/Linux system (but
-may be used by others).
diff --git a/data/man/hexchat.1.in b/data/man/hexchat.1.in
new file mode 100644
index 00000000..1445cc94
--- /dev/null
+++ b/data/man/hexchat.1.in
@@ -0,0 +1,55 @@
+.TH HEXCHAT "1" "April 2013" "HexChat @VERSION@" "User Commands"
+.SH NAME
+HexChat \- IRC Client
+.SH DESCRIPTION
+.SS "Usage:"
+.IP
+hexchat [OPTION...] URL
+.SS "Help Options:"
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Show help options
+.TP
+\fB\-\-help\-all\fR
+Show all help options
+.TP
+\fB\-\-help\-gtk\fR
+Show GTK+ Options
+.SS "Application Options:"
+.TP
+\fB\-a\fR, \fB\-\-no\-auto\fR
+Don't auto connect to servers
+.TP
+\fB\-d\fR, \fB\-\-cfgdir\fR=\fIPATH\fR
+Use a different config directory
+.TP
+\fB\-n\fR, \fB\-\-no\-plugins\fR
+Don't auto load any plugins
+.TP
+\fB\-p\fR, \fB\-\-plugindir\fR
+Show plugin auto\-load directory
+.TP
+\fB\-u\fR, \fB\-\-configdir\fR
+Show user config directory
+.TP
+\fB\-\-url\fR=\fIURL\fR
+Open an irc://server:port/channel?key URL
+.TP
+\fB\-c\fR, \fB\-\-command\fR=\fICOMMAND\fR
+Execute command:
+.TP
+\fB\-e\fR, \fB\-\-existing\fR
+Open URL or execute command in an existing HexChat
+.TP
+\fB\-\-minimize\fR=\fIlevel\fR
+Begin minimized. Level 0=Normal 1=Iconified 2=Tray
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Show version information
+.TP
+\fB\-\-display\fR=\fIDISPLAY\fR
+X display to use
+
+.SH AUTHOR
+This manual page was written by Davide Puricelli <evo@debian.org> for the Debian GNU/Linux system (but
+may be used by others).
diff --git a/osx/makebundle.sh b/osx/makebundle.sh
index df783e9a..930e72aa 100755
--- a/osx/makebundle.sh
+++ b/osx/makebundle.sh
@@ -22,4 +22,5 @@ find ./HexChat.app/Contents/Resources/lib/python2.7 -name "*.pyo" -delete
 
 echo "Compressing bundle"
 #hdiutil create -format UDBZ -srcdir HexChat.app -quiet HexChat-2.9.6.1-$(git rev-parse --short master).dmg
-zip -9rXq ./HexChat-2.9.6.1-$(git rev-parse --short master).app.zip ./HexChat.app 
+zip -9rXq ./HexChat-$(git describe --tags).app.zip ./HexChat.app
+
-- 
cgit 1.4.1