diff --git a/configure.in b/configure.in index 7a52fb3..6b4da46 100644 --- a/configure.in +++ b/configure.in @@ -1,259 +1,267 @@ AC_PREREQ(2.59) AC_INIT(libpst,0.6.35,carl@five-ten-sg.com) AC_CONFIG_SRCDIR([src/libpst.c]) AC_CONFIG_HEADER([config.h]) AM_INIT_AUTOMAKE AC_CANONICAL_HOST # # 1. Remember that version-info is current:revision:age, and age <= current. # 2. If the source code has changed at all since the last public release, # then increment revision (`c:r:a' becomes `c:r+1:a'). # 3. If any interfaces have been added, removed, or changed since the last # update, increment current, and set revision to 0. # 4. If any interfaces have been added since the last public release, then # increment age, since we should be backward compatible with the previous # version. # 5. If any interfaces have been removed or changed since the last public # release, then set age to 0, since we are not backward compatible. # 6. libtool will build libpst.so.x.y.z where the SONAME is libpst.so.x # and x=current-age, y=age, z=revision libpst_version_info='2:0:0' AC_SUBST(LIBPST_VERSION_INFO, [$libpst_version_info]) +libpst_so_major='2' +AC_SUBST(LIBPST_SO_MAJOR, [$libpst_so_major]) + +# libpst +# version soname so library name +# 0.6.35 libpst.so.2 libpst.so.2.0.0 + + # Check for win32 AC_MSG_CHECKING([for Win32]) case "$host" in *-mingw*) os_win32=yes ;; *) os_win32=no ;; esac AC_MSG_RESULT($os_win32) AM_CONDITIONAL(OS_WIN32, [test "$os_win32" = "yes"]) # Check for Win32 platform AC_MSG_CHECKING([for Win32 platform in general]) case "$host" in *-cygwin*) platform_win32=yes ;; *) platform_win32=$os_win32 ;; esac AC_MSG_RESULT($platform_win32) AM_CONDITIONAL(PLATFORM_WIN32, [test "$platform_win32" = "yes"]) # Checks for programs. # The following lines adds the --enable-dii option to configure: # # Give the user the choice to enter one of these: # --enable-dii # --enable-dii=yes # --enable-dii=no # AC_MSG_CHECKING([whether we are enabling dii utility]) AC_ARG_ENABLE(dii, AC_HELP_STRING([--enable-dii], [enable dii utility]), [ case "${enableval}" in yes) ;; no) ;; *) AC_MSG_ERROR(bad value ${enableval} for --enable-dii) ;; esac ], # default if not specified enable_dii=yes ) AC_MSG_RESULT([$enable_dii]) AC_PATH_PROG(CONVERT, convert) if test "x$CONVERT" = "x" ; then if test "$enable_dii" = "yes"; then enable_dii=no AC_MSG_WARN([convert program not found. pst2dii disabled]) fi else if test "x`$CONVERT --version 2>&1 | grep -i imagemagick >/dev/null ; echo $?`" != "x0"; then if test "$enable_dii" = "yes"; then enable_dii=no AC_MSG_WARN([wrong convert program found. pst2dii disabled]) fi fi fi AC_CHECK_HEADER([gd.h], [ AC_DEFINE([HAVE_GD_H], [1], [Define to 1 if you have the header file.]) ], [ if test "$enable_dii" = "yes"; then enable_dii=no AC_MSG_WARN([gd.h not found. pst2dii disabled]) fi ]) AM_CONDITIONAL(BUILD_DII, [test "$enable_dii" = "yes"]) # Checks for programs. AC_PROG_CXX AC_PROG_CC AM_PROG_CC_C_O AC_PROG_CPP AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_LIBTOOL AC_PROG_MAKE_SET AC_PROG_RANLIB # make sure we get large file support AC_SYS_LARGEFILE AC_CHECK_SIZEOF(off_t) # Checks for header files. AC_CHECK_HEADER([unistd.h], AM_CONDITIONAL(NEED_XGETOPT, [test yes = no]), AM_CONDITIONAL(NEED_XGETOPT, [test yes = yes]) ) AC_HEADER_DIRENT AC_HEADER_STDC AC_CHECK_HEADERS([ctype.h dirent.h errno.h fcntl.h inttypes.h limits.h regex.h signal.h stdarg.h stdint.h stdio.h stdlib.h string.h sys/param.h sys/stat.h sys/types.h time.h unistd.h wchar.h]) # Checks for typedefs, structures, and compiler characteristics. AC_HEADER_STDBOOL AC_C_CONST AC_TYPE_OFF_T AC_TYPE_SIZE_T AC_STRUCT_TM # Checks for library functions. AC_FUNC_FSEEKO AC_FUNC_LSTAT AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK if test "$cross_compiling" != "yes"; then AC_FUNC_MALLOC AC_FUNC_MKTIME AC_FUNC_REALLOC fi AC_FUNC_STRFTIME AC_FUNC_VPRINTF AC_CHECK_FUNCS([memchr memmove memset regcomp strcasecmp strncasecmp strchr strdup strerror strpbrk strrchr strstr strtol]) AM_ICONV if test "$am_cv_func_iconv" != "yes"; then AC_MSG_ERROR([libpst requires iconv which is missing]) fi AC_CHECK_FUNCS(regexec,,[AC_CHECK_LIB(regex,regexec, [REGEXLIB=-lregex AC_DEFINE(HAVE_REGEXEC,1,[Define to 1 if you have the regexec function.])], [AC_MSG_ERROR([No regex library found])])]) AC_SUBST(REGEXLIB) # The following lines adds the --enable-pst-debug option to configure: # # Give the user the choice to enter one of these: # --enable-pst-debug # --enable-pst-debug=yes # --enable-pst-debug=no # AC_MSG_CHECKING([whether we are forcing debug dump file creation]) AC_ARG_ENABLE(pst-debug, AC_HELP_STRING([--enable-pst-debug], [force debug dump file creation]), [ case "${enableval}" in yes) ;; no) ;; *) AC_MSG_ERROR(bad value ${enableval} for --enable-pst-debug) ;; esac ], # default if not specified enable_pst_debug=no ) AC_MSG_RESULT([$enable_pst_debug]) if test "$enable_pst_debug" = "yes"; then AC_DEFINE(DEBUG_ALL, 1, Define to 1 to force debug dump file creation) fi # The following lines adds the --enable-libpst-shared option to configure: # # Give the user the choice to enter one of these: # --enable-libpst-shared # --enable-libpst-shared=yes # --enable-libpst-shared=no # AC_MSG_CHECKING([whether we are building libpst shared object]) AC_ARG_ENABLE(libpst-shared, AC_HELP_STRING([--enable-libpst-shared], [build libpst shared object]), [ case "${enableval}" in yes) ;; no) ;; *) AC_MSG_ERROR(bad value ${enableval} for --enable-libpst-shared) ;; esac ], # default if not specified enable_libpst_shared=no ) AC_MSG_RESULT([$enable_libpst_shared]) enable_static_tools=yes if test "$enable_libpst_shared" = "yes"; then enable_shared=yes enable_static_tools=no fi # needed by STATIC_TOOLS in src/Makefile.am AC_SUBST(PST_OBJDIR, [$objdir]) # The following lines adds the --enable-static-tools option to configure: # # Give the user the choice to enter one of these: # --enable-static-tools # --enable-static-tools=yes # --enable-static-tools=no # AC_MSG_CHECKING([whether to link command line tools with libpst statically]) AC_ARG_ENABLE([static-tools], AC_HELP_STRING([--enable-static-tools], [link command line tools with libpst statically]), [ case "${enableval}" in yes) ;; no) ;; *) AC_MSG_ERROR(bad value ${enableval} for --static-tools) ;; esac ], [ enable_static_tools=no ]) AC_MSG_RESULT([$enable_static_tools]) AM_CONDITIONAL(STATIC_TOOLS, [test "$enable_static_tools" = "yes"]) if test "$enable_static_tools" = "yes"; then enable_static="yes" fi AC_OUTPUT( \ Makefile \ debian/Makefile \ html/Makefile \ info/Makefile \ libpst.pc \ libpst.spec \ man/Makefile \ src/Makefile \ src/pst2dii.cpp \ xml/Makefile \ xml/libpst \ ) diff --git a/debian/Makefile.am b/debian/Makefile.am deleted file mode 100644 index 1b336ac..0000000 --- a/debian/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = diff --git a/debian/Makefile.in b/debian/Makefile.in deleted file mode 100644 index 6212413..0000000 --- a/debian/Makefile.in +++ /dev/null @@ -1,327 +0,0 @@ -# Makefile.in generated by automake 1.9.2 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = debian -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BUILD_DII_FALSE = @BUILD_DII_FALSE@ -BUILD_DII_TRUE = @BUILD_DII_TRUE@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CONVERT = @CONVERT@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBICONV = @LIBICONV@ -LIBOBJS = @LIBOBJS@ -LIBPST_VERSION_INFO = @LIBPST_VERSION_INFO@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -NEED_XGETOPT_FALSE = @NEED_XGETOPT_FALSE@ -NEED_XGETOPT_TRUE = @NEED_XGETOPT_TRUE@ -OBJEXT = @OBJEXT@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ -PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ -PST_OBJDIR = @PST_OBJDIR@ -RANLIB = @RANLIB@ -REGEXLIB = @REGEXLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STATIC_TOOLS_FALSE = @STATIC_TOOLS_FALSE@ -STATIC_TOOLS_TRUE = @STATIC_TOOLS_TRUE@ -STRIP = @STRIP@ -VERSION = @VERSION@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -EXTRA_DIST = -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu debian/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu debian/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/debian/changelog b/debian/changelog index 53ef247..16bb50a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,128 +1,24 @@ -libpst (0.6.27-1ppa5) jaunty; urgency=low - - * not yet... If I am going to libtoolize, I need libtool as - a build-depends... - - -- HggdH Tue, 24 Feb 2009 19:54:08 -0600 - -libpst (0.6.27-1ppa4) jaunty; urgency=low - - * final (I hope cleanup): we now run autoconf/automake/libtoolize - to rebuild the necessary environment after deleting the - debianisation provided by upstream. - - -- HggdH Tue, 24 Feb 2009 18:57:02 -0600 - -libpst (0.6.27-1ppa3) jaunty; urgency=low - - * ndditional cleanups on the partial debianisation done upstream - - -- HggdH Tue, 24 Feb 2009 16:10:39 -0600 - -libpst (0.6.27-1ppa2) jaunty; urgency=low - - * ndditional cleanups on the partial debianisation done upstream - - -- HggdH Tue, 24 Feb 2009 04:33:28 -0600 - -libpst (0.6.27-1ppa1) jaunty; urgency=low - - * new upstream source being used -- www.five-ten-sg.com/libpst - - -- HggdH Mon, 23 Feb 2009 19:29:13 -0600 - -libpst (0.6.25-1ppa1) jaunty; urgency=low - - * new upstream source being used -- www.five-ten-sg.com/libpst - * debian/patches/10-current-attach.patch patch for Evolution use, +libpst (0.6.27-0ubuntu1) jaunty; urgency=low + + [ HggdH ] + * new upstream source being used (LP: #317602) -- www.five-ten-sg.com/libpst: + Debian's libpst version does not provide a shared library, and + does not support newer Evolution PST files; dropping it. + * remove upstream basic debianisation, and re-debianise using CDBS. + upstream provides a basic, incomplete, and non-functional ./debian; + also, add a ./debian/rules get-orig-source target in order to + cleanup nicely. + * debian/patches/10-current-attach.patch: patch for Evolution use, should be eventually dropped for a Evolution patch upstream. + * debian/patches/05-disable-debian-gen.patch: adjust configure.in + and Makefile.am not to generate the debian directory and files. * changed dependency from libgd2-noxpm to libgd2-xpm >= 2.0.36 (current jaunty alpha 3 level). + * add a Conflitcs for readpst < 0.6.27, to guarantee upgrade for + those using the old libpst packages. - -- HggdH Sat, 17 Jan 2009 14:13:20 -0600 - -libpst (0.6.25-1) unstable; urgency=low - - * Initial release - - -- Joachim Metz Thu, 29 May 2008 15:37:06 +0200 - -libpst (0.6.24-1) unstable; urgency=low - - * Initial release - - -- Joachim Metz Thu, 29 May 2008 15:37:06 +0200 - -libpst (0.5.3-1) unstable; urgency=low - - * New upstream release, closes: #489645. - * bump debhelper compat to 6, no changes. - * debian/control: - + bump std-ver to 3.8.0, no changes. - + add Homepage field - * create debug package to help with analyzing readpst problems - + use -O0 when compiling to ensure stuff is not optimized out - - -- Joe Nahmias Mon, 14 Jul 2008 23:53:37 -0400 - -libpst (0.5.2-1) unstable; urgency=low - - * New upstream release - * Fixes content-type for attachments, closes: #256819. - * many, many memory fixes, closes: #263025. - * lots of other improvements. - * Bump debhelper compat to 5, std-ver to 3.7.2.2; no changes. - * Update FSF address in debian/copyright. - - -- Joe Nahmias Sun, 31 Dec 2006 06:14:50 +0000 - -libpst (0.5.1-1) unstable; urgency=low - - * New upstream release. - * New upstream maintainer. - * update debian/watch to use files on alioth. - - -- Joe Nahmias Wed, 17 Nov 2004 20:10:18 -0500 - -libpst (0.5-4) unstable; urgency=low - - * The "I'm getting the feeling that I'm turning into upstream" release. - * readpst.c: ensure there's a blank line between header and body; - patch from (SF #890745). - * readpst.c: fix string escaping to consider escaped '\n', closes: #242252; - thanks to Paul Bakker . - * updated version number to 0.5 to match upstream tarball name, thanks to - "Chris B." for noticing. - * update debian/watch. - - -- Joe Nahmias Thu, 1 Jul 2004 16:35:16 -0400 - -libpst (0.5-3) unstable; urgency=low - - * libpst.c: fix date/time on big-endian machines. - * added debian/watch file for upstream version tracking with uscan. - - -- Joe Nahmias Fri, 12 Mar 2004 00:32:19 -0500 - -libpst (0.5-2) unstable; urgency=low - - * libpst.h: Fix endian handling, closes: #236944. - * lzfu.c: Fix endian mixups. - - -- Joe Nahmias Wed, 10 Mar 2004 23:58:03 -0500 - -libpst (0.5-1) unstable; urgency=low - - * New upstream release - * debian/copyright: updated download location. - * typo corrections in manpages (thanks era eriksson!) - - -- Joe Nahmias Tue, 24 Feb 2004 21:59:13 -0500 - -libpst (0.4.3-1) unstable; urgency=low - - * Initial Release (closes: #178113). - * Included critical updates that upstream sent me from CVS. - * Wrote manpage for readpstlog. + [ Iain Lane ] + * Set priority: extra and remove conflicts on same binary package + * debian/copyright: Update and mention GPL-2+ licensed file src/lzfu.c - -- Joe Nahmias Tue, 15 Apr 2003 18:55:00 -0400 + -- HggdH Wed, 25 Feb 2009 10:49:13 -0600 diff --git a/debian/control b/debian/control index f8de0b5..c87e1b7 100644 --- a/debian/control +++ b/debian/control @@ -1,63 +1,49 @@ Source: libpst Maintainer: Ubuntu MOTU Developers XSBC-Original-Maintainer: Carl Byington Section: utils Priority: optional -Build-Depends: debhelper (>= 7), \ - cdbs, \ - libtool, \ - debhelper (>= 5), \ - autotools-dev, \ - libfreetype6-dev, \ - libgd2-xpm-dev, \ - zlib1g-dev, \ +Build-Depends: debhelper (>= 5), + cdbs, + libtool, + autotools-dev, + libfreetype6-dev, + libgd2-xpm-dev, + zlib1g-dev, libjpeg62-dev Standards-Version: 3.8.0 Package: readpst -Priority: extra -Section: utils +Priority: optional Architecture: any -Depends: - imagemagick, \ - libfreetype6, \ - libgd2-xpm, \ - zlib1g, \ - libjpeg62 +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libpst1 (= ${binary:Version}), + imagemagick Description: Utilities to convert Outlook .pst files to other formats - The Libpst utilities include readpst which can convert email messages + The readpst utilities include readpst which can convert email messages to both mbox and MH mailbox formats, pst2ldif which can convert the contacts to .ldif format for import into ldap databases, and pst2dii which can convert email messages to the DII load file format used by - Summation. A shared library is also provided. + Summation. Requires the shared libray provided by libpst1. -Package: libpst +Package: libpst1 Architecture: any -Priority: extra -Section: utils -Depends: readpst (= ${binary:Version}) \ - imagemagick, \ - libfreetype6, \ - libgd2-xpm, \ - zlib1g, \ - libjpeg62 -Description: Utilities to convert Outlook .pst files to other formats - The Libpst utilities include readpst which can convert email messages - to both mbox and MH mailbox formats, pst2ldif which can convert the - contacts to .ldif format for import into ldap databases, and pst2dii - which can convert email messages to the DII load file format used by - Summation. A shared library is also provided. - This package provides the shared library. +Priority: optional +Section: libs +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: Shared library needed by the readpst utilities, and + other programmes. The libpst shared library is required by the + readpst utilities, and provides the necessary functions to manipulate + the Outlook PST files. Package: libpst-dev Architecture: any -Priority: extra -Section: devel -Depends: libpst (= ${binary:Version}) -Description: Utilities to convert Outlook .pst files to other formats - The Libpst utilities include readpst which can convert email messages - to both mbox and MH mailbox formats, pst2ldif which can convert the - contacts to .ldif format for import into ldap databases, and pst2dii - which can convert email messages to the DII load file format used by - Summation. A shared library is also provided. - This package provides the development-related files for libpst. +Priority: optional +Section: libdevel +Depends: libpst1 (= ${binary:Version}), + ${misc:Depends} +Description: development files needed for libpst1. + Development files needed if coding or compiling programmes that use + the libpst shared libray. diff --git a/debian/copyright b/debian/copyright index c02b17b..32e0798 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,41 +1,64 @@ This package was debianized by Joachim Metz on Thu, 29 May 2008 15:37:06 +0200. It was downloaded from http://www.five-ten-sg.com/libpst. Upstream maintainter: Carl Byington Copyright: Original version by: Dave Smith Dave Smith Current maintainer: Carl Byington With contributions by: - Joseph Nahmias -- bounces Joseph Nahmias Arne Ahrend Nigel Horne Chris Halls Stevens Miller Brad Hards Alexander Grau Antonio Palama Sean Loaring James Woodcock License: + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 dated June, 1991. + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -The Debian packaging is (C) 2008, Joachim Metz and -is licensed under the GPL, see `/usr/share/common-licenses/GPL'. +The file src/lzfu.c is licensed under the GPL-2+. +License: -# Please also look if there are files or directories which have a -# different copyright/license attached and list them here. + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, + Boston, MA 02110-1301, USA. +The Debian packaging is (C) 2008, Joachim Metz and +is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'. diff --git a/debian/libpst-dev.dirs b/debian/libpst-dev.dirs deleted file mode 100644 index e43b95c..0000000 --- a/debian/libpst-dev.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/include diff --git a/debian/libpst-dev.install b/debian/libpst-dev.install index 65d2ce1..927e7b4 100644 --- a/debian/libpst-dev.install +++ b/debian/libpst-dev.install @@ -1 +1,3 @@ debian/tmp/usr/include/libpst +debian/tmp/usr/lib/libpst*.so +debian/tmp/usr/lib/pkgconfig/* diff --git a/debian/libpst.dirs b/debian/libpst.dirs deleted file mode 100644 index b448f1a..0000000 --- a/debian/libpst.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib -usr/lib/pkgconfig diff --git a/debian/libpst.docs b/debian/libpst.docs deleted file mode 100644 index 53b69b7..0000000 --- a/debian/libpst.docs +++ /dev/null @@ -1,6 +0,0 @@ -AUTHORS -COPYING -INSTALL -NEWS -README -TODO diff --git a/debian/libpst.install b/debian/libpst.install deleted file mode 100644 index 5a78502..0000000 --- a/debian/libpst.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/tmp/usr/lib/libpst* -debian/tmp/usr/lib/pkgconfig/* diff --git a/debian/libpst.spec b/debian/libpst.spec deleted file mode 100644 index aea0065..0000000 --- a/debian/libpst.spec +++ /dev/null @@ -1,127 +0,0 @@ -Summary: Utilities to convert Outlook .pst files to other formats -Name: libpst -Version: 0.6.25 -Release: 1%{?dist} -License: GPLv2+ -Group: Applications/Productivity -Source: http://www.five-ten-sg.com/%{name}/packages/%{name}-%{version}.tar.gz -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -URL: http://www.five-ten-sg.com/%{name}/ -Requires: ImageMagick -BuildRequires: ImageMagick freetype-devel gd-devel libjpeg-devel zlib-devel - - -%description -The Libpst utilities include readpst which can convert email messages -to both mbox and MH mailbox formats, pst2ldif which can convert the -contacts to .ldif format for import into ldap databases, and pst2dii -which can convert email messages to the DII load file format used by -Summation. - - -%prep -%setup -q - - -%build -%configure -make %{?_smp_mflags} - - -%install -rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%files -%defattr(-,root,root,-) -%{_bindir}/* -%{_mandir}/man1/* -%{_mandir}/man5/* -%docdir %{_datadir}/doc/%{name}-%{version} -%{_datadir}/doc/%{name}-%{version} - - -%changelog -* Fri Jan 16 2009 Carl Byington - 0.6.25-1 -- improve handling of content-type charset values in mime parts - -* Thu Dec 11 2008 Carl Byington - 0.6.24-1 -- patch from Chris Eagle to build on cygwin - -* Thu Dec 04 2008 Carl Byington - 0.6.23-1 -- bump version to avoid cvs tagging mistake in fedora - -* Fri Nov 28 2008 Carl Byington - 0.6.22-1 -- patch from David Cuadrado to process emails with type PST_TYPE_OTHER -- base64_encode_multiple() may insert newline, needs larger malloc -- subject lines shorter than 2 bytes could segfault - -* Tue Oct 21 2008 Carl Byington - 0.6.21-1 -- fix title bug with old schema in pst2ldif. -- also escape commas in distinguished names per rfc4514. - -* Thu Oct 09 2008 Carl Byington - 0.6.20-1 -- add configure option --enable-dii=no to remove dependency on libgd. -- many fixes in pst2ldif by Robert Harris. -- add -D option to include deleted items, from Justin Greer -- fix from Justin Greer to add missing email headers -- fix from Justin Greer for my_stristr() -- fix for orphan children when building descriptor tree -- avoid writing uninitialized data to debug log file -- remove unreachable code -- create dummy top-of-folder descriptor if needed for corrupt pst files - -* Sun Sep 14 2008 Carl Byington - 0.6.19-1 -- Fix base64 encoding that could create long lines. -- Initial work on a .so shared library from Bharath Acharya. - -* Thu Aug 28 2008 Carl Byington - 0.6.18-1 -- Fixes for iconv on Mac from Justin Greer. - -* Tue Aug 05 2008 Carl Byington - 0.6.17-1 -- More fixes for 32/64 bit portability on big endian ppc. - -* Tue Aug 05 2008 Carl Byington - 0.6.16-1 -- Use inttypes.h for portable printing of 64 bit items. - -* Wed Jul 30 2008 Carl Byington - 0.6.15-1 -- Patch from Robert Simpson for file handle leak in error case. -- Fix for missing length on lz decompression, bug found by Chris White. - -* Sun Jun 15 2008 Carl Byington - 0.6.14-1 -- Fix my mistake in debian packaging. - -* Fri Jun 13 2008 Carl Byington - 0.6.13-1 -- Patch from Robert Simpson for encryption type 2. - -* Tue Jun 10 2008 Carl Byington - 0.6.12-1 -- Patch from Joachim Metz for debian packaging and -- fix for incorrect length on lz decompression - -* Tue Jun 03 2008 Carl Byington - 0.6.11-1 -- Use ftello/fseeko to properly handle large files. -- Document and properly use datasize field in b5 blocks. -- Fix some MSVC compile issues and collect MSVC dependencies into one place. - -* Thu May 29 2008 Carl Byington - 0.6.10-1 -- Patch from Robert Simpson for doubly-linked list code and arrays of unicode strings. - -* Fri May 16 2008 Carl Byington - 0.6.9 -- Patch from Joachim Metz for 64 bit compile. -- Fix pst format documentation for 8 byte backpointers. - -* Wed Mar 05 2008 Carl Byington - 0.6.8 -- Initial version of pst2dii to convert to Summation dii load file format -- changes for Fedora packaging guidelines (#434727) - -* Tue Jul 10 2007 Carl Byington - 0.5.5 -- merge changes from Joe Nahmias version - -* Sun Feb 19 2006 Carl Byington - 0.5.3 -- initial spec file using autoconf and http://www.fedora.us/docs/rpm-packaging-guidelines.html - diff --git a/debian/libpst1.install b/debian/libpst1.install new file mode 100644 index 0000000..bfd4146 --- /dev/null +++ b/debian/libpst1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libpst*.so.* diff --git a/debian/readpst.dirs b/debian/readpst.dirs deleted file mode 100644 index b933ba7..0000000 --- a/debian/readpst.dirs +++ /dev/null @@ -1,4 +0,0 @@ -usr/bin -usr/share/man/man1 -usr/share/man/man5 -usr/share/doc diff --git a/debian/rules b/debian/rules old mode 100755 new mode 100644 index 873dba5..df44e78 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,42 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/autotools.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk export DH_VERBOSE=1 DEB_CONFIGURE_EXTRA_FLAGS = --enable-libpst-shared +DEB_AUTO_UPDATE_AUTOCONF = 2.63 +DEB_AUTO_UPDATE_AUTOMAKE = 1.10 +DEB_AUTO_UPDATE_LIBTOOL = pre + +# Makefile arcanery warning: +# $(dir $(_)) gives us the path containing this rules file. +# I haven't found this documented in any make documentation, so I am unsure +# how portable/version independent it is. +# This magic care of Emmet Hickory: +# (http://lists.debian.org/debian-devel-games/2008/02/msg00135.html) + +TEMP_DIR := $(shell mktemp -d) +SOURCE_DIR = $(word 1, $(shell ls -d --group-directories-first $(TEMP_DIR)/*)) +SOURCE_VER = $(shell echo $(notdir $(SOURCE_DIR)) | sed s/libpst-//) +CURVER = $(shell dpkg-parsechangelog | grep ^Version | cut -d" " -f2 | cut -d"-" -f1 | cut -d"+" -f1 ) + +download-tarball: + uscan --download --destdir $(TEMP_DIR) \ + --no-symlink --force-download --download-version $(CURVER) \ + --watchfile=$(dir $(_))/watch + cd $(TEMP_DIR) && tar xzvf *.tar.gz + +delete-shipped-debian: download-tarball + rm -r $(TEMP_DIR)/libpst-$(CURVER)/debian +repack-source: delete-shipped-debian + cd $(TEMP_DIR) && \ + tar czvf libpst_$(SOURCE_VER).orig.tar.gz \ + libpst-$(CURVER) + +get-orig-source: repack-source + mv $(TEMP_DIR)/libpst_$(CURVER).orig.tar.gz .. + rm -r $(TEMP_DIR) + +.PHONY: download-tarball delete-shipped-debian repack-source get-orig-source + diff --git a/debian/watch b/debian/watch index 089aca1..ee24044 100644 --- a/debian/watch +++ b/debian/watch @@ -1,22 +1,3 @@ -# Example watch control file for uscan -# Rename this file to "watch" and then you can run the "uscan" command -# to check for upstream updates and more. -# See uscan(1) for format - -# Compulsory line, this is a version 3 file version=3 -# Uncomment to examine a Webpage -# http://www.five-ten-sg.com/libpst/packages/ libpst-(.*)\.tar\.gz - -# Uncomment to examine a Webserver directory -#http://www.example.com/pub/libpst-(.*)\.tar\.gz - -# Uncommment to examine a FTP server -#ftp://ftp.example.com/pub/libpst-(.*)\.tar\.gz debian uupdate - -# Uncomment to find new files on sourceforge, for debscripts >= 2.9 -# http://sf.net/libpst/libpst-(.*)\.tar\.gz - - diff --git a/libpst.pc.in b/libpst.pc.in index 5ad60c1..3f63ef6 100644 --- a/libpst.pc.in +++ b/libpst.pc.in @@ -1,11 +1,11 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ Name: libpst Description: A library for reading PST files Version: @VERSION@ -Requires: +Requires: Libs: -L${libdir} -lpst -Cflags: -I${includedir} +Cflags: -I${includedir}/libpst-@LIBPST_SO_MAJOR@ diff --git a/src/Makefile.am b/src/Makefile.am index a52e3e5..d81344a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,102 +1,102 @@ if PLATFORM_WIN32 NO_UNDEFINED = -no-undefined else NO_UNDEFINED = endif if STATIC_TOOLS PSTLIB = @PST_OBJDIR@/libpst.a else PSTLIB = libpst.la endif common_header = common.h \ define.h \ libpst.h \ libstrfunc.h \ lzfu.h \ timeconv.h \ vbuf.h common_source = debug.c \ libpst.c \ libstrfunc.c \ lzfu.c \ timeconv.c \ vbuf.c if NEED_XGETOPT common_source += XGetopt.c common_header += XGetopt.h endif noinst_PROGRAMS = deltasearch dumpblocks getidblock bin_PROGRAMS = lspst readpst readpstlog pst2ldif if BUILD_DII bin_PROGRAMS += pst2dii endif lspst_SOURCES = lspst.c $(common_header) readpst_SOURCES = readpst.c $(common_header) readpstlog_SOURCES = readpstlog.c $(common_header) pst2ldif_SOURCES = pst2ldif.cpp $(common_header) pst2dii_SOURCES = pst2dii.cpp $(common_header) deltasearch_SOURCES = deltasearch.cpp $(common_header) dumpblocks_SOURCES = dumpblocks.c $(common_header) getidblock_SOURCES = getidblock.c $(common_header) lspst_CFLAGS = $(AM_CFLAGS) readpst_CFLAGS = $(AM_CFLAGS) readpstlog_CFLAGS = $(AM_CFLAGS) pst2ldif_CFLAGS = $(AM_CFLAGS) pst2dii_CFLAGS = $(AM_CFLAGS) deltasearch_CFLAGS = $(AM_CFLAGS) dumpblocks_CFLAGS = $(AM_CFLAGS) getidblock_CFLAGS = $(AM_CFLAGS) lspst_DEPENDENCIES = libpst.la readpst_DEPENDENCIES = libpst.la readpstlog_DEPENDENCIES = libpst.la pst2ldif_DEPENDENCIES = libpst.la pst2dii_DEPENDENCIES = libpst.la deltasearch_DEPENDENCIES = libpst.la dumpblocks_DEPENDENCIES = libpst.la getidblock_DEPENDENCIES = libpst.la if STATIC_TOOLS noinst_LTLIBRARIES = libpst.la else lib_LTLIBRARIES = libpst.la - libpstincludedir = $(includedir)/libpst + libpstincludedir = $(includedir)/libpst-@LIBPST_SO_MAJOR@/libpst libpstinclude_HEADERS = \ common.h \ libpst.h \ libstrfunc.h\ timeconv.h \ vbuf.h libpst_la_LDFLAGS = $(NO_UNDEFINED) -version-info @LIBPST_VERSION_INFO@ endif libpst_la_SOURCES = $(common_source) $(common_header) libpst_la_LIBADD = $(LTLIBICONV) EXTRA_DIST = testdebug.c if !NEED_XGETOPT EXTRA_DIST += XGetopt.c XGetopt.h endif # set the include path found by configure INCLUDES= -I$(srcdir)/.. $(all_includes) # the library search path. lspst_LDADD = $(all_libraries) $(PSTLIB) $(LTLIBICONV) readpst_LDADD = $(all_libraries) $(PSTLIB) $(LTLIBICONV) $(REGEXLIB) readpstlog_LDADD = $(all_libraries) $(PSTLIB) $(LTLIBICONV) pst2ldif_LDADD = $(all_libraries) $(PSTLIB) $(LTLIBICONV) pst2dii_LDADD = $(all_libraries) $(PSTLIB) $(LTLIBICONV) -lgd dumpblocks_LDADD = $(all_libraries) $(PSTLIB) $(LTLIBICONV) getidblock_LDADD = $(all_libraries) $(PSTLIB) $(LTLIBICONV) deltasearch_LDADD = $(all_libraries) $(PSTLIB) $(LTLIBICONV)