Commit 376a9af5 authored by Michael Meskes's avatar Michael Meskes
Browse files

Imported Upstream version 2.1.1

parent af5f5d95
##############################################################################################################
########## CMake Setup ##########
# options available for user's input
OPTION(WANT_DEBUG "Set the debug build and possible additional outputs" OFF)
OPTION(WANT_INTERNAL_QSCINTILLA "Use internal/bundled QScintilla2 source" OFF)
OPTION(ENABLE_ORACLE "Disable Oracle support at all. Including detection" ON)
OPTION(ENABLE_PGSQL "Disable PostgreSQL support. Including detection" ON)
OPTION(WANT_RPM "Enable additional RPM related stuff. Additional make package_rpm target" ON)
OPTION(WANT_BUNDLE "Enable Mac OS X bundle build" OFF)
OPTION(WANT_BUNDLE_STANDALONE "Do not copy required libs and tools into bundle (WANT_BUNDLE)" ON)
#Set our CMake minimum version
#Require 2.4.2 for Qt finding
#Require 2.4.3 for moc change detection and rpath updates for custom cairo install
......@@ -11,6 +20,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.4.5 FATAL_ERROR)
if(COMMAND cmake_policy)
cmake_policy(SET CMP0003 NEW)
cmake_policy(SET CMP0005 OLD) # FIXME change it to new when there will be cmake 2.6.x in most distros
cmake_policy(SET CMP0011 NEW)
endif(COMMAND cmake_policy)
......@@ -38,12 +48,15 @@ PROJECT(TOra)
#where VERSION_SUFFIX is of the form "", "cvs" or "Ncvs" (N being the minor patch level)
SET (VERSION_MAJOR "2")
SET (VERSION_MINOR "1")
SET (VERSION_PATCH "0")
SET (VERSION_PATCH "1")
SET (VERSION_SUFFIX "")
SET (VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX})
MESSAGE(STATUS "TOra ${VERSION} will be built to install into ${CMAKE_INSTALL_PREFIX}")
SET (EXE_NAME "tora")
if (WANT_BUNDLE)
SET(EXE_NAME "TOra")
endif(WANT_BUNDLE)
ADD_DEFINITIONS("-DTOVERSION=\\\"${VERSION}\\\"")
# Allow using CMAKE-related ifdefs in the code. See e.g. toqsqlconnection.cpp.
......@@ -104,9 +117,9 @@ ENDIF (GCC)
#Convert our simpler command line option to the CMake style
#None, Debug, Release, .. or custom ones
# SET(WANT_DEBUG 1)
IF(WANT_DEBUG)
SET(CMAKE_BUILD_TYPE Debug)
ADD_DEFINITIONS("-DDEBUG")
ELSE(WANT_DEBUG)
SET(CMAKE_BUILD_TYPE RELEASE)
ENDIF(WANT_DEBUG)
......@@ -123,28 +136,6 @@ ELSE (MSVC)
ENDIF (MSVC)
# --- If we are on OS X copy all the embedded libraries to the app bundle
IF (APPLE AND WANT_BUNDLE)
# -------- Function to build OS X Stand Alone Bundles -----------------
function(MakeOSXBundleApp target binary_dir)
#-- Set some useful variables
SET (OSX_MAKE_STANDALONE_BUNDLE_CMAKE_SCRIPT "${binary_dir}/${target}_OSX_MakeStandAloneBundle.cmake")
SET (OSX_MAKE_STANDALONE_BUNDLE_BASH_SCRIPT "${binary_dir}/${target}_OSX_MakeStandAloneBundle.sh")
#-- Configure the cmake file and the shell script
CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/osx_tools/CompleteBundle.cmake.in"
"${OSX_MAKE_STANDALONE_BUNDLE_CMAKE_SCRIPT}" @ONLY IMMEDIATE)
CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/osx_tools/CreateBundle.sh.in"
"${OSX_MAKE_STANDALONE_BUNDLE_BASH_SCRIPT}" @ONLY IMMEDIATE)
#-- Create the installation code
install(SCRIPT "${OSX_MAKE_STANDALONE_BUNDLE_CMAKE_SCRIPT}")
endfunction(MakeOSXBundleApp)
MakeOSXBundleApp(TOra ${PROJECT_BINARY_DIR})
ENDIF (APPLE AND WANT_BUNDLE)
SET(CMAKE_CXX_FLAGS_RELEASE "-O2 ${CXX_WARNINGS}")
SET(CMAKE_C_FLAGS_RELEASE "-O2 ${CXX_WARNINGS}")
# Required for win wjen there is used an external qscintilla lib
......@@ -200,23 +191,34 @@ ELSE (WANT_INTERNAL_QSCINTILLA)
ENDIF (WANT_INTERNAL_QSCINTILLA)
FIND_PACKAGE(Oracle)
IF(ORACLE_FOUND)
MESSAGE("Oracle OCI Library Found OK")
# what else is hidden in the ifdef hell?!
ADD_DEFINITIONS("-DDBLINK")
ELSE(ORACLE_FOUND)
MESSAGE(STATUS "No Oracle OCI found. TOra will be build without Oracle support")
IF (NOT ENABLE_ORACLE)
MESSAGE(STATUS "Oracle support is disabled by user choice")
ADD_DEFINITIONS("-DTO_NO_ORACLE")
ENDIF(ORACLE_FOUND)
ELSE (NOT ENABLE_ORACLE)
FIND_PACKAGE(Oracle)
IF(ORACLE_FOUND)
MESSAGE("Oracle OCI Library Found OK")
# what else is hidden in the ifdef hell?!
ADD_DEFINITIONS("-DDBLINK")
ELSE(ORACLE_FOUND)
MESSAGE(STATUS "No Oracle OCI found. TOra will be build without Oracle support")
ADD_DEFINITIONS("-DTO_NO_ORACLE")
ENDIF(ORACLE_FOUND)
ENDIF (NOT ENABLE_ORACLE)
FIND_PACKAGE(PostgreSQL)
IF (POSTGRESQL_FOUND)
IF (NOT ENABLE_PGSQL)
MESSAGE(STATUS "PostgreSQL support is disabled by user choice")
ELSE (NOT ENABLE_PGSQL)
FIND_PACKAGE(PostgreSQL)
IF (POSTGRESQL_FOUND)
ADD_DEFINITIONS(-DLIBPQ_DECL_CANCEL)
ADD_DEFINITIONS(-DHAVE_POSTGRESQL_LIBPQ_FE_H)
MESSAGE(STATUS "PostgreSQL environment found: ${POSTGRESQL_INCLUDE_DIR} ${POSTGRESQL_LIBRARIES}")
ELSE (POSTGRESQL_FOUND)
ELSE (POSTGRESQL_FOUND)
MESSAGE(" ")
MESSAGE(WARNING " No PostgreSQL environment has been found.")
MESSAGE(WARNING " Specify -DPOSTGRESQL_PATH_INCLUDES=path")
......@@ -224,8 +226,9 @@ ELSE (POSTGRESQL_FOUND)
#MESSAGE (STATUS "PostgreSQL includes: ${POSTGRESQL_INCLUDE_DIR} vs. ${POSTGRESQL_PATH_INCLUDES}")
#MESSAGE (STATUS "PostgreSQL libs: ${POSTGRESQL_LIBRARIES} vs. ${POSTGRESQL_PATH_LIB}")
MESSAGE(" ")
ENDIF (POSTGRESQL_FOUND)
ENDIF (POSTGRESQL_FOUND)
ENDIF (NOT ENABLE_PGSQL)
##############################################################################################################
......@@ -303,42 +306,44 @@ INSTALL(FILES
)
ENDIF (NOT WANT_BUNDLE)
# packaging related stuff
#SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Toolkit for Oracle")
SET(CPACK_PACKAGE_NAME ${CMAKE_PROJECT_NAME})
#SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
#SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
SET(CPACK_PACKAGE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
SET(CPACK_SOURCE_GENERATOR "TGZ")
#SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
SET(CPACK_IGNORE_FILES "/CVS/;/\\\\.svn/;\\\\.swp$;\\\\.#;/#;\\\\.tar.gz$;/CMakeFiles/;CMakeCache.txt")
SET(CPACK_SOURCE_IGNORE_FILES ${CPACK_IGNORE_FILES})
INCLUDE(CPack)
# Check for SVN
FIND_PACKAGE(Subversion)
IF(NOT Subversion_FOUND)
SET(Subversion_SVN_EXECUTABLE true)
ENDIF(NOT Subversion_FOUND)
# get svn revision in rpmbuild time (and not in Makefile generation time)
SET(SVN_REVISION
"\"$$(" ${Subversion_SVN_EXECUTABLE} info ${CMAKE_SOURCE_DIR} | awk '/Revision:/ {print \$\$2 }' ")\""
)
SET(RPM_DEFINES
--define "_sourcedir ${CMAKE_SOURCE_DIR}"
)
SET(SPEC_IN_SUBST
"\""
"s/(%define\\s+_version) .*/\\\\1 ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}/\;"
"s/(%define\\s+_release) .*/\\\\1 0.${SVN_REVISION}svn/\;"
"\""
)
SET(RPM_SPEC "rpm/tora.spec")
ADD_CUSTOM_TARGET(package-rpm
COMMAND sed -r ${SPEC_IN_SUBST} "${RPM_SPEC}.in" >"${RPM_SPEC}"
COMMAND make package_source
COMMAND rpmbuild -ba ${RPM_DEFINES} "${RPM_SPEC}"
)
IF (WANT_RPM)
# packaging related stuff
#SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Toolkit for Oracle")
SET(CPACK_PACKAGE_NAME ${CMAKE_PROJECT_NAME})
#SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
#SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
SET(CPACK_PACKAGE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
SET(CPACK_SOURCE_GENERATOR "TGZ")
#SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
SET(CPACK_IGNORE_FILES "/CVS/;/\\\\.svn/;\\\\.swp$;\\\\.#;/#;\\\\.tar.gz$;/CMakeFiles/;CMakeCache.txt")
SET(CPACK_SOURCE_IGNORE_FILES ${CPACK_IGNORE_FILES})
INCLUDE(CPack)
# Check for SVN
FIND_PACKAGE(Subversion)
IF(NOT Subversion_FOUND)
SET(Subversion_SVN_EXECUTABLE true)
ENDIF(NOT Subversion_FOUND)
# get svn revision in rpmbuild time (and not in Makefile generation time)
SET(SVN_REVISION
"\"$$(" ${Subversion_SVN_EXECUTABLE} info ${CMAKE_SOURCE_DIR} | awk '/Revision:/ {print \$\$2 }' ")\""
)
SET(RPM_DEFINES
--define "_sourcedir ${CMAKE_SOURCE_DIR}"
)
SET(SPEC_IN_SUBST
"\""
"s/(%define\\s+_version) .*/\\\\1 ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}/\;"
"s/(%define\\s+_release) .*/\\\\1 0.${SVN_REVISION}svn/\;"
"\""
)
SET(RPM_SPEC "rpm/tora.spec")
ADD_CUSTOM_TARGET(package-rpm
COMMAND sed -r ${SPEC_IN_SUBST} "${RPM_SPEC}.in" >"${RPM_SPEC}"
COMMAND make package_source
COMMAND rpmbuild -ba ${RPM_DEFINES} "${RPM_SPEC}"
)
ENDIF (WANT_RPM)
......@@ -65,7 +65,8 @@ EXTRA_DIST = debian \
utils/chex/CMakeLists.txt \
cmake_uninstall.cmake.in \
config.h.cmake \
cmake
cmake \
osx_tools
dist-hook:
rm -rf `find $(distdir) -name .svn`
......
......@@ -319,7 +319,8 @@ EXTRA_DIST = debian \
utils/chex/CMakeLists.txt \
cmake_uninstall.cmake.in \
config.h.cmake \
cmake
cmake \
osx_tools
SUBDIRS = utils src test doc
all: config.h
......
......@@ -3,10 +3,11 @@ willing to build binaries for a platform not listed here (or wish to
take over building binaries for a listed platform), please send a note
to tora-develop list after subscribing to it.
With autoconf builds, it is best to specify "CXXFLAGS=-O2" to avoid
adding the debug symbols to the code by default.
Current Binary Maintainers:
---------------------------
Mandrake Cooker - Nathan Neulinger <nneul@neulinger.org>
Windows - Alexey Danilchenko <alex@dalex.clara.co.uk>
Gentoo - Don Seiler <don@seiler.us>
......
......@@ -45,6 +45,9 @@ You have to specify -DORACLE_OCI_VERSION for one of values:
[8, 8I, 9I, 10G, 10G_R2]. Example:
-DORACLE_OCI_VERSION=10G_R2
You can switch off Oracle support with:
-DENABLE_ORACLE=0
TOra requires PostgreSQL development environment to enable
full PgSQL support (native cancel etc.).
......@@ -56,11 +59,17 @@ specify path for alternative location and/or for Windows too.
Windows note: Sometimes (dunno why) it doesn't find pgsql libs.
You can use "set LIB=%LIB%;pathtopgsqllibs" then.
etc.
Native PostgreSQL support can be disabled with:
-DENABLE_PGSQL=0
TOra allows to be built as "bundle" application on Mac OS X.
-DWANT_BUNDLE=1
The bundle will be created in the CMAKE_INSTALL_PREFIX.
The bundle will be created in the CMAKE_INSTALL_PREFIX. The bundle
will contain all dependencies (Qt libs, DB clients libs etc.).
If there is WANT_BUNDLE specified, it can be set not to pack
all required libraries into the bundle location with:
-DWANT_BUNDLE_STANDALONE=1
Search following for more info:
......
TOra is reported to build on Mac OS X (10.4 Tiger and later).
Only Cmake build method is tested. See README.CMAKE.
Mac OS X bundle can be created with WANT_BUNDLE. See README.CMAKE.
Mac OS X bundle can be created with WANT_BUNDLE and optionaly WANT_BUNDLE_STANDALONE.
See README.CMAKE.
Notes on Oracle Instantclient:
......
......@@ -3,17 +3,22 @@ Release Procedures:
Source tarball:
---------------
Check out the tora module from CVS
Check out the tora module from SVN
Edit the configure.in file to set the version number
Edit the NEWS file to set a release date
Commit, and then tag the release "cvs tag TORA_1_3_XX"
Commit, and then copy trunk to an appropriately named tag, such as:
svn copy -m "tag before starting 2.1.0 release process" https://tora.svn.sourceforge.net/svnroot/tora/trunk/tora https://tora.svn.sourceforge.net/svnroot/tora/tags/tora-2-1-0
configure
make dist
upload to upload.sf.net:/incoming/
sftp nneul,tora@frs.sourceforge.net
cd /home/pfs/project/t/to/tora/tora/2.1.0
put tora-2.1.0.tar.gz
scp tora-2.1.0.tar.gz nneul,tora@frs.sourceforge.net:/home/frs/project/t/to/tora/tora/2.1.0/
curl -T tora-1.3.xx.tar.gz ftp://upload.sf.net/incoming/
add new release to the 'tora' package
......
......@@ -7,6 +7,9 @@ Content:
#
# Building with MSVC - CMake (+ See README.CMAKE)
#
All information below assumes C:\build as the base directory, and
C:\build\tora as tora checkout and C:\build\tora-build as tora build dir
0. All related steps are done in the "Visual Studio Command Prompt"
I have MS Visual Studio 2008 Express (aka version 9). It contains
......@@ -43,23 +46,25 @@ Content:
fit Postgresql and Mysql includes and libraries.
Note: Mysql uses subdirectories in its lib directory.
Example:
set INCLUDE=%INCLUDE%;d:\Qt\sqlite\;D:\Qt\pgsql\include\;d:\Qt\mysql\include\
set LIB=%LIB%;d:\Qt\sqlite\;d:\Qt\pgsql\lib\;d:\Qt\mysql\lib\opt\
6. Compile Qt4 with MSVC. Don't forget to specify -qt-sql-mysql
-qt-sql-psql -qt-sql-odbc -plugin-sql-mysql -plugin-sql-psql
-plugin-sql-odbc parameters for configure script.
Example:
configure.exe -plugin-sql-sqlite -system-sqlite -plugin-sql-mysql -plugin-sql-psql -plugin-sql-odbc
but it dependes on your system mood. I mean it's not deterministic.
Sometimes you will need to hack more paths etc. But building DB
plugins is described in the Qt documentation.
set INCLUDE=%INCLUDE%;c:\build\postgres\include\;c:\build\mysql\include\
set LIB=%LIB%;c:\build\postgres\lib\;c:\build\mysql\lib\opt\
set ORACLE_HOME=c:\build\oracle
6. Compile Qt4 with MSVC. Run with MS VS 2008 command prompt:
configure.exe -opensource -plugin-sql-sqlite -plugin-sql-mysql -plugin-sql-psql -plugin-sql-odbc
Might want to consider building with '-release' to only build the release code
7. Download and install cmake from www.cmake.org.
7. Compile Tora - read README.CMAKE
8. Compile Tora - read README.CMAKE and dont forget to check environment is in 5.
Example:
set ORACLE_HOME=d:\oracle-xe\...
set LIB=%LIB%;d:\Qt\pgsql\lib
cmake -G "NMake Makefiles" -DWANT_INTERNAL_QSCINTILLA=1 -DCMAKE_INSTALL_PREFIX=d:\oss\tora\RELEASE -DORACLE_OCI_VERSION=10G_R2 -DPOSTGRESQL_PATH_INCLUDES=d:\Qt\pgsql\include -DPOSTGRESQL_PATH_LIB=d:\Qt\pgsql\lib\ ..\tora
c:\
cd \build\tora-build
set PATH=%PATH%;c:\build\qt\bin
cmake -G "NMake Makefiles" -DWANT_INTERNAL_QSCINTILLA=1 -DCMAKE_INSTALL_PREFIX=c:\build\tora-build\RELEASE -DORACLE_OCI_VERSION=10G_R2 ..\tora
Misc notes: seting ORACLE_HOME is a good thing (TM)
building with internal qscintilla is easier for beginners ;)
prepare for longer headache (if you're a windows devel newbie)
......
......@@ -45,7 +45,7 @@ FIND_PATH(
FIND_LIBRARY(
ORACLE_LIBRARY_OCCI
NAMES libocci occi oraocci10
NAMES libocci occi oraocci10 oraocci11
PATHS ${ORACLE_LIB_LOCATION}
)
FIND_LIBRARY(
......@@ -61,6 +61,21 @@ FIND_LIBRARY(
SET (ORACLE_LIBRARY ${ORACLE_LIBRARY_OCCI} ${ORACLE_LIBRARY_CLNTSH} ${ORACLE_LIBRARY_LNNZ})
IF (APPLE)
FIND_LIBRARY(ORACLE_LIBRARY_OCIEI
NAMES libociei ociei
PATHS ${ORACLE_LIB_LOCATION}
)
MESSAGE(STATUS "Searching for libociei: ${ORACLE_LIBRARY_OCIEI} in ${ORACLE_LIB_LOCATION}")
IF (ORACLE_LIBRARY_OCIEI)
SET (ORACLE_LIBRARY ${ORACLE_LIBRARY} ${ORACLE_LIBRARY_OCIEI})
ELSE (ORACLE_LIBRARY_OCIEI)
MESSAGE(STATUS "libociei.dylib is not found. Maybe it will cause crashes if you are building BUNDLE")
ENDIF (ORACLE_LIBRARY_OCIEI)
ENDIF (APPLE)
IF (ORACLE_LIBRARY AND ORACLE_INCLUDES)
SET(ORACLE_LIBRARIES ${ORACLE_LIBRARY})
SET(ORACLE_FOUND "YES")
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.63 for tora 2.1.0.
# Generated by GNU Autoconf 2.63 for tora 2.1.1.
#
# Report bugs to <tora-develop@lists.sourceforge.net>.
#
......@@ -750,8 +750,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='tora'
PACKAGE_TARNAME='tora'
PACKAGE_VERSION='2.1.0'
PACKAGE_STRING='tora 2.1.0'
PACKAGE_VERSION='2.1.1'
PACKAGE_STRING='tora 2.1.1'
PACKAGE_BUGREPORT='tora-develop@lists.sourceforge.net'
 
ac_unique_file="src/main.cpp"
......@@ -1541,7 +1541,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 tora 2.1.0 to adapt to many kinds of systems.
\`configure' configures tora 2.1.1 to adapt to many kinds of systems.
 
Usage: $0 [OPTION]... [VAR=VALUE]...
 
......@@ -1615,7 +1615,7 @@ fi
 
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of tora 2.1.0:";;
short | recursive ) echo "Configuration of tora 2.1.1:";;
esac
cat <<\_ACEOF
 
......@@ -1752,7 +1752,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
tora configure 2.1.0
tora configure 2.1.1
generated by GNU Autoconf 2.63
 
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
......@@ -1766,7 +1766,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 tora $as_me 2.1.0, which was
It was created by tora $as_me 2.1.1, which was
generated by GNU Autoconf 2.63. Invocation command line was
 
$ $0 $@
......@@ -2617,7 +2617,7 @@ fi
 
# Define the identity of the package.
PACKAGE='tora'
VERSION='2.1.0'
VERSION='2.1.1'
 
 
cat >>confdefs.h <<_ACEOF
......@@ -26474,7 +26474,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by tora $as_me 2.1.0, which was
This file was extended by tora $as_me 2.1.1, which was
generated by GNU Autoconf 2.63. Invocation command line was
 
CONFIG_FILES = $CONFIG_FILES
......@@ -26537,7 +26537,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
tora config.status 2.1.0
tora config.status 2.1.1
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
......
# Process this file with autoconf to produce a configure script.
AC_INIT([tora],[2.1.0],[tora-develop@lists.sourceforge.net])
AC_INIT([tora],[2.1.1],[tora-develop@lists.sourceforge.net])
AC_PREREQ([2.59])
AC_CONFIG_AUX_DIR(config)
# Every other copy of the package version number gets its value from here
......
This package uses quilt to manage all modifications to the upstream
source. Changes are stored in the source package as diffs in
debian/patches and applied during the build.
To configure quilt to use debian/patches instead of patches, you want
either to export QUILT_PATCHES=debian/patches in your environment
or use this snippet in your ~/.quiltrc:
for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
export QUILT_PATCHES=debian/patches
fi
done
To get the fully patched source after unpacking the source package, cd to
the root level of the source package and run:
quilt push -a
The last patch listed in debian/patches/series will become the current
patch.
To add a new set of changes, first run quilt push -a, and then run:
quilt new <patch>
where <patch> is a descriptive name for the patch, used as the filename in
debian/patches. Then, for every file that will be modified by this patch,
run:
quilt add <file>
before editing those files. You must tell quilt with quilt add what files
will be part of the patch before making changes or quilt will not work
properly. After editing the files, run:
quilt refresh
to save the results as a patch.
Alternately, if you already have an external patch and you just want to
add it to the build system, run quilt push -a and then:
quilt import -P <patch> /path/to/patch
quilt push -a
(add -p 0 to quilt import if needed). <patch> as above is the filename to
use in debian/patches. The last quilt push -a will apply the patch to
make sure it works properly.
To remove an existing patch from the list of patches that will be applied,
run:
quilt delete <patch>
You may need to run quilt pop -a to unapply patches first before running
this command.
tora (2.1.0-1) unstable; urgency=low
* New upstream version, the rebuild closes: #540046.
* Bumped Standards-Version to 3.8.3, no changes needed.
* New project homepage.
* Removed no longer needed 01_missing_includes.dpatch.
* Removed no longer used dh_desktop call.
* Added README.source file.
-- Michael Meskes <meskes@debian.org> Fri, 11 Sep 2009 12:37:52 +0200
tora (2.0.0-4) unstable; urgency=low
* Added patch to add missing include directives, closes: #526166
......
......@@ -4,8 +4,8 @@ Priority: optional
Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Michael Meskes <meskes@debian.org>
Build-Depends: debhelper (>= 5), kdelibs5-dev, kdebase-bin, dpatch, libqscintilla2-dev, cdbs, libpq-dev
Standards-Version: 3.8.1
Homepage: http://sourceforge.net/projects/tora/
Standards-Version: 3.8.3
Homepage: http://www.torasql.com
Vcs-Git: git://git.debian.org/pkg-kde/kde-extras/tora.git
Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-extras/tora.git
......
......@@ -23,4 +23,4 @@ You may use, distribute and copy Toolkit for Oracle under the terms of
GNU General Public License version 2.
On Debian GNU/Linux systems, a copy of the GNU GPL can be found in
/usr/share/common-licenses/GPL.
/usr/share/common-licenses/GPL-2.
03_README.LAYOUT
#! /bin/sh /usr/share/dpatch/dpatch-run
## 03_README.LAYOUT.dpatch by Michael Meskes <meskes@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No such file README.LAYOUT
@DPATCH@
diff -ruN tora-2.0.0.orig/CMakeLists.txt tora-2.0.0/CMakeLists.txt
--- tora-2.0.0.orig/CMakeLists.txt 2008-11-03 21:32:20.000000000 +0100
+++ tora-2.0.0/CMakeLists.txt 2009-01-03 21:29:48.000000000 +0100
@@ -282,7 +282,6 @@
README.BINARIES
README.CMAKE
README.CODESTYLE
- README.LAYOUT
README.LICENSE
README.OSX
README.RELEASE
......@@ -28,4 +28,3 @@ install/tora::
-install --owner root --group root --mode=644 $(CURDIR)/src/icons/toramini.xpm $(CURDIR)/debian/tora/usr/share/icons/hicolor/16x16/apps/tora.xpm
# we have a desktop file
-install --owner root --group root --mode=644 $(CURDIR)/debian/tora.desktop $(CURDIR)/debian/tora/usr/share/applications
dh_desktop
doc/help/*.html /usr/share/tora/help
doc/help/images/*.png /usr/share/tora/help/images
src/icons/tora.xpm /usr/share/icons/hicolor/32x32/apps
......@@ -125,7 +125,7 @@ INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL}
INSTALL_SCRIPT = ${INSTALL}
INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
ISODATE = 2009-09-04
ISODATE = 2009-10-09
LDFLAGS = -DQT_NO_DEBUG
LIBOBJS =
LIBS =
......@@ -137,18 +137,18 @@ LTLIBOBJS =
LUPDATE = /usr/bin/lupdate-qt4
MAKEINFO = ${SHELL} /local/tora/tora-qt4-ac/config/missing --run makeinfo
MKDIR_P = /bin/mkdir -p
MOC = /usr/lib/qt4/bin/moc-qt4
MOC = /usr/bin/moc-qt4
NMEDIT =
OBJEXT = o
ORACLE_CXXFLAGS =
ORACLE_LDFLAGS =
ORACLE_LIBS =
ORACLE_CXXFLAGS = -I/usr/oracle/include/ -DOTL_ORA10G_R2
ORACLE_LDFLAGS = -L/usr/oracle/lib
ORACLE_LIBS = -lclntsh
PACKAGE = tora
PACKAGE_BUGREPORT = tora-develop@lists.sourceforge.net
PACKAGE_NAME = tora
PACKAGE_STRING = tora 2.1.0
PACKAGE_STRING = tora 2.1.1
PACKAGE_TARNAME = tora