changeset 173:d9393349ab29

new debianization from hggdh
author Carl Byington <carl@five-ten-sg.com>
date Sat, 04 Apr 2009 19:23:33 -0700
parents 6954d315aaa8
children 9bbc834d5f3e
files AUTHORS ChangeLog configure.in debian/Makefile.am debian/Makefile.in debian/changelog debian/changelog.in debian/control debian/copyright debian/cron.d.ex debian/emacsen-install.ex debian/emacsen-remove.ex debian/emacsen-startup.ex debian/init.d.ex debian/libpst-default.ex debian/libpst-dev.dirs debian/libpst-dev.install debian/libpst.dirs debian/libpst.doc-base.EX debian/libpst.install debian/libpst.spec debian/manpage.1.ex debian/manpage.sgml.ex debian/manpage.xml.ex debian/menu.ex debian/patches/05-disable-debian-gen.patch debian/patches/10-current-attach.patch debian/postinst.ex debian/postrm.ex debian/preinst.ex debian/prerm.ex debian/readpst.dirs debian/readpst.install debian/rules debian/watch debian/watch.ex
diffstat 36 files changed, 710 insertions(+), 928 deletions(-) [+]
line wrap: on
line diff
--- a/AUTHORS	Sat Apr 04 16:00:48 2009 -0700
+++ b/AUTHORS	Sat Apr 04 19:23:33 2009 -0700
@@ -26,6 +26,7 @@
     Chris Eagle <cseagle@redshift.com>
     Fridrich Strba <fstrba@novell.com>
     Emmanuel Andry <eandry@mandriva.org>
+    hggdh <hggdh2@gmail.com>
 
 
 Testing team:
--- a/ChangeLog	Sat Apr 04 16:00:48 2009 -0700
+++ b/ChangeLog	Sat Apr 04 19:23:33 2009 -0700
@@ -7,6 +7,7 @@
     * move version-info into main configure.in, and set it properly
     * prefix all external symbols in the shared library with pst_ to
       avoid symbol clashes with other shared libraries.
+    * new debianization from hggdh.
 
 LibPST 0.6.34 (2009-03-19)
 ===============================
