diff -Nru doclifter-2.6/debian/changelog doclifter-2.7/debian/changelog --- doclifter-2.6/debian/changelog 2011-02-19 22:17:58.000000000 +0000 +++ doclifter-2.7/debian/changelog 2011-09-18 17:10:15.000000000 +0000 @@ -1,3 +1,12 @@ +doclifter (2.7-1) unstable; urgency=low + + * New upstream version. + * Update Standards-Version, fix new lintian issues, fix build + warnings. + * Add "make test" to build. + + -- Jeff Licquia Sun, 18 Sep 2011 13:10:02 -0400 + doclifter (2.6-1) unstable; urgency=low * New upstream version... diff -Nru doclifter-2.6/debian/compat doclifter-2.7/debian/compat --- doclifter-2.6/debian/compat 2011-02-19 20:01:38.000000000 +0000 +++ doclifter-2.7/debian/compat 2011-09-18 16:51:00.000000000 +0000 @@ -1 +1 @@ -5 +6 diff -Nru doclifter-2.6/debian/control doclifter-2.7/debian/control --- doclifter-2.6/debian/control 2011-02-19 22:12:45.000000000 +0000 +++ doclifter-2.7/debian/control 2011-09-18 17:26:44.000000000 +0000 @@ -5,8 +5,8 @@ Homepage: http://www.catb.org/~esr/doclifter/ Vcs-Bzr: http://bzr.licquia.org/doclifter/debian/ Vcs-Browser: http://bzr.licquia.org/loggerhead/doclifter/debian/ -Build-Depends: debhelper (>= 5) -Standards-Version: 3.9.1 +Build-Depends: debhelper (>= 6), python (>= 2.2) +Standards-Version: 3.9.2 Package: doclifter Architecture: all diff -Nru doclifter-2.6/debian/patches/maketest doclifter-2.7/debian/patches/maketest --- doclifter-2.6/debian/patches/maketest 1970-01-01 00:00:00.000000000 +0000 +++ doclifter-2.7/debian/patches/maketest 2011-09-18 17:21:09.000000000 +0000 @@ -0,0 +1,13 @@ +Index: doclifter-debian/Makefile +=================================================================== +--- doclifter-debian.orig/Makefile 2011-09-18 13:20:45.000000000 -0400 ++++ doclifter-debian/Makefile 2011-09-18 13:20:58.000000000 -0400 +@@ -36,7 +36,7 @@ + ls -l doclifter-$(VERS).tar.gz + + test: +- doclifter -v docliftertest1.man ++ ./doclifter -v docliftertest1.man + + pychecker: + @echo "Expect: Local variable (lst) not used" diff -Nru doclifter-2.6/debian/patches/series doclifter-2.7/debian/patches/series --- doclifter-2.6/debian/patches/series 2011-02-19 21:20:49.000000000 +0000 +++ doclifter-2.7/debian/patches/series 2011-09-18 17:20:41.000000000 +0000 @@ -1,2 +1,3 @@ profiler manlifter-outdir +maketest diff -Nru doclifter-2.6/debian/rules doclifter-2.7/debian/rules --- doclifter-2.6/debian/rules 2011-02-19 18:51:59.000000000 +0000 +++ doclifter-2.7/debian/rules 2011-09-18 17:15:17.000000000 +0000 @@ -2,23 +2,27 @@ #export DH_VERBOSE=1 -build: build-stamp +build: build-arch build-indep +build-arch: build-stamp +build-indep: build-stamp build-stamp: dh_testdir - # Nothing needs to be build. We *could* depends on xmlto and + # Nothing needs to be built. We *could* depends on xmlto and # regenerate the docs. + make test touch build-stamp clean: dh_testdir dh_testroot rm -f build-stamp configure-stamp + rm -f docliftertest1.man.xml dh_clean install: build dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs # The makefile is very dumb, and there is really only one thing to # install. We'll use dh_* to install everything. Binary files /tmp/rTqIHMHlL9/doclifter-2.6/docbook-duck.png and /tmp/n_Tb15vEjL/doclifter-2.7/docbook-duck.png differ diff -Nru doclifter-2.6/doclifter doclifter-2.7/doclifter --- doclifter-2.6/doclifter 2010-11-24 18:57:10.000000000 +0000 +++ doclifter-2.7/doclifter 2011-08-23 10:26:56.000000000 +0000 @@ -1931,7 +1931,7 @@ # Drop everything before the NAME section header, this gets rid of # useless preamble lines in ppm pages. date = "" - while not lines[0].startswith("NAME"): + while not lines[0].title().startswith("Name"): if lines[0].find("Updated: ") > -1: date = lines[0][lines[0].find("Updated: ")+10:].strip() lines.pop(0) @@ -2045,6 +2045,12 @@ stderr.write("Looks like a lynx dump...\n") text = self.lynxprep(text, file) self.activate(ManInterpreter) + # Default to a lynx dump even if unsure. + else: + if self.verbose: + stderr.write("Unknown format so defaulting to a lynx dump...\n") + text = self.lynxprep(text, file) + self.activate(ManInterpreter) if timing_verbosity in self.verbose: now = time.time() stderr.write("timing: macro identification = %2.2f\n" % (now-self.basetime,)) diff -Nru doclifter-2.6/doclifter.1 doclifter-2.7/doclifter.1 --- doclifter-2.6/doclifter.1 2010-11-24 18:57:10.000000000 +0000 +++ doclifter-2.7/doclifter.1 2011-08-23 10:26:56.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: doclifter .\" Author: [see the "Author" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 11/24/2010 +.\" Date: 11/25/2010 .\" Manual: Documentation Tools .\" Source: doclifter .\" Language: English .\" -.TH "DOCLIFTER" "1" "11/24/2010" "doclifter" "Documentation Tools" +.TH "DOCLIFTER" "1" "11/25/2010" "doclifter" "Documentation Tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- Binary files /tmp/rTqIHMHlL9/doclifter-2.6/doclifter-logo.png and /tmp/n_Tb15vEjL/doclifter-2.7/doclifter-logo.png differ diff -Nru doclifter-2.6/Makefile doclifter-2.7/Makefile --- doclifter-2.6/Makefile 2010-11-24 18:57:10.000000000 +0000 +++ doclifter-2.7/Makefile 2011-08-23 10:26:56.000000000 +0000 @@ -1,5 +1,5 @@ # Makefile for the doclifter project -VERS=2.6 +VERS=2.7 MANDIR=/usr/share/man/man1 BINDIR=/usr/bin @@ -7,7 +7,7 @@ DOCS = README COPYING TODO BUGS \ doclifter.xml doclifter.1 manlifter.xml manlifter.1 TEST = docliftertest1.man test.troff -SOURCES = doclifter manlifter Makefile $(DOCS) $(TEST) docbook-duck.png +SOURCES = doclifter manlifter Makefile $(DOCS) $(TEST) doclifter-logo.png all: doclifter-$(VERS).tar.gz diff -Nru doclifter-2.6/manlifter.1 doclifter-2.7/manlifter.1 --- doclifter-2.6/manlifter.1 2010-11-24 18:57:10.000000000 +0000 +++ doclifter-2.7/manlifter.1 2011-08-23 10:26:56.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: manlifter .\" Author: [see the "Author" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 11/24/2010 +.\" Date: 11/25/2010 .\" Manual: Documentation Tools .\" Source: manlifter .\" Language: English .\" -.TH "MANLIFTER" "1" "11/24/2010" "manlifter" "Documentation Tools" +.TH "MANLIFTER" "1" "11/25/2010" "manlifter" "Documentation Tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" -----------------------------------------------------------------