From c9fa676823ced65838ce410e548014ff75626ece Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Wed, 11 Jun 2008 19:41:10 +0100 Subject: Mark release as 1.1.13, not 1.1.12.1. --- ChangeLog | 2 +- configure.ac | 2 +- debian/changelog | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 364f06496..1ddd6c3a5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -xine-lib (1.1.12.1) 2008-??-?? +xine-lib (1.1.13) 2008-??-?? * Security fixes: - Buffer overflow in the NSF demuxer which may allow remote attackers to cause a denial of service (crash) or possibly execute arbitrary code diff --git a/configure.ac b/configure.ac index 42a56cc3e..2a3689fdc 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ dnl XINE_SUB += 1; XINE_PATCH = ''; continue with XINE_LT_* values below dnl XINE_MAJOR=1 XINE_MINOR=1 -XINE_SUB=12 +XINE_SUB=13 dnl XINE_PATCH should be left empty or set to ".1" or ".2" or something similar XINE_PATCH= dnl Release series number (usually $XINE_MAJOR.$XINE_MINOR) diff --git a/debian/changelog b/debian/changelog index cd6e353a3..b2a4a7fba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xine-lib (1.1.12~hg-0) unstable; urgency=low +xine-lib (1.1.13~hg-0) unstable; urgency=low [ Darren Salt ] * Hg snapshot. -- cgit v1.2.3 From ecd1d68fa6221278496fedef976acf72888de6e0 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Thu, 12 Jun 2008 02:21:44 +0100 Subject: Undeprecate xine_register_log_cb. --- include/xine.h.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/xine.h.in b/include/xine.h.in index 1e68a14ce..62cfa8747 100644 --- a/include/xine.h.in +++ b/include/xine.h.in @@ -852,7 +852,7 @@ char *const *xine_get_log (xine_t *self, int buf) XINE_PROTECTED; /* log callback will be called whenever something is logged */ typedef void (*xine_log_cb_t) (void *user_data, int section); void xine_register_log_cb (xine_t *self, xine_log_cb_t cb, - void *user_data) XINE_PROTECTED XINE_DEPRECATED; + void *user_data) XINE_PROTECTED; /* * error handling / engine status -- cgit v1.2.3