* Version 1.4 from 2012/02/29

I forgot to commit :( Unfortunately it's not the clean Version 1.4 since there were translation changes in the meanwhile...
kgraefe · Jul 26, 2016 · 40b30a5 · 40b30a5
1 parent 73f4350
commit 40b30a5
Show file tree

Hide file tree

Showing 17 changed files with 65 additions and 50 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,4 +1,4 @@
-Version 1.4 (????/??/??):
+Version 1.4 (2012/02/29):
 	* Process self-posted incoming messages too. (This happens e.g. when using ZNC behind an irssi-proxy.) Really! ;)
 	  Please make sure to read https://bugs.launchpad.net/pidgin-znc-helper/+bug/900754 carefully!
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.3.2-pre1
+1.4
diff --git a/build-debian-package.sh b/build-debian-package.sh
@@ -3,8 +3,12 @@
 PROJECT=pidgin-znchelper
 VERSION=$(cat VERSION)
 REPOSITORY=ppa:konradgraefe/pidgin-plugins
-#DISTRIBUTIONS="natty lucid maverick"
-DISTRIBUTIONS="precise oneiric"
+if [ -f ../DEBIAN_DISTRIBUTIONS ]; then
+	DISTRIBUTIONS=$(cat ../DEBIAN_DISTRIBUTIONS)
+else
+	#DISTRIBUTIONS="natty lucid maverick"
+	DISTRIBUTIONS="precise oneiric"
+fi
 
 if [ -f DEB_REVISION ]; then
 	DEB_REVISION=$(cat DEB_REVISION)

diff --git a/build-win32-package.sh b/build-win32-package.sh
@@ -1,18 +1,29 @@
 #!/bin/bash
-make -f Makefile.mingw clean && \
-make -f Makefile.mingw && \
-PROJECT=pidgin-znchelper && \
-WIN32DIR=${PROJECT}-`cat VERSION`-win32 && \
-mkdir -p ${WIN32DIR}/pidgin/plugins && \
-mkdir -p ${WIN32DIR}/pidgin/locale/de/LC_MESSAGES && \
-sed 's/$/\r/' ChangeLog >${WIN32DIR}/ChangeLog.txt && \
-sed 's/$/\r/' README.win32 >${WIN32DIR}/ReadMe.txt && \
-cp src/${PROJECT}.dll ${WIN32DIR}/pidgin/plugins && \
-i586-mingw32msvc-strip --strip-unneeded ${WIN32DIR}/pidgin/plugins/${PROJECT}.dll && \
-cp po/de.gmo ${WIN32DIR}/pidgin/locale/de/LC_MESSAGES/${PROJECT}.mo && \
-rm -f ${WIN32DIR}.zip && \
-cd ${WIN32DIR} && \
-zip -r ../${WIN32DIR}.zip * && \
-cd .. && \
-rm -rf ${WIN32DIR}
+set -x
+
+PROJECT=pidgin-znchelper
+WIN32DIR=${PROJECT}-$(cat VERSION)-win32
+
+test -f README.win32 || exit
+
+make -f Makefile.mingw clean || exit
+make -f Makefile.mingw || exit
+mkdir -p ${WIN32DIR}/pidgin/plugins || exit
+sed 's/$/\r/' ChangeLog >${WIN32DIR}/ChangeLog.txt || exit
+sed 's/$/\r/' README.win32 >${WIN32DIR}/ReadMe.txt || exit
+cp src/${PROJECT}.dll ${WIN32DIR}/pidgin/plugins || exit
+#i586-mingw32msvc-strip --strip-unneeded ${WIN32DIR}/pidgin/plugins/${PROJECT}.dll || exit
+for f in po/*.po; do
+	if [ -f $f ]; then
+		lang=$(basename $f .po)
+		mkdir -p ${WIN32DIR}/pidgin/locale/${lang}/LC_MESSAGES || exit
+		cp po/${lang}.gmo ${WIN32DIR}/pidgin/locale/${lang}/LC_MESSAGES/${PROJECT}.mo || exit
+	fi
+done
+rm -f ${WIN32DIR}.zip || exit
+cd ${WIN32DIR} || exit
+zip -r ../${WIN32DIR}.zip * || exit
+cd .. || exit
+rm -rf ${WIN32DIR} || exit
 echo "filename: ${WIN32DIR}.zip"
+
diff --git a/config.h.mingw b/config.h.mingw
@@ -66,7 +66,7 @@
 #define PACKAGE_NAME "pidgin-znchelper"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "pidgin-znchelper 1.3.2-pre1"
+#define PACKAGE_STRING "pidgin-znchelper 1.4"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "pidgin-znchelper"
@@ -75,7 +75,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.3.2-pre1"
+#define PACKAGE_VERSION "1.4"
 
 /* Define the plugin author to be used */
 #define PLUGIN_AUTHOR "Konrad Gräfe <freakazoid@teamblind.de>"
@@ -90,7 +90,7 @@
 #define PLUGIN_STATIC_NAME "znchelper"
 
 /* Define the plugin version to be used */
-#define PLUGIN_VERSION "1.3.2-pre1"
+#define PLUGIN_VERSION "1.4"
 
 /* Define the plugin website to be used */
 #define PLUGIN_WEBSITE "http://freakazoid.teamblind.de/2009/11/16/pidgin-znc-helper/"
@@ -99,4 +99,4 @@
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "1.3.2-pre1"
+#define VERSION "1.4"
diff --git a/configure b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for pidgin-znchelper 1.3.2-pre1.
+# Generated by GNU Autoconf 2.67 for pidgin-znchelper 1.4.
 #
 # Report bugs to <freakazoid@teamblind.de>.
 #
@@ -701,8 +701,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='pidgin-znchelper'
 PACKAGE_TARNAME='pidgin-znchelper'
