diff -Nrub /tmp/Nq03bD9nCQ/dhelp-0.6.5/debian/changelog /tmp/hZx1FHcbK6/dhelp-0.6.5ubuntu1/debian/changelog --- /tmp/Nq03bD9nCQ/dhelp-0.6.5/debian/changelog 2007-12-06 17:04:23.000000000 +0000 +++ /tmp/hZx1FHcbK6/dhelp-0.6.5ubuntu1/debian/changelog 2007-12-07 18:36:18.000000000 +0000 @@ -1,3 +1,12 @@ +dhelp (0.6.5ubuntu1) hardy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes (LP: #174239): + - Add firefox to Recommends in debian/rules. + - Add "ubuntu1" to VERSION in Makefile. + - Modify Maintainer value to match Debian-Maintainer-Field Spec. + + -- Marco Rodrigues Fri, 07 Dec 2007 18:11:44 +0000 + dhelp (0.6.5) unstable; urgency=low * Index *.pdf and *.txt. Otherwise, it seems only PDF files are indexed. @@ -42,6 +51,13 @@ -- Esteban Manchado Velázquez Sun, 25 Nov 2007 20:00:58 +0100 +dhelp (0.5.25ubuntu1) hardy; urgency=low + + * Fixed Makefile. (LP: #161832) + * Set Maintainer field to Ubuntu MOTU Developers. + + -- Sasa Bodiroza Thu, 15 Nov 2007 08:14:00 +0000 + dhelp (0.5.25) unstable; urgency=low * Maintainer change. @@ -639,4 +655,3 @@ -- Marco Budde Wed, 25 Jun 1997 13:04:34 +0200 - diff -Nrub /tmp/Nq03bD9nCQ/dhelp-0.6.5/debian/control /tmp/hZx1FHcbK6/dhelp-0.6.5ubuntu1/debian/control --- /tmp/Nq03bD9nCQ/dhelp-0.6.5/debian/control 2007-12-03 22:26:28.000000000 +0000 +++ /tmp/hZx1FHcbK6/dhelp-0.6.5ubuntu1/debian/control 2007-12-07 18:58:29.000000000 +0000 @@ -1,14 +1,15 @@ Source: dhelp Section: doc Priority: optional -Maintainer: Esteban Manchado Velázquez +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Esteban Manchado Velázquez Uploaders: Stefan Hornburg (Racke) Standards-Version: 3.7.2.0 Build-Depends: debhelper (>= 4.1.16), cdbs (>= 0.4.23-1.1), libgettext-ruby-util Package: dhelp Depends: perl-modules, libtemplate-perl, libhtml-parser-perl, liburi-perl, ruby1.8, libdb4.2-ruby1.8, libcommandline-ruby1.8, libgettext-ruby1.8, doc-base, swish++, liblocale-gettext-perl, libdata-page-perl, pstotext -Recommends: iceweasel | www-browser +Recommends: firefox | www-browser Suggests: httpd, info2www, man2html, lynx | links | w3m | html2text, catdvi, xpdf-utils Architecture: all Description: online help system diff -Nrub /tmp/Nq03bD9nCQ/dhelp-0.6.5/debian/patches/00list /tmp/hZx1FHcbK6/dhelp-0.6.5ubuntu1/debian/patches/00list --- /tmp/Nq03bD9nCQ/dhelp-0.6.5/debian/patches/00list 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/hZx1FHcbK6/dhelp-0.6.5ubuntu1/debian/patches/00list 2007-12-07 18:55:42.000000000 +0000 @@ -0,0 +1 @@ +01_makefile_version_fix.patch diff -Nrub /tmp/Nq03bD9nCQ/dhelp-0.6.5/debian/patches/01_makefile_version_fix.patch /tmp/hZx1FHcbK6/dhelp-0.6.5ubuntu1/debian/patches/01_makefile_version_fix.patch --- /tmp/Nq03bD9nCQ/dhelp-0.6.5/debian/patches/01_makefile_version_fix.patch 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/hZx1FHcbK6/dhelp-0.6.5ubuntu1/debian/patches/01_makefile_version_fix.patch 2007-12-07 18:54:39.000000000 +0000 @@ -0,0 +1,12 @@ +diff -Nur dhelp-0.6.5ubuntu1/Makefile dhelp-0.6.5ubuntu1.new/Makefile +--- dhelp-0.6.5ubuntu1/Makefile 2007-12-07 18:43:09.000000000 +0000 ++++ dhelp-0.6.5ubuntu1.new/Makefile 2007-12-07 18:54:38.000000000 +0000 +@@ -17,7 +17,7 @@ + # Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. + + PACKAGE = dhelp +-VERSION = 0.6.5 ++VERSION = 0.6.5ubuntu1 + PREFIX_ = $(if $(PREFIX),$(PREFIX),/usr/local) + DESTDIR_ = $(DESTDIR)/$(PREFIX_) + RHTML_TEMPLATES = *.rhtml diff -Nrub /tmp/Nq03bD9nCQ/dhelp-0.6.5/debian/rules /tmp/hZx1FHcbK6/dhelp-0.6.5ubuntu1/debian/rules --- /tmp/Nq03bD9nCQ/dhelp-0.6.5/debian/rules 2007-11-18 15:34:37.000000000 +0000 +++ /tmp/hZx1FHcbK6/dhelp-0.6.5ubuntu1/debian/rules 2007-12-07 18:58:24.000000000 +0000 @@ -7,3 +7,4 @@ DEB_INSTALL_MANPAGES_dhelp = man/dhelp* include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/makefile.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk