diff options
| author | Christoph Egger <Christoph.Egger@gmx.de> | 2010-06-30 18:31:34 +0200 |
|---|---|---|
| committer | Christoph Egger <Christoph.Egger@gmx.de> | 2010-06-30 18:31:34 +0200 |
| commit | 9e03afafbaf528c71cf1b9bcba814b2c724a0fcb (patch) | |
| tree | 14d1f23f6cf4d01fea659237580298a93a7120a0 | |
| parent | db1b0242bb77f34c80f5420a5e122c300c2782e5 (diff) | |
Update debian packaging for new version
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/patches/fix-buffer-resize.patch | 27 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
4 files changed, 9 insertions, 29 deletions
diff --git a/debian/changelog b/debian/changelog index 35b7820..cfd8b1a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +pdfgrep (1.1-1) unstable; urgency=low + + * New upstream release + * Drop patch again, was taken from upstream VCS and already in this release + * Policy 3.9.0 (no changes) + + -- Christoph Egger <christoph@debian.org> Wed, 30 Jun 2010 18:26:03 +0200 + pdfgrep (1.0-2) unstable; urgency=medium * Fix buffer overrun for some pdfs diff --git a/debian/control b/debian/control index af57456..8d653b8 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: utils Priority: optional Maintainer: Christoph Egger <christoph@debian.org> Build-Depends: debhelper (>= 7.0.50~), automake, libpoppler-dev -Standards-Version: 3.8.4 +Standards-Version: 3.9.0 Homepage: http://pdfgrep.sourceforge.net/ Vcs-Git: git://git.informatik.uni-erlangen.de/siccegge/deb/pdfgrep Vcs-Browser: http://git.informatik.uni-erlangen.de/?p=siccegge/deb/pdfgrep;a=summary diff --git a/debian/patches/fix-buffer-resize.patch b/debian/patches/fix-buffer-resize.patch deleted file mode 100644 index 76f7295..0000000 --- a/debian/patches/fix-buffer-resize.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Hans-Peter Deifel <hpdeifel@gmx.de> -Date: Wed, 9 Jun 2010 16:17:37 +0000 (+0200) -Subject: fixed buffer resizing in stream implementation -X-Git-Url: http://git.informatik.uni-erlangen.de/?p=lu03pevi%2Fpdfgrep.git;a=commitdiff_plain;h=88e70b2780ce694d096ddd000ce6b8726705bcfc - -fixed buffer resizing in stream implementation ---- - -diff --git a/pdfgrep.cc b/pdfgrep.cc -index eacfacd..7f2894c 100644 ---- a/pdfgrep.cc -+++ b/pdfgrep.cc -@@ -107,8 +107,12 @@ void set_default_colors() - - void maybe_update_buffer(struct stream *s, int len) - { -- if (s->charpos + len > s->bufsize) { -- s->bufsize = s->bufsize * 2; -+ if (s->charpos + len >= s->bufsize) { -+ /* resize buffer */ -+ do -+ s->bufsize = s->bufsize * 2; -+ while (s->charpos + len >= s->bufsize); -+ - s->buf = (char*) realloc(s->buf, s->bufsize); - } - } diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 2b26faf..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -fix-buffer-resize.patch |