From c08f541b9568d5e1df76f2ec2654d3f6f3049d40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konrad=20Gr=C3=A4fe?= Date: Mon, 20 Sep 2010 15:31:10 +0200 Subject: [PATCH] * Version 1.7 --- .bzrignore | 7 +++++++ ChangeLog | 6 +++++- VERSION | 2 +- autogen.sh | 33 +++++++++++++-------------------- change_version.sh | 16 +++++++--------- config.h.mingw | 8 ++++---- configure | 22 +++++++++++----------- configure.in | 4 ++-- libtool | 2 +- src/Makefile.mingw | 1 + 10 files changed, 52 insertions(+), 49 deletions(-) diff --git a/.bzrignore b/.bzrignore index a24579c..39c4b88 100644 --- a/.bzrignore +++ b/.bzrignore @@ -56,3 +56,10 @@ po/fr.gmo stamp-h1 po/de.gmo po/ru.gmo +DEB_REVISION +po/cs.gmo +po/nl.gmo +po/pt_BR.gmo +po/sk.gmo +po/ta.gmo +pidgin-birthday-reminder-* diff --git a/ChangeLog b/ChangeLog index 6e0ae8e..cd922d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ +Version 1.7 (2010/09/20): + * Do not longer expect ICS file to be well-formed (Bug #614244) + * Added Brazilian Portuguese, Czech, Dutch, Slovak and Tamil language files (credits on https://translations.launchpad.net/pidgin-birthday-reminder) + Version 1.6 (2010/05/08): * Added hint in preferences menu when sounds are muted - * Added Turkish, Hebrew, Portuguese and Galician language (see credits on https://translations.launchpad.net/pidgin-birthday-reminder) + * Added Turkish, Hebrew, Portuguese and Galician language files (see credits on https://translations.launchpad.net/pidgin-birthday-reminder) Version 1.5 (2010/03/20): * Renamed project to pidgin-birthday-reminder diff --git a/VERSION b/VERSION index 810ee4e..d3bdbdf 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.6 +1.7 diff --git a/autogen.sh b/autogen.sh index e8d97e2..82c2592 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,27 +1,20 @@ #! /bin/sh +set -x -ls VERSION >/dev/null && -ls configure.in.in >/dev/null && -ls COPYING >/dev/null && -echo generating configure.in && +test -f VERSION || exit +test -f configure.in.in || exit +test -f COPYING || exit languages="" for f in po/*.po -do languages="$languages $(basename $f .po)" +do test -f $f && languages="$languages $(basename $f .po)" done -sed -e "s/@@VERSION@@/$(cat VERSION)/" -e "s/@@LANGUAGES@@/$(echo $languages)/" configure.in.in >configure.in && -echo aclocal && -aclocal && -echo autoheader && -autoheader && -echo libtoolize --copy && -libtoolize --copy && -echo automake --add-missing --copy && -automake --add-missing --copy && -echo autoconf && -autoconf && -echo libtoolize --copy --install && -libtoolize --copy --install && -echo intltoolize --copy --force && -intltoolize --copy --force +sed -e "s/@@VERSION@@/$(cat VERSION)/" -e "s/@@LANGUAGES@@/$(echo $languages)/" configure.in.in >configure.in || exit +aclocal || exit +autoheader || exit +libtoolize --copy || exit +automake --add-missing --copy || exit +autoconf || exit +libtoolize --copy --install || exit +intltoolize --copy --force || exit diff --git a/change_version.sh b/change_version.sh index 74244e5..1bc1615 100755 --- a/change_version.sh +++ b/change_version.sh @@ -1,13 +1,11 @@ #!/bin/bash -vim ChangeLog && -vim VERSION && +set -x -languages="" -for f in po/*.po -do languages="$languages $(basename $f .po)" -done +vim ChangeLog || exit +vim VERSION || exit -sed -e "s/@@VERSION@@/$(cat VERSION)/" -e "s/@@LANGUAGES@@/$(echo $languages)/" configure.in.in >configure.in && -./autogen.sh && -./configure && +echo 1 >DEB_REVISION + +./autogen.sh || exit +./configure || exit cp config.h config.h.mingw diff --git a/config.h.mingw b/config.h.mingw index 173b9a1..00e33c3 100644 --- a/config.h.mingw +++ b/config.h.mingw @@ -66,7 +66,7 @@ #define PACKAGE_NAME "pidgin-birthday-reminder" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "pidgin-birthday-reminder 1.6" +#define PACKAGE_STRING "pidgin-birthday-reminder 1.7" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "pidgin-birthday-reminder" @@ -75,7 +75,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.6" +#define PACKAGE_VERSION "1.7" /* Define the plugin author to be used */ #define PLUGIN_AUTHOR "Konrad Gräfe " @@ -87,7 +87,7 @@ #define PLUGIN_STATIC_NAME "birthday-reminder" /* Define the plugin version to be used */ -#define PLUGIN_VERSION "1.6" +#define PLUGIN_VERSION "1.7" /* Define the plugin website to be used */ #define PLUGIN_WEBSITE "http://freakazoid.teamblind.de/2009/02/14/pidgin-birthday-reminder/" @@ -96,4 +96,4 @@ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "1.6" +#define VERSION "1.7" diff --git a/configure b/configure index 9a90b9c..eb303d1 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for pidgin-birthday-reminder 1.6. +# Generated by GNU Autoconf 2.65 for pidgin-birthday-reminder 1.7. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -698,8 +698,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='pidgin-birthday-reminder' PACKAGE_TARNAME='pidgin-birthday-reminder' -PACKAGE_VERSION='1.6' -PACKAGE_STRING='pidgin-birthday-reminder 1.6' +PACKAGE_VERSION='1.7' +PACKAGE_STRING='pidgin-birthday-reminder 1.7' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1459,7 +1459,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-birthday-reminder 1.6 to adapt to many kinds of systems. +\`configure' configures pidgin-birthday-reminder 1.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1530,7 +1530,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of pidgin-birthday-reminder 1.6:";; + short | recursive ) echo "Configuration of pidgin-birthday-reminder 1.7:";; esac cat <<\_ACEOF @@ -1634,7 +1634,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -pidgin-birthday-reminder configure 1.6 +pidgin-birthday-reminder configure 1.7 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -1999,7 +1999,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-birthday-reminder $as_me 1.6, which was +It was created by pidgin-birthday-reminder $as_me 1.7, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2807,7 +2807,7 @@ fi # Define the identity of the package. PACKAGE='pidgin-birthday-reminder' - VERSION='1.6' + VERSION='1.7' cat >>confdefs.h <<_ACEOF @@ -2854,7 +2854,7 @@ ac_config_headers="$ac_config_headers config.h" cat >>confdefs.h <<_ACEOF -#define PLUGIN_VERSION "1.6" +#define PLUGIN_VERSION "1.7" _ACEOF @@ -12483,7 +12483,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-birthday-reminder $as_me 1.6, which was +This file was extended by pidgin-birthday-reminder $as_me 1.7, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12549,7 +12549,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-birthday-reminder config.status 1.6 +pidgin-birthday-reminder config.status 1.7 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff --git a/configure.in b/configure.in index 1eb9af5..914332f 100644 --- 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-birthday-reminder, 1.6) +AC_INIT(pidgin-birthday-reminder, 1.7) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([src/birthday_reminder.c]) AC_CONFIG_HEADER([config.h]) AC_CONFIG_MACRO_DIR([m4]) -AC_DEFINE_UNQUOTED(PLUGIN_VERSION, ["1.6"], [Define the plugin version to be used]) +AC_DEFINE_UNQUOTED(PLUGIN_VERSION, ["1.7"], [Define the plugin version to be used]) AC_DEFINE_UNQUOTED(PLUGIN_WEBSITE, ["http://freakazoid.teamblind.de/2009/02/14/pidgin-birthday-reminder/"], [Define the plugin website to be used]) diff --git a/libtool b/libtool index f21d8fb..e71d99c 100755 --- a/libtool +++ b/libtool @@ -1,7 +1,7 @@ #! /bin/bash # libtool - Provide generalized library-building support services. -# Generated automatically by config.status (pidgin-birthday-reminder) 1.6 +# Generated automatically by config.status (pidgin-birthday-reminder) 1.7 # Libtool was configured on host midas: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # diff --git a/src/Makefile.mingw b/src/Makefile.mingw index 59cbeba..19b37c2 100644 --- a/src/Makefile.mingw +++ b/src/Makefile.mingw @@ -43,6 +43,7 @@ INCLUDE_PATHS += -I. \ -I$(PIDGIN_TOP)/win32 \ -I$(GTK_TOP)/include \ -I$(GTK_TOP)/include/gtk-2.0 \ + -I$(GTK_TOP)/include/cairo \ -I$(GTK_TOP)/include/glib-2.0 \ -I$(GTK_TOP)/include/pango-1.0 \ -I$(GTK_TOP)/include/atk-1.0 \