Mercurial > libpst

changeset 174:9bbc834d5f3e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
new debianization from hggdh
author Carl Byington <carl@five-ten-sg.com>
date Tue, 07 Apr 2009 13:45:20 -0700
parents d9393349ab29
children 03dbd449290f
files configure.in debian/Makefile.am debian/Makefile.in debian/changelog debian/control debian/copyright debian/libpst-dev.dirs debian/libpst-dev.install debian/libpst.dirs debian/libpst.docs debian/libpst.install debian/libpst.spec debian/libpst1.install debian/readpst.dirs debian/rules debian/watch libpst.pc.in src/Makefile.am
diffstat 18 files changed, 130 insertions(+), 668 deletions(-) [+]
line wrap: on
line diff
--- a/configure.in	Sat Apr 04 19:23:33 2009 -0700
+++ b/configure.in	Tue Apr 07 13:45:20 2009 -0700
@@ -21,6 +21,14 @@
 
 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
--- a/debian/Makefile.am	Sat Apr 04 19:23:33 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-EXTRA_DIST =
--- a/debian/Makefile.in	Sat Apr 04 19:23:33 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -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:
--- a/debian/changelog	Sat Apr 04 19:23:33 2009 -0700
+++ b/debian/changelog	Tue Apr 07 13:45:20 2009 -0700
@@ -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 <hggdh2@gmail.com>  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 <hggdh2@gmail.com>  Tue, 24 Feb 2009 18:57:02 -0600
-
-libpst (0.6.27-1ppa3) jaunty; urgency=low
-
-  * ndditional cleanups on the partial debianisation done upstream
+libpst (0.6.27-0ubuntu1) jaunty; urgency=low
 
- -- HggdH <hggdh2@gmail.com>  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 <hggdh2@gmail.com>  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 <hggdh2@gmail.com>  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,
+  [ 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).
-
- -- HggdH <hggdh2@gmail.com>  Sat, 17 Jan 2009 14:13:20 -0600
-
-libpst (0.6.25-1) unstable; urgency=low
-
-  * Initial release
-
- -- Joachim Metz <forensics@hoffmannbv.nl>  Thu, 29 May 2008 15:37:06 +0200
-
-libpst (0.6.24-1) unstable; urgency=low
-
-  * Initial release
-
- -- Joachim Metz <forensics@hoffmannbv.nl>  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 <jello@debian.org>  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 <jello@debian.org>  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.
+  * add a Conflitcs for readpst < 0.6.27, to guarantee upgrade for
+    those using the old libpst packages.
 
