diff options
| author | Tatsuya Kinoshita <tats@debian.org> | 2015-01-23 16:27:31 +0000 |
|---|---|---|
| committer | Tatsuya Kinoshita <tats@debian.org> | 2015-01-23 16:27:31 +0000 |
| commit | 3565c6159bb1571565365be2f337537a09e44e23 (patch) | |
| tree | 149972eb7d79dbf45fe24e700a1e9c97d7eb54fe | |
| parent | Update debian/copyright (diff) | |
| download | w3m-3565c6159bb1571565365be2f337537a09e44e23.tar.gz w3m-3565c6159bb1571565365be2f337537a09e44e23.zip | |
Update 015_debian-version.patch to 0.5.3+gitYYYYMMDD
| -rw-r--r-- | debian/patches/015_debian-version.patch | 34 |
1 files changed, 32 insertions, 2 deletions
diff --git a/debian/patches/015_debian-version.patch b/debian/patches/015_debian-version.patch index d43b87e..f9373d1 100644 --- a/debian/patches/015_debian-version.patch +++ b/debian/patches/015_debian-version.patch @@ -1,12 +1,42 @@ -Subject: Set CURRENT_VERSION to debian version +Subject: Update CURRENT_VERSION to 0.5.3+gitYYYYMMDD (generate from ChangeLog) From: Tatsuya Kinoshita <tats@debian.org> +diff --git a/acinclude.m4 b/acinclude.m4 +index 52c8874..541cb74 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -6,7 +6,8 @@ dnl w3m autoconf macros + AC_DEFUN([AC_W3M_VERSION], + [AC_SUBST(CURRENT_VERSION) + cvsver=`$AWK '\$[1] ~ /Id:/ { print \$[3]}' $srcdir/ChangeLog` +- sed -e 's/define CURRENT_VERSION "\(.*\)+cvs/define CURRENT_VERSION "\1+cvs-'$cvsver'/' $srcdir/version.c.in > version.c ++ ymdver=`sed -e 's/ .*//;s/-//g;q' $srcdir/ChangeLog` ++ sed -e 's/define CURRENT_VERSION "\(.*\)YYYYMMDD/define CURRENT_VERSION "\1'$ymdver'/;s/define CURRENT_VERSION "\(.*\)+cvs/define CURRENT_VERSION "\1+cvs-'$cvsver'/' $srcdir/version.c.in > version.c + CURRENT_VERSION=`sed -n 's/.*define CURRENT_VERSION *"w3m\/\(.*\)".*$/\1/p' version.c`]) + # + # ---------------------------------------------------------------- +diff --git a/configure b/configure +index 2e37bb1..c09d70a 100755 +--- a/configure ++++ b/configure +@@ -9084,7 +9084,8 @@ _ACEOF + + + cvsver=`$AWK '\$1 ~ /Id:/ { print \$3}' $srcdir/ChangeLog` +- sed -e 's/define CURRENT_VERSION "\(.*\)+cvs/define CURRENT_VERSION "\1+cvs-'$cvsver'/' $srcdir/version.c.in > version.c ++ ymdver=`sed -e 's/ .*//;s/-//g;q' $srcdir/ChangeLog` ++ sed -e 's/define CURRENT_VERSION "\(.*\)YYYYMMDD/define CURRENT_VERSION "\1'$ymdver'/;s/define CURRENT_VERSION "\(.*\)+cvs/define CURRENT_VERSION "\1+cvs-'$cvsver'/' $srcdir/version.c.in > version.c + CURRENT_VERSION=`sed -n 's/.*define CURRENT_VERSION *"w3m\/\(.*\)".*$/\1/p' version.c` + ac_config_files="$ac_config_files Makefile posubst po/Makefile.in scripts/Makefile scripts/dirlist.cgi scripts/w3mhelp.cgi scripts/w3mmail.cgi scripts/xface2xpm scripts/multipart/Makefile scripts/multipart/multipart.cgi scripts/w3mman/Makefile scripts/w3mman/w3mman scripts/w3mman/w3mman.1 scripts/w3mman/w3mman2html.cgi libwc/Makefile w3mimg/Makefile w3mimg/fb/Makefile w3mimg/x11/Makefile w3mimg/win/Makefile w3mhelp-w3m_en.html w3mhelp-w3m_ja.html w3mhelp-lynx_en.html w3mhelp-lynx_ja.html" + +diff --git a/version.c.in b/version.c.in +index 31d30e4..ab25163 100644 --- a/version.c.in +++ b/version.c.in @@ -1,5 +1,5 @@ /* $Id: version.c.in,v 1.49 2012/05/22 09:45:56 inu Exp $ */ -#define CURRENT_VERSION "w3m/0.5.3+cvs" -+#define CURRENT_VERSION "w3m/0.5.3+debian-19" ++#define CURRENT_VERSION "w3m/0.5.3+gitYYYYMMDD" #ifndef FM_H char *w3m_version = CURRENT_VERSION; |