From 6e3d5fe4ef71ae09e3fd71f8844b63e17ab3aeb6 Mon Sep 17 00:00:00 2001 From: Kandrashin Denis Date: Fri, 16 Aug 2013 00:49:55 +0400 Subject: Version 0.29.15 --- ChangeLog | 6 ++++++ configure | 20 +++++++++----------- configure.in | 7 +------ debian/changelog | 9 +++++++++ debian/myrulib-cr/control | 2 +- debian/myrulib-cr/rules | 2 +- debian/myrulib/control | 2 +- debian/myrulib/rules | 2 +- rpmbuild/myrulib-cr.spec | 2 +- rpmbuild/myrulib.spec | 2 +- 10 files changed, 31 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index dde206d3..8e2199ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ MyRuLib: свободная (бесплатная и открытая) программа для организации домашней библиотеки (коллекции) электронных книг. +==== Версия 0.29.15 (16.08.2013 г.) ==== +Обновления сторонних библиотек: +* SQLite3 обновлена до версии 3.7.17 +* wxSQLite3 обновлена до версии 3.0.3 +* Используется оригинальная wxSQLite3 без патчей. + ==== Версия 0.29.14 (21.07.2013 г.) ==== Доработки и исправление ошибок: * Компиляция программы для MacOS с поддержкой CREngine. diff --git a/configure b/configure index b6a2743e..78a2fef1 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.69 for MyRuLib 0.29.14. +# Generated by GNU Autoconf 2.69 for MyRuLib 0.29.15. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='MyRuLib' PACKAGE_TARNAME='myrulib' -PACKAGE_VERSION='0.29.14' -PACKAGE_STRING='MyRuLib 0.29.14' +PACKAGE_VERSION='0.29.15' +PACKAGE_STRING='MyRuLib 0.29.15' PACKAGE_BUGREPORT='mail@lintest.ru' PACKAGE_URL='http://myrulib.lintest.ru/' @@ -1366,7 +1366,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 MyRuLib 0.29.14 to adapt to many kinds of systems. +\`configure' configures MyRuLib 0.29.15 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1432,7 +1432,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of MyRuLib 0.29.14:";; + short | recursive ) echo "Configuration of MyRuLib 0.29.15:";; esac cat <<\_ACEOF @@ -1561,7 +1561,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -MyRuLib configure 0.29.14 +MyRuLib configure 0.29.15 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1938,7 +1938,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 MyRuLib $as_me 0.29.14, which was +It was created by MyRuLib $as_me 0.29.15, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2289,7 +2289,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu SQLITE_VERSION=3.6.0 WXWIDGETS_VERSION=2.8.10 -WXSQL_VERSION=2.0.0 @@ -5370,7 +5369,6 @@ if test "x$USE_WXSQL" == "xyes" ; then USE_WXSQL="builtin" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-locale" >&5 $as_echo_n "checking for --with-locale... " >&6; } @@ -9940,7 +9938,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 MyRuLib $as_me 0.29.14, which was +This file was extended by MyRuLib $as_me 0.29.15, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -10003,7 +10001,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="\\ -MyRuLib config.status 0.29.14 +MyRuLib config.status 0.29.15 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.in b/configure.in index 22745403..b91c0371 100644 --- a/configure.in +++ b/configure.in @@ -2,13 +2,12 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([MyRuLib],[0.29.14],[mail@lintest.ru],[myrulib],[http://myrulib.lintest.ru/]) +AC_INIT([MyRuLib],[0.29.15],[mail@lintest.ru],[myrulib],[http://myrulib.lintest.ru/]) dnl Set the minimum version of toolkit libs dnl ======================================================== SQLITE_VERSION=3.6.0 WXWIDGETS_VERSION=2.8.10 -WXSQL_VERSION=2.0.0 AC_CONFIG_SRCDIR([MyRuLib/MyRuLibApp.cpp]) AC_CONFIG_SRCDIR([autoconf_inc.m4]) @@ -198,10 +197,6 @@ if test "x$USE_WXSQL" == "xyes" ; then USE_WXSQL="builtin" fi -dnl if test "x$USE_WXSQL" != "xbuiltin" ; then -dnl PKG_CHECK_MODULES(wxsqlite3, wxsqlite3A >= $WXSQL_VERSION, , USE_WXSQL="builtin") -dnl fi - AC_MSG_CHECKING([for --with-locale]) AC_ARG_WITH([locale], [AS_HELP_STRING([--with-locale], [Include locale files into executable])], USE_LOCALE="$withval", USE_LOCALE="no") AC_MSG_RESULT([$USE_LOCALE]) diff --git a/debian/changelog b/debian/changelog index 1a305c5f..6194e159 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +myrulib (0.29.15-squeeze1) stable; urgency=low + + Обновления сторонних библиотек: + * SQLite3 обновлена до версии 3.7.17 + * wxSQLite3 обновлена до версии 3.0.3 + * Используется оригинальная wxSQLite3 без патчей. + + -- Denis Kandrashin Fri, 16 Aug 2013 00:37:24 +0400 + myrulib (0.29.14-squeeze1) stable; urgency=low Исправление ошибок: diff --git a/debian/myrulib-cr/control b/debian/myrulib-cr/control index b917a21f..b696a1d1 100644 --- a/debian/myrulib-cr/control +++ b/debian/myrulib-cr/control @@ -2,7 +2,7 @@ Source: myrulib-cr Section: x11 Priority: optional Maintainer: Kandrashin Denis -Build-Depends: debhelper (>= 7), libwxgtk2.8-dev (>=2.8.10), libxml2-dev, libsqlite3-dev, libicu-dev, libbz2-dev, libjpeg-dev, libpng-dev, libfreetype6-dev +Build-Depends: debhelper (>= 7), libwxgtk2.8-dev (>=2.8.10), libxml2-dev, libsqlite3-dev, libwxsqlite3-2.8-dev, libicu-dev, libbz2-dev, libjpeg-dev, libpng-dev, libfreetype6-dev Standards-Version: 3.8.0 Homepage: http://myrulib.lintest.ru diff --git a/debian/myrulib-cr/rules b/debian/myrulib-cr/rules index 16bfb6d7..7098db9c 100755 --- a/debian/myrulib-cr/rules +++ b/debian/myrulib-cr/rules @@ -13,7 +13,7 @@ configure: configure-stamp configure-stamp: dh_testdir # Add here commands to configure the package. - ./configure --with-icu --with-reader --prefix=/usr + ./configure --with-icu --with-reader --without-wxsqlite --prefix=/usr touch configure-stamp build: build-stamp diff --git a/debian/myrulib/control b/debian/myrulib/control index 647cf3e4..fb64a077 100644 --- a/debian/myrulib/control +++ b/debian/myrulib/control @@ -2,7 +2,7 @@ Source: myrulib Section: x11 Priority: optional Maintainer: Kandrashin Denis -Build-Depends: debhelper (>= 7), libwxgtk2.8-dev (>=2.8.10), libxml2-dev, libsqlite3-dev, libicu-dev, libbz2-dev +Build-Depends: debhelper (>= 7), libwxgtk2.8-dev (>=2.8.10), libxml2-dev, libsqlite3-dev, libwxsqlite3-2.8-dev, libicu-dev, libbz2-dev Standards-Version: 3.8.0 Homepage: http://myrulib.lintest.ru diff --git a/debian/myrulib/rules b/debian/myrulib/rules index bf981f54..dedb003d 100755 --- a/debian/myrulib/rules +++ b/debian/myrulib/rules @@ -13,7 +13,7 @@ configure: configure-stamp configure-stamp: dh_testdir # Add here commands to configure the package. - ./configure --with-icu --prefix=/usr + ./configure --with-icu --without-wxsqlite --prefix=/usr touch configure-stamp build: build-stamp diff --git a/rpmbuild/myrulib-cr.spec b/rpmbuild/myrulib-cr.spec index 63a147c5..9d2d0634 100644 --- a/rpmbuild/myrulib-cr.spec +++ b/rpmbuild/myrulib-cr.spec @@ -7,7 +7,7 @@ # Name: myrulib-cr -Version: 0.29.14 +Version: 0.29.15 Release: 0 License: GPL-3.0 Summary: E-Book Library Manager diff --git a/rpmbuild/myrulib.spec b/rpmbuild/myrulib.spec index 8f36c2d2..39fd8e75 100644 --- a/rpmbuild/myrulib.spec +++ b/rpmbuild/myrulib.spec @@ -7,7 +7,7 @@ # Name: myrulib -Version: 0.29.14 +Version: 0.29.15 Release: 0 License: GPL-3.0 Summary: E-Book Library Manager -- cgit v1.2.3