- -- Joe Nahmias <jello@debian.org>  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 <johnh@aproposretail.com> (SF #890745).
-  * readpst.c: fix string escaping to consider escaped '\n', closes: #242252;
-      thanks to Paul Bakker <bakker@fox-it.com>.
-  * updated version number to 0.5 to match upstream tarball name, thanks to
-    "Chris B." <chris@tech.com.au> for noticing.
-  * update debian/watch.
-
- -- Joe Nahmias <jello@debian.org>  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 <jello@debian.org>  Fri, 12 Mar 2004 00:32:19 -0500
+  [ Iain Lane ]
+  * Set priority: extra and remove conflicts on same binary package
+  * debian/copyright: Update and mention GPL-2+ licensed file src/lzfu.c 
 
-libpst (0.5-2) unstable; urgency=low
-
-  * libpst.h: Fix endian handling, closes: #236944.
-  * lzfu.c: Fix endian mixups.
-
- -- Joe Nahmias <jello@debian.org>  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 <jello@debian.org>  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.
-
- -- Joe Nahmias <joe@nahmias.net>  Tue, 15 Apr 2003 18:55:00 -0400
+ -- HggdH <hggdh2@gmail.com>  Wed, 25 Feb 2009 10:49:13 -0600
--- a/debian/control	Sat Apr 04 19:23:33 2009 -0700
+++ b/debian/control	Tue Apr 07 13:45:20 2009 -0700
@@ -3,61 +3,47 @@
 XSBC-Original-Maintainer: Carl Byington <carl@five-ten-sg.com>
 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.
--- a/debian/copyright	Sat Apr 04 19:23:33 2009 -0700
+++ b/debian/copyright	Tue Apr 07 13:45:20 2009 -0700
@@ -15,7 +15,6 @@
     Carl Byington <carl@five-ten-sg.com>
 
 With contributions by:
-    Joseph Nahmias <jello@costa.debian.org> -- bounces
     Joseph Nahmias <joe@nahmias.net>
     Arne Ahrend <aahrend@web.de>
     Nigel Horne <njh@bandsman.co.uk>
@@ -29,13 +28,37 @@
 
 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 file src/lzfu.c is licensed under the GPL-2+.
+
+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; 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 <forensics@hoffmannbv.nl> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
-
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
-
+is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'.
--- a/debian/libpst-dev.dirs	Sat Apr 04 19:23:33 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-usr/include
--- a/debian/libpst-dev.install	Sat Apr 04 19:23:33 2009 -0700
+++ b/debian/libpst-dev.install	Tue Apr 07 13:45:20 2009 -0700
@@ -1,1 +1,3 @@
 debian/tmp/usr/include/libpst
+debian/tmp/usr/lib/libpst*.so
+debian/tmp/usr/lib/pkgconfig/*
--- a/debian/libpst.dirs	Sat Apr 04 19:23:33 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-usr/lib
-usr/lib/pkgconfig
--- a/debian/libpst.docs	Sat Apr 04 19:23:33 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-AUTHORS
-COPYING
-INSTALL
-NEWS
-README
-TODO
--- a/debian/libpst.install	Sat Apr 04 19:23:33 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-debian/tmp/usr/lib/libpst*
-debian/tmp/usr/lib/pkgconfig/*
--- a/debian/libpst.spec	Sat Apr 04 19:23:33 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -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 <carl@five-ten-sg.com> - 0.6.25-1
-- improve handling of content-type charset values in mime parts
-
-* Thu Dec 11 2008 Carl Byington <carl@five-ten-sg.com> - 0.6.24-1
-- patch from Chris Eagle to build on cygwin
-
-* Thu Dec 04 2008 Carl Byington <carl@five-ten-sg.com> - 0.6.23-1
-- bump version to avoid cvs tagging mistake in fedora
-
-* Fri Nov 28 2008 Carl Byington <carl@five-ten-sg.com> - 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 <carl@five-ten-sg.com> - 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 <carl@five-ten-sg.com> - 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 <carl@five-ten-sg.com> - 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 <carl@five-ten-sg.com> - 0.6.18-1
-- Fixes for iconv on Mac from Justin Greer.
-
-* Tue Aug 05 2008 Carl Byington <carl@five-ten-sg.com> - 0.6.17-1
-- More fixes for 32/64 bit portability on big endian ppc.
-
-* Tue Aug 05 2008 Carl Byington <carl@five-ten-sg.com> - 0.6.16-1
-- Use inttypes.h for portable printing of 64 bit items.
-
-* Wed Jul 30 2008 Carl Byington <carl@five-ten-sg.com> - 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 <carl@five-ten-sg.com> - 0.6.14-1
-- Fix my mistake in debian packaging.
-
-* Fri Jun 13 2008 Carl Byington <carl@five-ten-sg.com> - 0.6.13-1
-- Patch from Robert Simpson for encryption type 2.
-
-* Tue Jun 10 2008 Carl Byington <carl@five-ten-sg.com> - 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 <carl@five-ten-sg.com> - 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 <carl@five-ten-sg.com> - 0.6.10-1
-- Patch from Robert Simpson for doubly-linked list code and arrays of unicode strings.
-
-* Fri May 16 2008 Carl Byington <carl@five-ten-sg.com> - 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 <carl@five-ten-sg.com> - 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 <carl@five-ten-sg.com> - 0.5.5
-- merge changes from Joe Nahmias version
-
-* Sun Feb 19 2006 Carl Byington <carl@five-ten-sg.com> - 0.5.3
-- initial spec file using autoconf and http://www.fedora.us/docs/rpm-packaging-guidelines.html
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/libpst1.install	Tue Apr 07 13:45:20 2009 -0700
@@ -0,0 +1,1 @@
+debian/tmp/usr/lib/libpst*.so.*
--- a/debian/readpst.dirs	Sat Apr 04 19:23:33 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-usr/bin
-usr/share/man/man1
-usr/share/man/man5
-usr/share/doc
--- a/debian/rules	Sat Apr 04 19:23:33 2009 -0700
+++ b/debian/rules	Tue Apr 07 13:45:20 2009 -0700
@@ -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
+
--- a/debian/watch	Sat Apr 04 19:23:33 2009 -0700
+++ b/debian/watch	Tue Apr 07 13:45:20 2009 -0700
@@ -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 
-# <Webpage URL> <string match>
 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
-
-
--- a/libpst.pc.in	Sat Apr 04 19:23:33 2009 -0700
+++ b/libpst.pc.in	Tue Apr 07 13:45:20 2009 -0700
@@ -6,6 +6,6 @@
 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@
--- a/src/Makefile.am	Sat Apr 04 19:23:33 2009 -0700
+++ b/src/Makefile.am	Tue Apr 07 13:45:20 2009 -0700
@@ -67,7 +67,7 @@
     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    \