diff -Nru aephea-12-248/debian/changelog aephea-12-248/debian/changelog --- aephea-12-248/debian/changelog 2012-11-25 22:30:12.000000000 +0000 +++ aephea-12-248/debian/changelog 2018-02-01 13:46:06.000000000 +0000 @@ -1,3 +1,22 @@ +aephea (12-248-3) unstable; urgency=medium + + * Team upload. + * d/copyright: + - DEP5 + - Add additional copyright statement + * cme fix dpkg-control + * Moved packaging from SVN to Git + * Convert from cdbs to dh + * debhelper 11 + * d/watch: + - version=4 + - Secure URI + - cleanup + * Fix spelling in long description + * Remove duplicated manpage which breaks autoreconf generated makefile + + -- Andreas Tille Thu, 01 Feb 2018 14:46:06 +0100 + aephea (12-248-2) unstable; urgency=low * debian/control: fix vcs tags @@ -17,6 +36,13 @@ -- Joost van Baal-Ilić Wed, 05 Sep 2012 13:20:12 +0200 +aephea (10.008-2) testing-proposed-updates; urgency=low + + * debian/control: add missing Breaks+Replaces: zoem-doc, to enable upgrades + from squeeze to wheezy. Thanks Andreas Beckmann. (Closes: #694365) + + -- Joost van Baal-Ilić Mon, 26 Nov 2012 10:13:51 +0100 + aephea (10.008-1) unstable; urgency=low * First upload (Closes: #620479). diff -Nru aephea-12-248/debian/compat aephea-12-248/debian/compat --- aephea-12-248/debian/compat 2012-11-25 22:13:42.000000000 +0000 +++ aephea-12-248/debian/compat 2018-02-01 13:46:06.000000000 +0000 @@ -1 +1 @@ -7 +11 diff -Nru aephea-12-248/debian/control aephea-12-248/debian/control --- aephea-12-248/debian/control 2012-11-25 22:24:03.000000000 +0000 +++ aephea-12-248/debian/control 2018-02-01 13:46:06.000000000 +0000 @@ -1,19 +1,20 @@ Source: aephea -Section: text -Priority: extra Maintainer: Joost van Baal-Ilić -Build-Depends: cdbs, debhelper (>= 7.0.50~), autotools-dev -Standards-Version: 3.9.3 +Section: text +Priority: optional +Build-Depends: debhelper (>= 11~), +Standards-Version: 4.1.3 +Vcs-Browser: https://salsa.debian.org/debian/aephea.git +Vcs-Git: https://salsa.debian.org/debian/aephea.git Homepage: http://micans.org/aephea -Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/deb-maint/aephea -Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/aephea Package: aephea Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, + ${misc:Depends} +Recommends: zoem Breaks: zoem-doc Replaces: zoem-doc -Recommends: zoem Description: text-based authoring tool for HTML Aephea is an HTML authoring framework. It enforces HTML well-formedness with a simpler and stricter syntax, provides useful extensions and @@ -31,7 +32,6 @@ . If you'd like to generate manpages, but don't like troff syntax, and find Perl's POD too limited, Aephea's PUD is likely useful for you. If you like - your documents to be available in both PDF and HTML, but find Docbook XML + your documents to be available in both PDF and HTML, but find DocBook XML too heavyweight (and aren't really happy with Docbook XML's baroque default tagnames), you'll like PUD. - diff -Nru aephea-12-248/debian/copyright aephea-12-248/debian/copyright --- aephea-12-248/debian/copyright 2012-11-25 22:13:42.000000000 +0000 +++ aephea-12-248/debian/copyright 2018-02-01 13:46:06.000000000 +0000 @@ -1,38 +1,30 @@ -This work was packaged for Debian by: - - Joost van Baal on Sun, 03 Apr 2011 08:37:56 +0200 - -It was downloaded from: - - http://micans.org/aephea/src/ - -Upstream Author: - - Stijn van Dongen micans org> - -Copyright: - - Copyright © 2010 Stijn van Dongen - -License: +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: Aephea +Upstream-Contact: Stijn van Dongen +Source: http://micans.org/aephea/src/ + +Files: * +Copyright: 2010-2012 Stijn van Dongen +License: GPL-3+ + +Files: mac/doc/webindex.* +Copyright: 2012 Stijn van Dongen and Moniek Hopman +License: GPL-3+ + +Files: debian/* +Copyright: 2011-2012 Joost van Baal +License: GPL-3+ +License: GPL-3+ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. - + . This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - -On Debian systems, the complete text of the GNU General Public License can -be found in `/usr/share/common-licenses/GPL'. - -The Debian packaging is: - - Copyright © 2011 Joost van Baal - -and is licensed under the GPL version 3, -see "/usr/share/common-licenses/GPL-3". - + . + On Debian systems, the complete text of the GNU General Public License can + be found in `/usr/share/common-licenses/GPL'. diff -Nru aephea-12-248/debian/docs aephea-12-248/debian/docs --- aephea-12-248/debian/docs 2012-11-25 22:13:42.000000000 +0000 +++ aephea-12-248/debian/docs 2018-02-01 13:46:06.000000000 +0000 @@ -1,5 +1,7 @@ NEWS README TODO +AUTHORS +THANKS debian/aephea/usr/share/aephea/doc debian/aephea/usr/share/aephea/examples diff -Nru aephea-12-248/debian/patches/fix_manpage_install.patch aephea-12-248/debian/patches/fix_manpage_install.patch --- aephea-12-248/debian/patches/fix_manpage_install.patch 1970-01-01 00:00:00.000000000 +0000 +++ aephea-12-248/debian/patches/fix_manpage_install.patch 2018-02-01 13:46:06.000000000 +0000 @@ -0,0 +1,15 @@ +Description: Remove duplicated manpage which breaks autoreconf generated makefile +Author: Andreas Tille +Last-Update: Thu, 01 Feb 2018 14:13:22 +0100 + +--- a/mac/doc/Makefile.am ++++ b/mac/doc/Makefile.am +@@ -17,7 +17,7 @@ doc_DATA = pud-man.html pud-man.ps pud-m + docexamplesdir = $(datadir)/${PACKAGE}/examples + docexamples_DATA = pud-man.azm pud-faq.azm aephea-base.azm aephea-ref.azm pud.azm webindex.azm + +-man_MANS = pud-man.7 pud-faq.7 aephea-base.7 pud-man.7 aephea-ref.7 pud.7 ++man_MANS = pud-man.7 pud-faq.7 aephea-base.7 aephea-ref.7 pud.7 + + stamp_foo = stamp.day stamp.month stamp.stamp stamp.tag stamp.year + diff -Nru aephea-12-248/debian/patches/series aephea-12-248/debian/patches/series --- aephea-12-248/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ aephea-12-248/debian/patches/series 2018-02-01 13:46:06.000000000 +0000 @@ -0,0 +1 @@ +fix_manpage_install.patch diff -Nru aephea-12-248/debian/rules aephea-12-248/debian/rules --- aephea-12-248/debian/rules 2012-11-25 22:13:42.000000000 +0000 +++ aephea-12-248/debian/rules 2018-02-01 13:46:06.000000000 +0000 @@ -1,13 +1,9 @@ #!/usr/bin/make -f -# $Id: rules 18468 2011-04-21 22:39:38Z joostvb $ -# $URL: svn+ssh://svn.debian.org/svn/collab-maint/deb-maint/aephea/trunk/debian/rules $ +%: + dh $@ -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/autotools.mk - -## install/aephea:: - -binary-install/aephea:: +override_dh_installdocs: + dh_installdocs rm -rf debian/aephea/usr/share/aephea/doc rm -rf debian/aephea/usr/share/aephea/examples diff -Nru aephea-12-248/debian/watch aephea-12-248/debian/watch --- aephea-12-248/debian/watch 2012-11-25 22:13:42.000000000 +0000 +++ aephea-12-248/debian/watch 2018-02-01 13:46:06.000000000 +0000 @@ -1,12 +1,3 @@ -# $Id: watch 23124 2012-09-07 09:48:25Z joostvb $ -# $URL: svn+ssh://svn.debian.org/svn/collab-maint/deb-maint/aephea/trunk/debian/watch $ -# -# watch control file for uscan -# you can run the "uscan" command -# to check for upstream updates and more. -# See uscan(1) for format +version=4 -# Compulsory line, this is a version 3 file -version=3 - -http://micans.org/aephea/src/aephea-([\d\.-]+)\.tar\.gz +https://micans.org/aephea/src/aephea-([\d\.-]+)\.tar\.gz