diff -Nru pdftk-2.02/debian/changelog pdftk-2.02/debian/changelog --- pdftk-2.02/debian/changelog 2014-05-21 23:26:11.000000000 +0000 +++ pdftk-2.02/debian/changelog 2014-10-20 22:21:02.000000000 +0000 @@ -1,3 +1,12 @@ +pdftk (2.02-2) unstable; urgency=medium + + * Implement 'inverted page ranges with "~"'. (Closes: #758761) + * debian/copyright: Fix paths. + * debian/watch: Fix URL, use https instead of http. + * Bump Standards-Version to 3.9.6. + + -- Johann Felix Soden Mon, 20 Oct 2014 23:42:29 +0200 + pdftk (2.02-1) unstable; urgency=low * New upstream version. diff -Nru pdftk-2.02/debian/control pdftk-2.02/debian/control --- pdftk-2.02/debian/control 2014-05-21 23:06:27.000000000 +0000 +++ pdftk-2.02/debian/control 2014-10-20 21:50:30.000000000 +0000 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Johann Felix Soden Build-Depends: debhelper (>= 9), gcj-4.9-jdk, g++-4.9 -Standards-Version: 3.9.5 +Standards-Version: 3.9.6 Homepage: http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/ Vcs-Git: git://anonscm.debian.org/collab-maint/pdftk.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/pdftk.git;a=summary diff -Nru pdftk-2.02/debian/copyright pdftk-2.02/debian/copyright --- pdftk-2.02/debian/copyright 2014-05-21 22:13:52.000000000 +0000 +++ pdftk-2.02/debian/copyright 2014-10-20 22:21:02.000000000 +0000 @@ -20,7 +20,7 @@ On Debian systems, the complete text of the GNU General Public License version 2 can be found in /usr/share/common-licenses/GPL-2 file. -Files: java/com/* +Files: java/pdftk/com/* Copyright: 1999-2005, Bruno Lowagie 2002, Jeremy Bowman . 2002, Josselin PUJO @@ -47,7 +47,7 @@ version 2 can be found in /usr/share/common-licenses/LGPL-2. -Files: java/com/lowagie/text/pdf/TIFFLZWDecoder.java +Files: java/pdftk/com/lowagie/text/pdf/TIFFLZWDecoder.java Copyright: The Apache Software Foundation License: Apache-2.0 Licensed to the Apache Software Foundation (ASF) under one or more @@ -69,6 +69,7 @@ version 2 can be found in /usr/share/common-licenses/Apache-2.0 file. Files: java/java/* + java/gnu/* Copyright: 1999-2003, Free Software Foundation, Inc. License: GPL-2+ with link exception GNU Classpath is free software; you can redistribute it and/or modify @@ -102,8 +103,8 @@ version 2 can be found in /usr/share/common-licenses/GPL-2 file. -Files: java/com/lowagie/text/pdf/fonts/*.afm - java/com/lowagie/text/pdf/fonts/License-Adobe.txt +Files: java/pdftk/com/lowagie/text/pdf/fonts/*.afm + java/pdftk/com/lowagie/text/pdf/fonts/License-Adobe.txt Copyright: 1985-1997, Adobe Systems Incorporated License: other This file and the 14 PostScript(R) AFM files it accompanies may be diff -Nru pdftk-2.02/debian/patches/feature_inverted_page_range pdftk-2.02/debian/patches/feature_inverted_page_range --- pdftk-2.02/debian/patches/feature_inverted_page_range 1970-01-01 00:00:00.000000000 +0000 +++ pdftk-2.02/debian/patches/feature_inverted_page_range 2014-10-20 22:21:02.000000000 +0000 @@ -0,0 +1,157 @@ +Description: Implements 'inverted page ranges with "~".' +Author: Johann Felix Soden +Bug-Debian: http://bugs.debian.org/758761 +License: GPL-2+ + +--- a/pdftk/pdftk.cc ++++ b/pdftk/pdftk.cc +@@ -637,6 +637,10 @@ + *keyword_len_p= 4; // note: fixed size + return rot_upside_down_k; + } ++ else if( strncmp( ss_copy, "~", 1 )== 0 && strstr( ss_copy, ".pdf" )== NULL ) { ++ *keyword_len_p= 1; ++ return tilde_k; ++ } + + return none_k; + } +@@ -1380,12 +1384,13 @@ + arg_state= output_filename_e; // advance state + } + else if( arg_keyword== none_k || +- arg_keyword== end_k ) ++ arg_keyword== end_k || arg_keyword== tilde_k ) + { // treat argv[ii] like a page sequence + + bool even_pages_b= false; + bool odd_pages_b= false; + int jj= 0; ++ set excluded_pages; + + InputPdfIndex range_pdf_index= 0; { // defaults to first input document + string handle; +@@ -1411,9 +1416,13 @@ + } + } + ++ ++ char* tilde_loc= strchr( argv[ii]+ jj, '~' ); + char* hyphen_loc= strchr( argv[ii]+ jj, '-' ); +- if( hyphen_loc ) ++ if( hyphen_loc && (!tilde_loc || hyphen_loc