-PACKAGE_VERSION='1.3.2-pre1'
-PACKAGE_STRING='pidgin-znchelper 1.3.2-pre1'
+PACKAGE_VERSION='1.4'
+PACKAGE_STRING='pidgin-znchelper 1.4'
 PACKAGE_BUGREPORT='freakazoid@teamblind.de'
 PACKAGE_URL=''
 
@@ -1467,7 +1467,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures pidgin-znchelper 1.3.2-pre1 to adapt to many kinds of systems.
+\`configure' configures pidgin-znchelper 1.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1538,7 +1538,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of pidgin-znchelper 1.3.2-pre1:";;
+     short | recursive ) echo "Configuration of pidgin-znchelper 1.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1646,7 +1646,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-pidgin-znchelper configure 1.3.2-pre1
+pidgin-znchelper configure 1.4
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2015,7 +2015,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by pidgin-znchelper $as_me 1.3.2-pre1, which was
+It was created by pidgin-znchelper $as_me 1.4, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -2830,7 +2830,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='pidgin-znchelper'
- VERSION='1.3.2-pre1'
+ VERSION='1.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2877,7 +2877,7 @@ ac_config_headers="$ac_config_headers config.h"
 
 
 cat >>confdefs.h <<_ACEOF
-#define PLUGIN_VERSION "1.3.2-pre1"
+#define PLUGIN_VERSION "1.4"
 _ACEOF
 
 
@@ -12513,7 +12513,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by pidgin-znchelper $as_me 1.3.2-pre1, which was
+This file was extended by pidgin-znchelper $as_me 1.4, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -12579,7 +12579,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-pidgin-znchelper config.status 1.3.2-pre1
+pidgin-znchelper config.status 1.4
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.in b/configure.in
@@ -2,13 +2,13 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
-AC_INIT(pidgin-znchelper, 1.3.2-pre1, freakazoid@teamblind.de)
+AC_INIT(pidgin-znchelper, 1.4, freakazoid@teamblind.de)
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([src/znchelper.c])
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
-AC_DEFINE_UNQUOTED(PLUGIN_VERSION, ["1.3.2-pre1"], [Define the plugin version to be used])
+AC_DEFINE_UNQUOTED(PLUGIN_VERSION, ["1.4"], [Define the plugin version to be used])
 
 AC_DEFINE_UNQUOTED(PLUGIN_WEBSITE, ["http://freakazoid.teamblind.de/2009/11/16/pidgin-znc-helper/"], [Define the plugin website to be used])
 

diff --git a/libtool b/libtool
@@ -1,7 +1,7 @@
 #! /bin/bash
 
 # libtool - Provide generalized library-building support services.
-# Generated automatically by config.status (pidgin-znchelper) 1.3.2-pre1
+# Generated automatically by config.status (pidgin-znchelper) 1.4
 # Libtool was configured on host ponyslaystation:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
@@ -86,7 +86,7 @@ NM="/usr/bin/nm -B"
 LN_S="ln -s"
 
 # What is the maximum length of a command?
-max_cmd_len=805306365
+max_cmd_len=1572864
 
 # Object file suffix (normally "o").
 objext=o

diff --git a/po/Makefile.in b/po/Makefile.in
@@ -19,7 +19,7 @@
 
 GETTEXT_PACKAGE = pidgin-znchelper
 PACKAGE = pidgin-znchelper
-VERSION = 1.3.2-pre1
+VERSION = 1.4
 
 SHELL = /bin/bash
 

diff --git a/po/de.gmo b/po/de.gmo
diff --git a/po/de.po b/po/de.po
@@ -7,17 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk-freakazoid-znchelper 0.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-09 05:35+0000\n"
+"POT-Creation-Date: 2012-02-29 20:35+0100\n"
 "PO-Revision-Date: 2010-07-29 11:47+0000\n"
 "Last-Translator: kgraefe <Unknown>\n"
 "Language-Team: de_DE <freakazoid@teamblind.de>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Launchpad-Export-Date: 2013-07-10 05:32+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
-"Language: \n"
 
 #: ../src/messageparser.c:106
 msgid "Buffer Playback..."

diff --git a/po/es.gmo b/po/es.gmo
diff --git a/po/es.po b/po/es.po
@@ -7,17 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin-znc-helper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-09 05:35+0000\n"
+"POT-Creation-Date: 2012-02-29 20:35+0100\n"
 "PO-Revision-Date: 2012-06-21 15:41+0000\n"
 "Last-Translator: Eduardo Alberto Calvo <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Launchpad-Export-Date: 2013-07-10 05:32+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
-"Language: es\n"
 
 #: ../src/messageparser.c:106
 msgid "Buffer Playback..."

diff --git a/po/pidgin-znchelper.pot b/po/pidgin-znchelper.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-29 20:31+0100\n"
+"POT-Creation-Date: 2012-02-29 20:35+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/po/ru.gmo b/po/ru.gmo
diff --git a/po/ru.po b/po/ru.po
@@ -7,18 +7,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin-znc-helper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-09 05:35+0000\n"
+"POT-Creation-Date: 2012-02-29 20:35+0100\n"
 "PO-Revision-Date: 2010-11-18 06:58+0000\n"
 "Last-Translator: Ushakov Maxim <msincster@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Launchpad-Export-Date: 2013-07-10 05:32+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
-"Language: ru\n"
 
 #: ../src/messageparser.c:106
 msgid "Buffer Playback..."

diff --git a/src/prefs.c b/src/prefs.c
@@ -1,6 +1,6 @@
 /*
  * ZNC Helper
- * Copyright (C) 2013 Konrad Gräfe
+ * Copyright (C) 2012 Konrad Gräfe
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License