--- a/configure.in	Sat Apr 04 16:00:48 2009 -0700
+++ b/configure.in	Sat Apr 04 19:23:33 2009 -0700
@@ -247,7 +247,6 @@
 AC_OUTPUT(                  \
     Makefile                \
     debian/Makefile         \
-    debian/changelog        \
     html/Makefile           \
     info/Makefile           \
     libpst.pc               \
--- a/debian/Makefile.am	Sat Apr 04 16:00:48 2009 -0700
+++ b/debian/Makefile.am	Sat Apr 04 19:23:33 2009 -0700
@@ -1,26 +1,1 @@
-EXTRA_DIST =            \
-    changelog           \
-    changelog.in        \
-    compat              \
-    control             \
-    copyright           \
-    cron.d.ex           \
-    emacsen-install.ex  \
-    emacsen-remove.ex   \
-    emacsen-startup.ex  \
-    init.d.ex           \
-    libpst-default.ex   \
-    libpst.dirs         \
-    libpst.doc-base.EX  \
-    libpst.docs         \
-    libpst.install      \
-    manpage.1.ex        \
-    manpage.sgml.ex     \
-    manpage.xml.ex      \
-    menu.ex             \
-    postinst.ex         \
-    postrm.ex           \
-    preinst.ex          \
-    prerm.ex            \
-    rules               \
-    watch.ex
+EXTRA_DIST =
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/Makefile.in	Sat Apr 04 19:23:33 2009 -0700
@@ -0,0 +1,327 @@
+# 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:
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/changelog	Sat Apr 04 19:23:33 2009 -0700
@@ -0,0 +1,128 @@
+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
+
+ -- 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,
+      should be eventually dropped for a Evolution patch upstream.
+  * 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.
+
+ -- 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
+
+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
--- a/debian/changelog.in	Sat Apr 04 16:00:48 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-libpst (@VERSION@-1) unstable; urgency=low
-
-  * Initial release
-
- -- Joachim Metz <forensics@hoffmannbv.nl>  Thu, 29 May 2008 15:37:06 +0200
-
--- a/debian/control	Sat Apr 04 16:00:48 2009 -0700
+++ b/debian/control	Sat Apr 04 19:23:33 2009 -0700
@@ -1,17 +1,63 @@
 Source: libpst
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+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, \
+		libjpeg62-dev
+Standards-Version: 3.8.0
+
+Package: readpst
 Priority: extra
-Maintainer: Joachim Metz <forensics@hoffmannbv.nl>
-Build-Depends: debhelper (>= 5), autotools-dev, libfreetype6-dev, libgd2-noxpm-dev, zlib1g-dev, libjpeg62-dev
-Standards-Version: 3.7.2
-
-Package: libpst
+Section: utils
 Architecture: any
-Depends: ImageMagick, ${shlibs:Depends}, ${misc:Depends}
+Depends: 
+	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.
+ Summation. A shared library is also provided.
 
+Package: libpst
+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.
+
+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.
--- a/debian/copyright	Sat Apr 04 16:00:48 2009 -0700
+++ b/debian/copyright	Sat Apr 04 19:23:33 2009 -0700
@@ -1,7 +1,7 @@
 This package was debianized by Joachim Metz <forensics@hoffmannbv.nl> on
 Thu, 29 May 2008 15:37:06 +0200.
 
-It was downloaded from <fill in http/ftp site>
+It was downloaded from http://www.five-ten-sg.com/libpst.
 
 Upstream maintainter: Carl Byington <carl@five-ten-sg.com>
 
--- a/debian/cron.d.ex	Sat Apr 04 16:00:48 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-#
-# Regular cron jobs for the libpst package
-#
-0 4	* * *	root	libpst_maintenance
--- a/debian/emacsen-install.ex	Sat Apr 04 16:00:48 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-#! /bin/sh -e
-# /usr/lib/emacsen-common/packages/install/libpst
-
-# Written by Jim Van Zandt <jrv@debian.org>, borrowing heavily
-# from the install scripts for gettext by Santiago Vila
-# <sanvila@ctv.es> and octave by Dirk Eddelbuettel <edd@debian.org>.
-
-FLAVOR=$1
-PACKAGE=libpst
-
-if [ ${FLAVOR} = emacs ]; then exit 0; fi
-
-echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR}
-
-#FLAVORTEST=`echo $FLAVOR | cut -c-6`
-#if [ ${FLAVORTEST} = xemacs ] ; then
-#    SITEFLAG="-no-site-file"
-#else
-#    SITEFLAG="--no-site-file"
-#fi
-FLAGS="${SITEFLAG} -q -batch -l path.el -f batch-byte-compile"
-
-ELDIR=/usr/share/emacs/site-lisp/${PACKAGE}
-ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE}
-
-# Install-info-altdir does not actually exist. 
-# Maybe somebody will write it.
-if test -x /usr/sbin/install-info-altdir; then
-    echo install/${PACKAGE}: install Info links for ${FLAVOR}
-    install-info-altdir --quiet --section "" "" --dirname=${FLAVOR} /usr/info/${PACKAGE}.info.gz
-fi
-
-install -m 755 -d ${ELCDIR}
-cd ${ELDIR}
-FILES=`echo *.el`
-cp ${FILES} ${ELCDIR}
-cd ${ELCDIR}
-
-cat << EOF > path.el
-(setq load-path (cons "." load-path) byte-compile-warnings nil)
-EOF
-${FLAVOR} ${FLAGS} ${FILES}
-rm -f *.el path.el
-
-exit 0
--- a/debian/emacsen-remove.ex	Sat Apr 04 16:00:48 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-#!/bin/sh -e
-# /usr/lib/emacsen-common/packages/remove/libpst
-
-FLAVOR=$1
-PACKAGE=libpst
-
-if [ ${FLAVOR} != emacs ]; then
-    if test -x /usr/sbin/install-info-altdir; then
-        echo remove/${PACKAGE}: removing Info links for ${FLAVOR}
-        install-info-altdir --quiet --remove --dirname=${FLAVOR} /usr/info/libpst.info.gz
-    fi
-
-    echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR}
-    rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE}
-fi
--- a/debian/emacsen-startup.ex	Sat Apr 04 16:00:48 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-;; -*-emacs-lisp-*-
-;;
-;; Emacs startup file, e.g.  /etc/emacs/site-start.d/50libpst.el
-;; for the Debian libpst package
-;;
-;; Originally contributed by Nils Naumann <naumann@unileoben.ac.at>
-;; Modified by Dirk Eddelbuettel <edd@debian.org>
-;; Adapted for dh-make by Jim Van Zandt <jrv@debian.org>
-
-;; The libpst package follows the Debian/GNU Linux 'emacsen' policy and
-;; byte-compiles its elisp files for each 'emacs flavor' (emacs19,
-;; xemacs19, emacs20, xemacs20...).  The compiled code is then
-;; installed in a subdirectory of the respective site-lisp directory.
-;; We have to add this to the load-path:
-(let ((package-dir (concat "/usr/share/"
-                           (symbol-name flavor)
-                           "/site-lisp/libpst")))
-;; If package-dir does not exist, the libpst package must have
-;; removed but not purged, and we should skip the setup.
-  (when (file-directory-p package-dir)
-        (setq load-path (cons package-dir load-path))
-       (autoload 'libpst-mode "libpst-mode"
-         "Major mode for editing libpst files." t)
-       (add-to-list 'auto-mode-alist '("\\.libpst$" . libpst-mode))))
-
--- a/debian/init.d.ex	Sat Apr 04 16:00:48 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-#! /bin/sh
-#
-# skeleton	example file to build /etc/init.d/ scripts.
-#		This file should be used to construct scripts for /etc/init.d.
-#
-#		Written by Miquel van Smoorenburg <miquels@cistron.nl>.
-#		Modified for Debian 
-#		by Ian Murdock <imurdock@gnu.ai.mit.edu>.
-#
-# Version:	@(#)skeleton  1.9  26-Feb-2001  miquels@cistron.nl
-#
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/sbin/libpst
-NAME=libpst
-DESC=libpst
-
-test -x $DAEMON || exit 0
-
-# Include libpst defaults if available
-if [ -f /etc/default/libpst ] ; then
-	. /etc/default/libpst
-fi
-
-set -e
-
-case "$1" in
-  start)
-	echo -n "Starting $DESC: "
-	start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \
-		--exec $DAEMON -- $DAEMON_OPTS
-	echo "$NAME."
-	;;
-  stop)
-	echo -n "Stopping $DESC: "
-	start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \
-		--exec $DAEMON
-	echo "$NAME."
-	;;
-  #reload)
-	#
-	#	If the daemon can reload its config files on the fly
-	#	for example by sending it SIGHUP, do it here.
-	#
-	#	If the daemon responds to changes in its config file
-	#	directly anyway, make this a do-nothing entry.
-	#
-	# echo "Reloading $DESC configuration files."
-	# start-stop-daemon --stop --signal 1 --quiet --pidfile \
-	#	/var/run/$NAME.pid --exec $DAEMON
-  #;;
-  force-reload)
-	#
-	#	If the "reload" option is implemented, move the "force-reload"
-	#	option to the "reload" entry above. If not, "force-reload" is
-	#	just the same as "restart" except that it does nothing if the
-	#   daemon isn't already running.
-	# check wether $DAEMON is running. If so, restart
-	start-stop-daemon --stop --test --quiet --pidfile \
-		/var/run/$NAME.pid --exec $DAEMON \
-	&& $0 restart \
-	|| exit 0
-	;;
-  restart)
-    echo -n "Restarting $DESC: "
-	start-stop-daemon --stop --quiet --pidfile \
-		/var/run/$NAME.pid --exec $DAEMON
-	sleep 1
-	start-stop-daemon --start --quiet --pidfile \
-		/var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS
-	echo "$NAME."
-	;;
-  *)
-	N=/etc/init.d/$NAME
-	# echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
-	echo "Usage: $N {start|stop|restart|force-reload}" >&2
-	exit 1
-	;;
-esac
-
-exit 0
--- a/debian/libpst-default.ex	Sat Apr 04 16:00:48 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-# Defaults for libpst initscript
-# sourced by /etc/init.d/libpst
-# installed at /etc/default/libpst by the maintainer scripts
-
-#
-# This is a POSIX shell fragment
-#
-
-# Additional options that are passed to the Daemon.
-DAEMON_OPTS=""
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/libpst-dev.dirs	Sat Apr 04 19:23:33 2009 -0700
@@ -0,0 +1,1 @@
+usr/include
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/libpst-dev.install	Sat Apr 04 19:23:33 2009 -0700
@@ -0,0 +1,1 @@
+debian/tmp/usr/include/libpst
--- a/debian/libpst.dirs	Sat Apr 04 16:00:48 2009 -0700
+++ b/debian/libpst.dirs	Sat Apr 04 19:23:33 2009 -0700
@@ -1,3 +1,2 @@
-usr/bin
-usr/share/man/man1
-usr/share/man/man5
+usr/lib
+usr/lib/pkgconfig
--- a/debian/libpst.doc-base.EX	Sat Apr 04 16:00:48 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-Document: libpst
-Title: Debian libpst Manual
-Author: <insert document author here>
-Abstract: This manual describes what libpst is
- and how it can be used to
- manage online manuals on Debian systems.
-Section: unknown
-
-Format: debiandoc-sgml
-Files: /usr/share/doc/libpst/libpst.sgml.gz
-
-Format: postscript
-Files: /usr/share/doc/libpst/libpst.ps.gz
-
-Format: text
-Files: /usr/share/doc/libpst/libpst.text.gz
-
-Format: HTML
-Index: /usr/share/doc/libpst/html/index.html
-Files: /usr/share/doc/libpst/html/*.html
-
-  
--- a/debian/libpst.install	Sat Apr 04 16:00:48 2009 -0700
+++ b/debian/libpst.install	Sat Apr 04 19:23:33 2009 -0700
@@ -1,3 +1,2 @@
-usr/bin/*
-usr/share/man/man1/*
-usr/share/man/man5/*
+debian/tmp/usr/lib/libpst*
+debian/tmp/usr/lib/pkgconfig/*
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/libpst.spec	Sat Apr 04 19:23:33 2009 -0700
@@ -0,0 +1,127 @@
+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
+
--- a/debian/manpage.1.ex	Sat Apr 04 16:00:48 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH LIBPST SECTION "May 29, 2008"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-libpst \- program to do something
-.SH SYNOPSIS
-.B libpst
-.RI [ options ] " files" ...
-.br
-.B bar
-.RI [ options ] " files" ...
-.SH DESCRIPTION
-This manual page documents briefly the
-.B libpst
-and
-.B bar
-commands.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-\fBlibpst\fP is a program that...
-.SH OPTIONS
-These programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-A summary of options is included below.
-For a complete description, see the Info files.
-.TP
-.B \-h, \-\-help
-Show summary of options.
-.TP
-.B \-v, \-\-version
-Show version of program.
-.SH SEE ALSO
-.BR bar (1),
-.BR baz (1).
-.br
-The programs are documented fully by
-.IR "The Rise and Fall of a Fooish Bar" ,
-available via the Info system.
-.SH AUTHOR
-libpst was written by <upstream author>.
-.PP
-This manual page was written by Joachim Metz <forensics@hoffmannbv.nl>,
-for the Debian project (but may be used by others).
--- a/debian/manpage.sgml.ex	Sat Apr 04 16:00:48 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,156 +0,0 @@
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-
-<!-- Process this file with docbook-to-man to generate an nroff manual
-     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
-     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
-     less'.  A typical entry in a Makefile or Makefile.am is:
-
-manpage.1: manpage.sgml
-	docbook-to-man $< > $@
-
-    
-	The docbook-to-man binary is found in the docbook-to-man package.
-	Please remember that if you create the nroff version in one of the
-	debian/rules file targets (such as build), you will need to include
-	docbook-to-man in your Build-Depends control field.
-
-  -->
-
-  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
-  <!ENTITY dhfirstname "<firstname>FIRSTNAME</firstname>">
-  <!ENTITY dhsurname   "<surname>SURNAME</surname>">
-  <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY dhdate      "<date>May 29, 2008</date>">
-  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
-       allowed: see man(7), man(1). -->
-  <!ENTITY dhsection   "<manvolnum>SECTION</manvolnum>">
-  <!ENTITY dhemail     "<email>forensics@hoffmannbv.nl</email>">
-  <!ENTITY dhusername  "Joachim Metz">
-  <!ENTITY dhucpackage "<refentrytitle>LIBPST</refentrytitle>">
-  <!ENTITY dhpackage   "libpst">
-
-  <!ENTITY debian      "<productname>Debian</productname>">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
-]>
-
-<refentry>
-  <refentryinfo>
-    <address>
-      &dhemail;
-    </address>
-    <author>
-      &dhfirstname;
-      &dhsurname;
-    </author>
-    <copyright>
-      <year>2003</year>
-      <holder>&dhusername;</holder>
-    </copyright>
-    &dhdate;
-  </refentryinfo>
-  <refmeta>
-    &dhucpackage;
-
-    &dhsection;
-  </refmeta>
-  <refnamediv>
-    <refname>&dhpackage;</refname>
-
-    <refpurpose>program to do something</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>&dhpackage;</command>
-
-      <arg><option>-e <replaceable>this</replaceable></option></arg>
-
-      <arg><option>--example <replaceable>that</replaceable></option></arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-
-    <para>This manual page documents briefly the
-      <command>&dhpackage;</command> and <command>bar</command>
-      commands.</para>
-
-    <para>This manual page was written for the &debian; distribution
-      because the original program does not have a manual page.
-      Instead, it has documentation in the &gnu;
-      <application>Info</application> format; see below.</para>
-
-    <para><command>&dhpackage;</command> is a program that...</para>
-
-  </refsect1>
-  <refsect1>
-    <title>OPTIONS</title>
-
-    <para>These programs follow the usual &gnu; command line syntax,
-      with long options starting with two dashes (`-').  A summary of
-      options is included below.  For a complete description, see the
-      <application>Info</application> files.</para>
-
-    <variablelist>
-      <varlistentry>
-        <term><option>-h</option>
-          <option>--help</option>
-        </term>
-        <listitem>
-          <para>Show summary of options.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-v</option>
-          <option>--version</option>
-        </term>
-        <listitem>
-          <para>Show version of program.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-  <refsect1>
-    <title>SEE ALSO</title>
-
-    <para>bar (1), baz (1).</para>
-
-    <para>The programs are documented fully by <citetitle>The Rise and
-      Fall of a Fooish Bar</citetitle> available via the
-      <application>Info</application> system.</para>
-  </refsect1>
-  <refsect1>
-    <title>AUTHOR</title>
-
-    <para>This manual page was written by &dhusername; &dhemail; for
-      the &debian; system (but may be used by others).  Permission is
-      granted to copy, distribute and/or modify this document under
-      the terms of the &gnu; General Public License, Version 2 any 
-	  later version published by the Free Software Foundation.
-    </para>
-	<para>
-	  On Debian systems, the complete text of the GNU General Public
-	  License can be found in /usr/share/common-licenses/GPL.
-	</para>
-
-  </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
-
-
--- a/debian/manpage.xml.ex	Sat Apr 04 16:00:48 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,148 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-
-<!--
-
-Process this file with an XSLT processor: `xsltproc \
--''-nonet /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
-manpages/docbook.xsl manpage.dbk'.  A manual page
-<package>.<section> will be generated.  You may view the
-manual page with: nroff -man <package>.<section> | less'.  A
-typical entry in a Makefile or Makefile.am is:
-
-DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
-manpages/docbook.xsl
-XP=xsltproc -''-nonet
-
-manpage.1: manpage.dbk
-        $(XP) $(DB2MAN) $<
-    
-The xsltproc binary is found in the xsltproc package.  The
-XSL files are in docbook-xsl.  Please remember that if you
-create the nroff version in one of the debian/rules file
-targets (such as build), you will need to include xsltproc
-and docbook-xsl in your Build-Depends control field.
-
--->
-
-  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
-  <!ENTITY dhfirstname "<firstname>FIRSTNAME</firstname>">
-  <!ENTITY dhsurname   "<surname>SURNAME</surname>">
-  <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY dhdate      "<date>May 29, 2008</date>">
-  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
-       allowed: see man(7), man(1). -->
-  <!ENTITY dhsection   "<manvolnum>SECTION</manvolnum>">
-  <!ENTITY dhemail     "<email>forensics@hoffmannbv.nl</email>">
-  <!ENTITY dhusername  "Joachim Metz">
-  <!ENTITY dhucpackage "<refentrytitle>LIBPST</refentrytitle>">
-  <!ENTITY dhpackage   "libpst">
-
-  <!ENTITY debian      "<productname>Debian</productname>">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
-]>
-
-<refentry>
-  <refentryinfo>
-    <address>
-      &dhemail;
-    </address>
-    <author>
-      &dhfirstname;
-      &dhsurname;
-    </author>
-    <copyright>
-      <year>2003</year>
-      <holder>&dhusername;</holder>
-    </copyright>
-    &dhdate;
-  </refentryinfo>
-  <refmeta>
-    &dhucpackage;
-
-    &dhsection;
-  </refmeta>
-  <refnamediv>
-    <refname>&dhpackage;</refname>
-
-    <refpurpose>program to do something</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>&dhpackage;</command>
-
-      <arg><option>-e <replaceable>this</replaceable></option></arg>
-
-      <arg><option>--example <replaceable>that</replaceable></option></arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-
-    <para>This manual page documents briefly the
-      <command>&dhpackage;</command> and <command>bar</command>
-      commands.</para>
-
-    <para>This manual page was written for the &debian; distribution
-      because the original program does not have a manual page.
-      Instead, it has documentation in the &gnu;
-      <application>Info</application> format; see below.</para>
-
-    <para><command>&dhpackage;</command> is a program that...</para>
-
-  </refsect1>
-  <refsect1>
-    <title>OPTIONS</title>
-
-    <para>These programs follow the usual &gnu; command line syntax,
-      with long options starting with two dashes (`-').  A summary of
-      options is included below.  For a complete description, see the
-      <application>Info</application> files.</para>
-
-    <variablelist>
-      <varlistentry>
-        <term><option>-h</option>
-          <option>--help</option>
-        </term>
-        <listitem>
-          <para>Show summary of options.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-v</option>
-          <option>--version</option>
-        </term>
-        <listitem>
-          <para>Show version of program.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-  <refsect1>
-    <title>SEE ALSO</title>
-
-    <para>bar (1), baz (1).</para>
-
-    <para>The programs are documented fully by <citetitle>The Rise and
-      Fall of a Fooish Bar</citetitle> available via the
-      <application>Info</application> system.</para>
-  </refsect1>
-  <refsect1>
-    <title>AUTHOR</title>
-
-    <para>This manual page was written by &dhusername; &dhemail; for
-      the &debian; system (but may be used by others).  Permission is
-      granted to copy, distribute and/or modify this document under
-      the terms of the &gnu; General Public License, Version 2 any 
-	  later version published by the Free Software Foundation.
-    </para>
-	<para>
-	  On Debian systems, the complete text of the GNU General Public
-	  License can be found in /usr/share/common-licenses/GPL.
-	</para>
-
-  </refsect1>
-</refentry>
-
--- a/debian/menu.ex	Sat Apr 04 16:00:48 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-?package(libpst):needs="X11|text|vc|wm" section="Apps/see-menu-manual"\
-  title="libpst" command="/usr/bin/libpst"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/patches/05-disable-debian-gen.patch	Sat Apr 04 19:23:33 2009 -0700
@@ -0,0 +1,19 @@
+--- libpst-0.6.27-orig/configure.in	2009-02-07 12:21:50.000000000 -0600
++++ libpst-0.6.27/configure.in	2009-02-24 16:19:03.000000000 -0600
+@@ -261,8 +261,6 @@
+ 
+ AC_OUTPUT(                  \
+     Makefile                \
+-    debian/Makefile         \
+-    debian/changelog        \
+     html/Makefile           \
+     info/Makefile           \
+     libpst.pc               \
+--- libpst-0.6.27-orig/Makefile.am	2009-02-07 12:21:50.000000000 -0600
++++ libpst-0.6.27/Makefile.am	2009-02-24 18:12:02.000000000 -0600
+@@ -1,4 +1,4 @@
+-SUBDIRS = src man html info debian
++SUBDIRS = src man html info
+ htmldir = ${datadir}/doc/@PACKAGE@-@VERSION@
+ html_DATA = AUTHORS COPYING ChangeLog NEWS README
+ CLEANFILES = xml/libpst xml/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/patches/10-current-attach.patch	Sat Apr 04 19:23:33 2009 -0700
@@ -0,0 +1,11 @@
+diff -Nur libpst-0.6.24-orig/src/libpst.h libpst-0.6.24/src/libpst.h
+--- libpst-0.6.24-orig/src/libpst.h	2009-01-15 13:43:38.000000000 -0600
++++ libpst-0.6.24/src/libpst.h	2009-01-15 15:29:51.000000000 -0600
+@@ -449,6 +449,7 @@
+     struct pst_item_folder        *folder;          // data reffering to folder
+     struct pst_item_contact       *contact;         // data reffering to contact
+     struct pst_item_attach        *attach;          // linked list of attachments
++    struct pst_item_attach	  *current_attach;  // linked list of current attachments
+     struct pst_item_message_store *message_store;   // data referring to the message store
+     struct pst_item_extra_field   *extra_fields;    // linked list of extra headers and such
+     struct pst_item_journal       *journal;         // data reffering to a journal entry
--- a/debian/postinst.ex	Sat Apr 04 16:00:48 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-#!/bin/sh
-# postinst script for libpst
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <postinst> `abort-remove'
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    configure)
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
--- a/debian/postrm.ex	Sat Apr 04 16:00:48 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-#!/bin/sh
-# postrm script for libpst
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postrm> `remove'
-#        * <postrm> `purge'
-#        * <old-postrm> `upgrade' <new-version>
-#        * <new-postrm> `failed-upgrade' <old-version>
-#        * <new-postrm> `abort-install'
-#        * <new-postrm> `abort-install' <old-version>
-#        * <new-postrm> `abort-upgrade' <old-version>
-#        * <disappearer's-postrm> `disappear' <overwriter>
-#          <overwriter-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-    ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
--- a/debian/preinst.ex	Sat Apr 04 16:00:48 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-#!/bin/sh
-# preinst script for libpst
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <new-preinst> `install'
-#        * <new-preinst> `install' <old-version>
-#        * <new-preinst> `upgrade' <old-version>
-#        * <old-preinst> `abort-upgrade' <new-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    install|upgrade)
-    ;;
-
-    abort-upgrade)
-    ;;
-
-    *)
-        echo "preinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
--- a/debian/prerm.ex	Sat Apr 04 16:00:48 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-#!/bin/sh
-# prerm script for libpst
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <prerm> `remove'
-#        * <old-prerm> `upgrade' <new-version>
-#        * <new-prerm> `failed-upgrade' <old-version>
-#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
-#        * <deconfigured's-prerm> `deconfigure' `in-favour'
-#          <package-being-installed> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    remove|upgrade|deconfigure)
-    ;;
-
-    failed-upgrade)
-    ;;
-
-    *)
-        echo "prerm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/readpst.dirs	Sat Apr 04 19:23:33 2009 -0700
@@ -0,0 +1,4 @@
+usr/bin
+usr/share/man/man1
+usr/share/man/man5
+usr/share/doc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/readpst.install	Sat Apr 04 19:23:33 2009 -0700
@@ -0,0 +1,4 @@
+debian/tmp/usr/bin/*
+debian/tmp/usr/share/man/man1/*
+debian/tmp/usr/share/man/man5/*
+debian/tmp/usr/share/doc/*
--- a/debian/rules	Sat Apr 04 16:00:48 2009 -0700
+++ b/debian/rules	Sat Apr 04 19:23:33 2009 -0700
@@ -1,137 +1,7 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-#
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-#
-# Modified to make a template file for a multi-binary package with separated
-# build-arch and build-indep targets  by Bill Allombert 2001
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-config.status: configure
-	dh_testdir
-	# Add here commands to configure the package.
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
-
-
-#Architecture 
-build: build-arch build-indep
-
-build-arch: build-arch-stamp
-build-arch-stamp:  config.status
-
-	# Add here commands to compile the arch part of the package.
-	#$(MAKE) 
-	touch $@
-
-build-indep: build-indep-stamp
-build-indep-stamp:  config.status
-
-	# Add here commands to compile the indep part of the package.
-	#$(MAKE) doc
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-arch-stamp build-indep-stamp #CONFIGURE-STAMP#
-
-	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
+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
 
-
-	dh_clean 
-
-install: install-indep install-arch
-install-indep:
-	dh_testdir
-	dh_testroot
-	dh_clean -k -i 
-	dh_installdirs -i
-
-	# Add here commands to install the indep part of the package into
-	# debian/<package>-doc.
-	#INSTALLDOC#
-
-	dh_install -i
-
-install-arch:
-	dh_testdir
-	dh_testroot
-	dh_clean -k -s 
-	dh_installdirs -s
-
-	# Add here commands to install the arch part of the package into 
-	# debian/tmp.
-	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-
-	dh_install -s --list-missing --sourcedir=$(CURDIR)/debian/tmp
-# Must not depend on anything. This is to be called by
-# binary-arch/binary-indep
-# in another 'make' thread.
-binary-common:
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_installexamples
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate	
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_python
-#	dh_installinit
-#	dh_installcron
-	dh_installinfo
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress 
-	dh_fixperms
-#	dh_perl
-	dh_makeshlibs -V
-	dh_installdeb
-	dh_shlibdeps -L libpst -l debian/tmp/usr/lib
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-# Build architecture independant packages using the common target.
-binary-indep: build-indep install-indep
-	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-# Build architecture dependant packages using the common target.
-binary-arch: build-arch install-arch
-	$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
-
-binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch 
+export DH_VERBOSE=1
+DEB_CONFIGURE_EXTRA_FLAGS = --enable-libpst-shared
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/watch	Sat Apr 04 19:23:33 2009 -0700
@@ -0,0 +1,22 @@
+# 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/debian/watch.ex	Sat Apr 04 16:00:48 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-# 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.example.com/downloads.php 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
-
-