[DRE-commits] [SCM] kwalify.git branch, master, updated. upstream/0.7.2-4-gd381bec

Sat Sep 17 00:07:59 UTC 2011

The following commit has been merged in the master branch:
commit d381becb1ea832b74496cb4e62a8c7d82eaf898d
Author: Marc Dequènes (Duck) <Duck at DuckCorp.org>
Date:   Sat Sep 17 01:47:15 2011 +0200

    [evol] manpage update

diff --git a/debian/changelog b/debian/changelog
index 13a6099..fee2bd4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ kwalify (0.7.2-2) unstable; urgency=low
   * Switched to the new git repository.
   * Converted copyright file to DEP5.
   * Improved description a bit.
+  * Updated manpage (DocBook 5.0, syntax fixes…).
 
- -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Fri, 16 Sep 2011 22:56:06 +0200
+ -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Sat, 17 Sep 2011 01:46:39 +0200
 
 kwalify (0.7.2-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index b9fe61a..b353673 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Marc Dequènes (Duck) <Duck at DuckCorp.org>
 Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.8~)
-Build-Depends-Indep: xsltproc, docbook-xml, docbook-xsl
+Build-Depends-Indep: xsltproc, docbook5-xml, docbook-xsl-ns
 Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/pkg-ruby-extras/kwalify.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/kwalify.git;a=summary
diff --git a/debian/kwalify.xml b/debian/kwalify.xml
index 4ef8dae..98f2490 100644
--- a/debian/kwalify.xml
+++ b/debian/kwalify.xml
@@ -1,14 +1,14 @@
 <?xml version='1.0' encoding='utf-8'?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML 5.0//EN"
+"http://www.oasis-open.org/docbook/xml/5.0/dtd/docbook.dtd" [
 
 <!--
 
 Process this file with an XSLT processor: `xsltproc \
--''-nonet /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
+-''-nonet /usr/share/xml/docbook/stylesheet/docbook-xsl-ns/\
 manpages/docbook.xsl manpage.dbk'.  A manual page
 <package>.<section> will be generated.  You may view the
-manual page with: nroff -man <package>.<section> | less'.  A
+manual page with: man -l <package>.<section>'.  A
 typical entry in a Makefile or Makefile.am is:
 
 DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
@@ -26,49 +26,61 @@ and docbook-xsl in your Build-Depends control field.
 
 -->
 
-  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
-  <!ENTITY dhfirstname "<firstname>Marc</firstname>">
-  <!ENTITY dhsurname   "<surname>Dequ\[`e]nes</surname>">
   <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY dhdate      "<date>20070511</date>">
+  <!ENTITY dhdate      "2011-09-16">
   <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
        allowed: see man(7), man(1). -->
-  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
-  <!ENTITY dhemail     "<email>Duck at DuckCorp.org</email>">
-  <!ENTITY dhusername  "Marc Dequ\[`e]nes (Duck)">
-  <!ENTITY dhucpackage "<refentrytitle>KWALIFY</refentrytitle>">
+  <!ENTITY dhsection   "1">
+  <!ENTITY dhproduct   "Kwalify">
   <!ENTITY dhpackage   "kwalify">
-
-  <!ENTITY debian      "<productname>Debian</productname>">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
 ]>
 
-<refentry>
-  <refentryinfo>
-    <address>
-      &dhemail;
-    </address>
+<refentry xmlns="http://docbook.org/ns/docbook"
+          xmlns:xlink="http://www.w3.org/1999/xlink"
+          version="5.0"
+          xml:lang="en"
+          xml:id="&dhpackage;">
+  <info>
     <author>
-      &dhfirstname;
-      &dhsurname;
+	  <firstname>Marc</firstname>
+      <surname>Dequènes</surname>
+	  <othername role="nickname">`Duck`</othername>
+      <email>Duck at DuckCorp.org</email>
+	  <contrib>Original author.</contrib>
     </author>
     <copyright>
-      <year>2007</year>
-      <holder>&dhusername;</holder>
+      <year>2007-2011</year>
+      <holder>Marc Dequènes (Duck)</holder>
     </copyright>
-    &dhdate;
-  </refentryinfo>
+	<legalnotice>
+    <para>
+	  This manual page was written for the <productname>Debian</productname>
+	  system (but may be used by others). Permission is granted to copy, distribute
+	  and/or modify this document under the terms of the GNU General Public License,
+	  Version 3 or any later version published by the Free Software Foundation.
+    </para>
+	<para>
+	  On <productname>Debian</productname> systems, the complete text of the GNU General Public
+	  License version 3 can be found in /usr/share/common-licenses/GPL-3.
+	</para>
+	</legalnotice>
+    <date>&dhdate;</date>
+  </info>
+
   <refmeta>
-    &dhucpackage;
+	<refentrytitle>&dhpackage;</refentrytitle>
+    <refmiscinfo class="source">&dhproduct;</refmiscinfo>
+    <refmiscinfo class="manual">User Commands</refmiscinfo>
 
-    &dhsection;
+    <manvolnum>&dhsection;</manvolnum>
   </refmeta>
+
   <refnamediv>
     <refname>&dhpackage;</refname>
 
     <refpurpose>Tiny schema validator for YAML and JSON</refpurpose>
   </refnamediv>
+
   <refsynopsisdiv>
     <cmdsynopsis>
       <command>&dhpackage;</command>
@@ -123,12 +135,14 @@ and docbook-xsl in your Build-Depends control field.
 
     </cmdsynopsis>
   </refsynopsisdiv>
+
   <refsect1>
     <title>DESCRIPTION</title>
 
     <para><command>&dhpackage;</command> validates schema file, or YAML / JSON file against a schema.</para>
 
   </refsect1>
+
   <refsect1>
     <title>OPTIONS</title>
 
@@ -207,20 +221,5 @@ and docbook-xsl in your Build-Depends control field.
       </varlistentry>
     </variablelist>
   </refsect1>
-  <refsect1>
-    <title>AUTHOR</title>
-
-    <para>This manual page was written by &dhusername; &dhemail; for
-      the &debian; system (but may be used by others).  Permission is
-      granted to copy, distribute and/or modify this document under
-      the terms of the &gnu; General Public License, Version 2 any 
-	  later version published by the Free Software Foundation.
-    </para>
-	<para>
-	  On Debian systems, the complete text of the GNU General Public
-	  License can be found in /usr/share/common-licenses/GPL.
-	</para>
-
-  </refsect1>
 </refentry>
 
diff --git a/debian/rules b/debian/rules
index 0f68bec..76f6ab0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,7 @@ MANPAGES := debian/kwalify.1
 	dh $@ --buildsystem=ruby --with ruby
 
 %.1: %.xml
-	xsltproc -nonet -o $@ /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl $<
+	xsltproc --nonet -o $@ /usr/share/xml/docbook/stylesheet/docbook-xsl-ns/manpages/docbook.xsl $<
 
 override_dh_auto_build: $(MANPAGES)
 	dh_auto_build

-- 
kwalify.git

