--- makeztxt-1.62.orig/debian/rules +++ makeztxt-1.62/debian/rules @@ -0,0 +1,98 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/quilt/quilt.make + + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +configure: configure-stamp +configure-stamp: + dh_testdir + # Add here commands to configure the package. + + touch configure-stamp + + +build: build-stamp + +build-stamp: patch configure-stamp + dh_testdir + + # Add here commands to compile the package. + $(MAKE) + #/usr/bin/docbook-to-man debian/makeztxt.sgml > makeztxt.1 + + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + # Add here commands to clean up after the build process. + $(MAKE) distclean + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/makeztxt. + install -D makeztxt $(CURDIR)/debian/makeztxt/usr/bin/makeztxt + install -D makeztxt.1 $(CURDIR)/debian/makeztxt/usr/share/man/man1/makeztxt.1 + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs README + dh_installexamples +# dh_install +# dh_installmenu +# dh_installdebconf +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_installinit +# dh_installcron +# dh_installinfo + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms +# dh_perl +# dh_python +# dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- makeztxt-1.62.orig/debian/watch +++ makeztxt-1.62/debian/watch @@ -0,0 +1,6 @@ +# 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. +# Site Directory Pattern Version Script +version=3 +opts=pasv http://sf.net/gutenpalm/makeztxt-(.*)-src\.tar\.gz debian uupdate --- makeztxt-1.62.orig/debian/compat +++ makeztxt-1.62/debian/compat @@ -0,0 +1 @@ +4 --- makeztxt-1.62.orig/debian/changelog +++ makeztxt-1.62/debian/changelog @@ -0,0 +1,78 @@ +makeztxt (1.62-0ubuntu2) jaunty; urgency=low + + * Patch on file ztxt_process split into two logically + separate patches. + + -- Morten Kjeldgaard Sat, 06 Dec 2008 01:03:15 +0100 + +makeztxt (1.62-0ubuntu1) jaunty; urgency=low + + [ Brian Murray ] + * New upstream release + - LP: #294877, LP: #177584, LP: #305577 and debian bug 417241 + * debian/watch: updated for current URL (debian bug 450228) + * Ubuntu changes merged: + - libztxt/ztxt_process.c: fix has off-by-one (debian bug 335206) + * define __USE_GNU for process_regex in ztxt_process so it will build + + [ Morten Kjeldgaard ] + * Fixes repackaged as a quilt series + * debian/control: + + updated to include quilt patching + + clean target should not ignore return value + * debian/rules: + + updated to include quilt patching + + Standards-Version: 3.8.0 since this package is ahead of Debian. + + -- Brian Murray Fri, 05 Dec 2008 12:19:40 -0800 + +makeztxt (1.60-5ubuntu2) gutsy; urgency=low + + * debian/control: Update maintainer fields according to debian- + maintainer-field spec. + + -- Martin Pitt Wed, 15 Aug 2007 08:08:00 +0000 + +makeztxt (1.60-5ubuntu1) dapper; urgency=low + + * Patched an off-by-one vulnerability in makeztxt 1.60. Thanks to Marius + Gedminas and Johnny Mast for the fix. (Closes: #3477) + * debian/control: + - Moved Recommends line to proper location. + - Dropped ${misc:Depends} . + - Bumped Standards-Version. + + -- Zak B. Elep Mon, 20 Feb 2006 02:45:03 -0500 + +makeztxt (1.60-5) unstable; urgency=low + + * New maintainer (Closes: #307557) + + -- Rolandas Juodzbalis Wed, 4 May 2005 22:22:01 +0100 + +makeztxt (1.60-4) unstable; urgency=low + + * New upstream Weasel reader fixes compatibility problem (Closes: + #235244) + * Now warns when extra filenames are specified (Closes: #290157) + + -- Gunnar Wolf Thu, 21 Jan 2005 09:38:35 -0600 + +makeztxt (1.60-3) unstable; urgency=low + + * Mentions default behavior for -a in manpage (Closes: #289576) + + -- Gunnar Wolf Wed, 12 Jan 2005 16:19:32 -0600 + +makeztxt (1.60-2) unstable; urgency=low + + * Fixed missing build-depend on zlib1g-dev (Closes: #231263) + + -- Gunnar Wolf Fri, 6 Feb 2004 19:23:49 -0600 + +makeztxt (1.60-1) unstable; urgency=low + + * Initial Release. (Closes: #223370) + + -- Gunnar Wolf Mon, 8 Dec 2003 15:40:47 -0600 + --- makeztxt-1.62.orig/debian/copyright +++ makeztxt-1.62/debian/copyright @@ -0,0 +1,17 @@ +This package was debianized by Gunnar Wolf on +Mon, 8 Dec 2003 15:40:47 -0600. + +This package is maintained by Rolandas Juodzbalis +from 4 May 2005. + +It was downloaded from http://gutenpalm.sf.net + +Upstream Author: John Gruenenfelder + +Copyright: + +Weasel Reader is Copyright (C)2000-2003 John Gruenenfelder. Weasel +Reader is released under the GNU General Public License v2.0. + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. --- makeztxt-1.62.orig/debian/control +++ makeztxt-1.62/debian/control @@ -0,0 +1,24 @@ +Source: makeztxt +Section: otherosfs +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Rolandas Juodzbalis +Build-Depends: debhelper (>= 4.0.0), zlib1g-dev, quilt +Standards-Version: 3.8.0 + +Package: makeztxt +Architecture: any +Depends: ${shlibs:Depends} +Recommends: pilot-link | jpilot | gnome-pilot | kpilot +Description: Create zTXT databases from ASCII files to read them in a Palm + A simple commandline program that takes a plain ASCII text file and + compresses it into a zTXT database. Makeztxt will remove newline + characters at the end of lines that contain text so that the paragraphs + flow better on the Palm screen. Makeztxt supports the use of regular + expressions to automatically generate a list of bookmarks for you. + Lastly. makeztxt can also break an existing zTXT file into its + components (text, bookmarks, annotations) and store them into separate + files. + . + zTXT databases can be opened by the GPLed WeaselReader program in your + Palm (http://gutenpalm.sf.net/) --- makeztxt-1.62.orig/debian/patches/04-ztxt_process.c-crasher.patch +++ makeztxt-1.62/debian/patches/04-ztxt_process.c-crasher.patch @@ -0,0 +1,11 @@ +--- makeztxt-1.62.orig/libztxt/ztxt_process.c ++++ makeztxt-1.62/libztxt/ztxt_process.c +@@ -479,7 +479,7 @@ + if (*offset >= insize - 1) + return NULL; + +- while ((buf[i] != '\n') && (*offset < insize-1) && (i < outsize-1)) ++ while ((buf[i] != '\n') && (*offset < insize-1) && (i < outsize-2)) + { + i++; + (*offset)++; --- makeztxt-1.62.orig/debian/patches/series +++ makeztxt-1.62/debian/patches/series @@ -0,0 +1,4 @@ +01-makeztxt.c.patch +02-makeztxt.1.patch +03-ztxt_process.c-FTBFS.patch +04-ztxt_process.c-crasher.patch --- makeztxt-1.62.orig/debian/patches/02-makeztxt.1.patch +++ makeztxt-1.62/debian/patches/02-makeztxt.1.patch @@ -0,0 +1,87 @@ +--- /dev/null ++++ makeztxt-1.62/makeztxt.1 +@@ -0,0 +1,84 @@ ++.TH MAKEZTXT 1 "Jan 22, 2004" ++.SH NAME ++makeztxt \- Create zTXT databases from ASCII files to read them in a Palm ++.SH SYNOPSIS ++.B "makeztxt \-\-help" ++.br ++.B "makeztxt [\-hlLnV] [\-A annofile] [\-a adjust] [\-b line_length] [\-m markfile]" ++.br ++.B " [\-o outfile] [\-R regexfile] [\-r regex] [\-t title] [\-z comp_type] input" ++.br ++.SH OPTIONS ++.br ++Please note that "input" refers to one and only one file \- makeztxt ++cannot operate on multiple files at once. ++.br ++.IP "\-A, \-\-annofile" ++file containing zTXT annotations ++.IP "\-a, \-\-adjust" ++method for linefeed stripping (0, 1, 2, defaults to 0) ++.RS ++.IP "0" ++strip linefeeds for lines longer than length ++.IP "1" ++strip linefeed if line has any text ++.IP "2" ++no linefeed stripping ++.RE ++.IP "\-b, \-\-length" ++lines longer than this get linefeed stripped ++.IP "\-h, \-\-help" ++this help ++.IP "\-l, \-\-list" ++list regex generated bookmarks ++.IP "\-L, \-\-launchable" ++set the launchable bit in the output DB ++.IP "\-m, \-\-markfile" ++list of bookmarks to use in zTXT ++.IP "\-n, \-\-nobackup" ++do not set the backup bit in the DB ++.IP "\-o, \-\-output" ++output file to be created ++.IP "\-R, \-\-regexfile" ++file containing list of regex to use ++.IP "\-r, \-\-regex" ++do a regex search for bookmarks ++.IP "\-t, \-\-title" ++title of database ++.IP "\-V, \-\-version" ++makeztxt version ++.IP "\-z, \-\-compression" ++method of compression (1 or 2) ++.RS ++.IP "1" ++allow random access (default) ++.IP "2" ++one big data stream (10%-15% more compression) ++.RE ++.SH DESCRIPTION ++.br ++makeztxt is a simple commandline program that takes a plain ASCII text file ++and compresses it into a zTXT database. makeztxt will remove newline ++characters at the end of lines that contain text so that the paragraphs flow ++better on the Palm screen. makeztxt supports the use of regular expressions ++to automatically generate a list of bookmarks for you. Lastly, makeztxt can ++also break an existing zTXT file into it's components (text, bookmarks, ++annotations) and store them into separate files for you. ++.SH FEATURES ++.IP "Creates zTXT databases" ++.IP "Deconstructs zTXT databases into component pieces" ++.IP "Use regular expression to automatically generate bookmarks" ++.IP "Includes libztxt, a small C library, so you can easily add zTXT creation or disection to your program" ++.IP "Create zTXTs that allow on-demand decompression, or get 10% \- 15% more compression with the original style zTXT." ++.IP "Read regular expressions from a config file (.makeztxtrc)" ++.SH SEE ALSO ++.br ++For a full description (with examples) of the options listed above, ++refer to /usr/share/doc/makeztxt/README.gz ++.SH AUTHOR ++John Gruenenfelder (johng@as.arizona.edu) ++.br ++This man page was created for the Debian package by Gunnar Wolf ++(gwolf@debian.org) ++.SH WEBSITE ++http://gutenpalm.sf.net --- makeztxt-1.62.orig/debian/patches/03-ztxt_process.c-FTBFS.patch +++ makeztxt-1.62/debian/patches/03-ztxt_process.c-FTBFS.patch @@ -0,0 +1,13 @@ +--- makeztxt-1.62.orig/libztxt/ztxt_process.c ++++ makeztxt-1.62/libztxt/ztxt_process.c +@@ -26,6 +26,9 @@ + #include + #include + #include ++#ifndef POSIX_REGEX ++# define __USE_GNU ++#endif + #include + #include + #include + --- makeztxt-1.62.orig/debian/patches/01-makeztxt.c.patch +++ makeztxt-1.62/debian/patches/01-makeztxt.c.patch @@ -0,0 +1,14 @@ +--- makeztxt-1.62.orig/makeztxt.c ++++ makeztxt-1.62/makeztxt.c +@@ -355,6 +355,11 @@ + #endif + } + ++ if (optind < argc-1) ++ fprintf(stderr, "%s operates on single files only (%d specified).\n" ++ "Processing %s, ignoring extra filenames.\n", ++ argv[0], argc-optind, argv[optind]); ++ + /* Set the database options from those accumulated on the command line */ + if (!nobackup) + attr |= dmHdrAttrBackup;