diff --git a/.bzrignore b/.bzrignore index 2b0c3ac..8675cdd 100644 --- a/.bzrignore +++ b/.bzrignore @@ -53,3 +53,4 @@ po/es.gmo po/fr.gmo po/es.gmo po/fr.gmo +stamp-h1 diff --git a/ChangeLog b/ChangeLog index 6d51a40..6e0ae8e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,12 +1,16 @@ +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) + Version 1.5 (2010/03/20): * Renamed project to pidgin-birthday-reminder * Added tabs in the preferences window * iCalendar files are forced to have the .ics extension now - * Added spanish translation (many thanks to Christoph Miebach) + * Added Spanish translation (many thanks to Christoph Miebach) Version 1.4 (2010/03/03): * Added iCalendar export - * Added french translation (many thanks to Pierre Etchemaïté) + * Added French translation (many thanks to Pierre Etchemaïté) Version 1.3 (2009/12/14): * Fixed IM to wrong contact when using notifications @@ -21,17 +25,17 @@ Version 1.2 (2009/07/05): * Added ReadMe-Files Version 1.1 (2009/05/15): - * Added russian translation (many thanks to Alexander Logvinov) + * Added Russian translation (many thanks to Alexander Logvinov) Version 1.0 (2009/02/13): * (First?) final release * Fixed a crash with gtk_widget_destroy() * Fixed wrong calculation of days before alert * If you switch an account to "online" the plugin will just check those buddies' birthday - * Fixed a translation issue in the german version + * Fixed a translation issue in the German version Version 0.6 (2009/02/10): - * Fixed a bug which prevents the plugin from scanning buddies where the birhtday was removed by hand + * Fixed a bug which prevents the plugin from scanning buddies where the birthday was removed by hand * Contacts will be handled in a better way now * Buddy List will be shown when birthday check was triggert by the tray menu item * Added the ability to disable the scan per account diff --git a/Makefile.mingw b/Makefile.mingw index 3a5226c..9ed0fe8 100644 --- a/Makefile.mingw +++ b/Makefile.mingw @@ -8,11 +8,11 @@ # PATHS # -BIRTHDAY_REMINDER_SRC := ./src -BIRTHDAY_REMINDER_PO := ./po +PLUGIN_SRC := ./src +PLUGIN_PO := ./po -BIRTHDAY_REMINDER_TOP := . --include $(BIRTHDAY_REMINDER_TOP)/local.mak +PLUGIN_TOP := . +-include $(PLUGIN_TOP)/local.mak PIDGIN_TREE_TOP ?= ../../.. include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak @@ -21,23 +21,23 @@ include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak ## VARIABLE DEFINITIONS ## -BIRTHDAY_REMINDER_VERSION := $(shell cat ./VERSION) +PLUGIN_VERSION := $(shell cat ./VERSION) PIDGIN_VERSION := $(shell cat $(PIDGIN_TREE_TOP)/VERSION) .PHONY: all install installer clean all: - $(MAKE) -C $(BIRTHDAY_REMINDER_SRC) -f Makefile.mingw - $(MAKE) -C $(BIRTHDAY_REMINDER_PO) -f Makefile.mingw + $(MAKE) -C $(PLUGIN_SRC) -f Makefile.mingw + $(MAKE) -C $(PLUGIN_PO) -f Makefile.mingw config.h: config.h.mingw cp config.h.mingw config.h install: all - $(MAKE) -C $(BIRTHDAY_REMINDER_SRC) -f Makefile.mingw install - $(MAKE) -C $(BIRTHDAY_REMINDER_PO) -f Makefile.mingw install + $(MAKE) -C $(PLUGIN_SRC) -f Makefile.mingw install + $(MAKE) -C $(PLUGIN_PO) -f Makefile.mingw install clean: - $(MAKE) -C $(BIRTHDAY_REMINDER_SRC) -f Makefile.mingw clean + $(MAKE) -C $(PLUGIN_SRC) -f Makefile.mingw clean rm -f config.h diff --git a/VERSION b/VERSION index c239c60..810ee4e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.5 +1.6 diff --git a/build-debian-package.sh b/build-debian-package.sh index 71917e5..5003246 100755 --- a/build-debian-package.sh +++ b/build-debian-package.sh @@ -63,4 +63,6 @@ do if [ "$in" == "y" ]; then dput ${REPOSITORY} ${PROJECT}_${VERSION}-${DEB_REVISION}_source.changes fi + + cd ${src_dir} done diff --git a/build-win32-package.sh b/build-win32-package.sh index c63ab65..aa27211 100755 --- a/build-win32-package.sh +++ b/build-win32-package.sh @@ -4,6 +4,7 @@ make -f Makefile.mingw && \ PROJECT=pidgin-birthday-reminder && \ OLDPROJECTNAME=birthday_reminder && \ WIN32DIR=${PROJECT}-$(cat VERSION)-win32 && \ +rm -rf ${WIN32DIR} && \ mkdir -p ${WIN32DIR}/pidgin/plugins && \ mkdir -p ${WIN32DIR}/pidgin/pixmaps/pidgin/${OLDPROJECTNAME} && \ mkdir -p ${WIN32DIR}/pidgin/sounds/pidgin/${OLDPROJECTNAME} && \ @@ -13,7 +14,8 @@ cp src/${PROJECT}.dll ${WIN32DIR}/pidgin/plugins && \ cp share/pixmaps/*.png ${WIN32DIR}/pidgin/pixmaps/pidgin/${OLDPROJECTNAME} && \ cp share/sounds/*.wav ${WIN32DIR}/pidgin/sounds/pidgin/${OLDPROJECTNAME} && \ i586-mingw32msvc-strip --strip-unneeded ${WIN32DIR}/pidgin/plugins/${PROJECT}.dll && \ -for lang in de ru fr es tr he; do +for f in po/*.po; do + lang=$(basename $f .po) mkdir -p ${WIN32DIR}/pidgin/locale/${lang}/LC_MESSAGES && \ cp po/${lang}.gmo ${WIN32DIR}/pidgin/locale/${lang}/LC_MESSAGES/${PROJECT}.mo done && \ diff --git a/config.h.mingw b/config.h.mingw index 2d23691..173b9a1 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.5" +#define PACKAGE_STRING "pidgin-birthday-reminder 1.6" /* 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.5" +#define PACKAGE_VERSION "1.6" /* 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.5" +#define PLUGIN_VERSION "1.6" /* 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.5" +#define VERSION "1.6" diff --git a/configure b/configure index aa73ff4..10af03e 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.64 for pidgin-birthday-reminder 1.5. +# Generated by GNU Autoconf 2.64 for pidgin-birthday-reminder 1.6. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software @@ -695,8 +695,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='pidgin-birthday-reminder' PACKAGE_TARNAME='pidgin-birthday-reminder' -PACKAGE_VERSION='1.5' -PACKAGE_STRING='pidgin-birthday-reminder 1.5' +PACKAGE_VERSION='1.6' +PACKAGE_STRING='pidgin-birthday-reminder 1.6' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1456,7 +1456,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.5 to adapt to many kinds of systems. +\`configure' configures pidgin-birthday-reminder 1.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1527,7 +1527,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of pidgin-birthday-reminder 1.5:";; + short | recursive ) echo "Configuration of pidgin-birthday-reminder 1.6:";; esac cat <<\_ACEOF @@ -1631,7 +1631,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -pidgin-birthday-reminder configure 1.5 +pidgin-birthday-reminder configure 1.6 generated by GNU Autoconf 2.64 Copyright (C) 2009 Free Software Foundation, Inc. @@ -1996,7 +1996,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.5, which was +It was created by pidgin-birthday-reminder $as_me 1.6, which was generated by GNU Autoconf 2.64. Invocation command line was $ $0 $@ @@ -2804,7 +2804,7 @@ fi # Define the identity of the package. PACKAGE='pidgin-birthday-reminder' - VERSION='1.5' + VERSION='1.6' cat >>confdefs.h <<_ACEOF @@ -2851,7 +2851,7 @@ ac_config_headers="$ac_config_headers config.h" cat >>confdefs.h <<_ACEOF -#define PLUGIN_VERSION "1.5" +#define PLUGIN_VERSION "1.6" _ACEOF @@ -12455,7 +12455,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.5, which was +This file was extended by pidgin-birthday-reminder $as_me 1.6, which was generated by GNU Autoconf 2.64. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12519,7 +12519,7 @@ Report bugs to the package provider." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -pidgin-birthday-reminder config.status 1.5 +pidgin-birthday-reminder config.status 1.6 configured by $0, generated by GNU Autoconf 2.64, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.in b/configure.in index ddd6caf..9e72576 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.5) +AC_INIT(pidgin-birthday-reminder, 1.6) 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.5"], [Define the plugin version to be used]) +AC_DEFINE_UNQUOTED(PLUGIN_VERSION, ["1.6"], [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 0142f42..165bbcc 100755 --- a/libtool +++ b/libtool @@ -1,8 +1,8 @@ #! /bin/bash # libtool - Provide generalized library-building support services. -# Generated automatically by config.status (pidgin-birthday-reminder) 1.5 -# Libtool was configured on host ponyslaystation: +# Generated automatically by config.status (pidgin-birthday-reminder) 1.6 +# Libtool was configured on host midas: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -237,7 +237,7 @@ hardcode_into_libs=yes sys_lib_search_path_spec="/usr/lib/gcc/i486-linux-gnu/4.4.1 /usr/lib /lib /usr/lib/i486-linux-gnu" # Run-time system search path for libraries. -sys_lib_dlsearch_path_spec="/lib /usr/lib /lib/i486-linux-gnu /usr/lib/i486-linux-gnu /usr/lib/alsa-lib /usr/local/lib /usr/lib/vmware-tools/lib32/libvmGuestLib.so /usr/lib/vmware-tools/lib64/libvmGuestLib.so /usr/lib/vmware-tools/lib32/libvmGuestLibJava.so /usr/lib/vmware-tools/lib64/libvmGuestLibJava.so /usr/lib/vmware-tools/lib32/libDeployPkg.so /usr/lib/vmware-tools/lib64/libDeployPkg.so " +sys_lib_dlsearch_path_spec="/lib /usr/lib /lib/i486-linux-gnu /usr/lib/i486-linux-gnu /usr/lib/alsa-lib /usr/local/lib " # Whether dlopen is supported. dlopen_support=unknown diff --git a/po/Makefile.mingw b/po/Makefile.mingw index a0743ee..fd13180 100644 --- a/po/Makefile.mingw +++ b/po/Makefile.mingw @@ -3,8 +3,8 @@ # Description: Makefile to generate mo files # -BIRTHDAY_REMINDER_TOP := .. --include $(BIRTHDAY_REMINDER_TOP)/local.mak +PLUGIN_TOP := .. +-include $(PLUGIN_TOP)/local.mak PIDGIN_TREE_TOP ?= ../../../.. include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak diff --git a/po/de.gmo b/po/de.gmo index 457aced..6846c7b 100644 Binary files a/po/de.gmo and b/po/de.gmo differ diff --git a/po/ru.gmo b/po/ru.gmo index dc902c2..264f9fd 100644 Binary files a/po/ru.gmo and b/po/ru.gmo differ diff --git a/src/Makefile.mingw b/src/Makefile.mingw index 12e374f..59cbeba 100644 --- a/src/Makefile.mingw +++ b/src/Makefile.mingw @@ -7,24 +7,24 @@ # PATHS # -BIRTHDAY_REMINDER_TOP := .. --include $(BIRTHDAY_REMINDER_TOP)/local.mak +PLUGIN_TOP := .. +-include $(PLUGIN_TOP)/local.mak PIDGIN_TREE_TOP ?= ../../../.. include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak -BIRTHDAY_REMINDER_VERSION := $(shell cat ${BIRTHDAY_REMINDER_TOP}/VERSION) +PLUGIN_VERSION := $(shell cat ${PLUGIN_TOP}/VERSION) ## ## VARIABLE DEFINITIONS ## -BIRTHDAY_REMINDER = pidgin-birthday-reminder +PLUGIN = pidgin-birthday-reminder # Compiler Options #CFLAGS = -DEFINES = -DBIRTHDAY_REMINDER_VERSION=\"$(BIRTHDAY_REMINDER_VERSION)\" -DGETTEXT_PACKAGE=\"$(BIRTHDAY_REMINDER)\" -DHAVE_CONFIG_H +DEFINES = -DBIRTHDAY_REMINDER_VERSION=\"$(PLUGIN_VERSION)\" -DGETTEXT_PACKAGE=\"$(PLUGIN)\" -DHAVE_CONFIG_H #LDFLAGS = @@ -62,7 +62,7 @@ LIB_PATHS = \ ## SOURCES, OBJECTS ## -BIRTHDAY_REMINDER_SRC = \ +PLUGIN_SRC = \ birthday_reminder.c \ functions.c \ pidgin_internals.c \ @@ -80,7 +80,7 @@ BIRTHDAY_REMINDER_SRC = \ icsexport.c -BIRTHDAY_REMINDER_OBJ = $(BIRTHDAY_REMINDER_SRC:%.c=%.o) +PLUGIN_OBJ = $(PLUGIN_SRC:%.c=%.o) ## ## LIBRARIES @@ -108,22 +108,22 @@ include $(PIDGIN_COMMON_RULES) .PHONY: all clean install -all: $(BIRTHDAY_REMINDER).dll +all: $(PLUGIN).dll install: all $(PIDGIN_INSTALL_PLUGINS_DIR) - cp $(BIRTHDAY_REMINDER).dll $(PIDGIN_INSTALL_PLUGINS_DIR) + cp $(PLUGIN).dll $(PIDGIN_INSTALL_PLUGINS_DIR) -$(BIRTHDAY_REMINDER_OBJ): $(BIRTHDAY_REMINDER_TOP)/config.h $(PURPLE_VERSION_H) +$(PLUGIN_OBJ): $(PLUGIN_TOP)/config.h $(PURPLE_VERSION_H) -$(BIRTHDAY_REMINDER_TOP)/config.h: $(BIRTHDAY_REMINDER_TOP)/config.h.mingw - $(MAKE) -C $(BIRTHDAY_REMINDER_TOP) -f Makefile.mingw config.h +$(PLUGIN_TOP)/config.h: $(PLUGIN_TOP)/config.h.mingw + $(MAKE) -C $(PLUGIN_TOP) -f Makefile.mingw config.h ## ## BUILD DLL ## -$(BIRTHDAY_REMINDER).dll: $(PIDGIN_DLL).a $(BIRTHDAY_REMINDER_OBJ) - $(CC) -shared $(BIRTHDAY_REMINDER_OBJ) $(LIB_PATHS) $(PLUGIN_LIBS) $(DLL_LD_FLAGS) -o $(BIRTHDAY_REMINDER).dll +$(PLUGIN).dll: $(PIDGIN_DLL).a $(PLUGIN_OBJ) + $(CC) -shared $(PLUGIN_OBJ) $(LIB_PATHS) $(PLUGIN_LIBS) $(DLL_LD_FLAGS) -o $(PLUGIN).dll ## @@ -132,6 +132,6 @@ $(BIRTHDAY_REMINDER).dll: $(PIDGIN_DLL).a $(BIRTHDAY_REMINDER_OBJ) clean: rm -f *.o - rm -f $(BIRTHDAY_REMINDER).dll + rm -f $(PLUGIN).dll include $(PIDGIN_COMMON_TARGETS) diff --git a/stamp-h1 b/stamp-h1 deleted file mode 100644 index 4547fe1..0000000 --- a/stamp-h1 +++ /dev/null @@ -1 +0,0 @@ -timestamp for config.h