]> granicus.if.org Git - docbook-dsssl/commitdiff
added aptitude man-page sources (patched) to regression set
authorMichael Smith <xmldoc@users.sourceforge.net>
Tue, 1 Apr 2008 09:58:40 +0000 (09:58 +0000)
committerMichael Smith <xmldoc@users.sourceforge.net>
Tue, 1 Apr 2008 09:58:40 +0000 (09:58 +0000)
contrib/samples/refentry/aptitude/Makefile [new file with mode: 0644]
contrib/samples/refentry/aptitude/patch.smith.manpage.xml.1 [new file with mode: 0644]

diff --git a/contrib/samples/refentry/aptitude/Makefile b/contrib/samples/refentry/aptitude/Makefile
new file mode 100644 (file)
index 0000000..8f006e9
--- /dev/null
@@ -0,0 +1,28 @@
+BASEURL=http://hg.debian.org/hg/aptitude/head
+SUBMODULE=doc
+
+TMP ?= /tmp
+
+HG=hg
+HGFLAGS=
+
+PATCHFILE=patch.smith.manpage.xml.1
+
+all: $(SUBMODULE)
+
+$(TMP)/aptitude/doc: $(PATCHFILE)
+       $(RM) -r $(TMP)/aptitude
+       (cd $(TMP) \
+         && $(HG) $(HGFLAGS) clone $(BASEURL) aptitude \
+         && cd aptitude \
+         && ./autogen.sh)
+       cp $< $@/en
+       (cd $@/en && patch -p0 < $(PATCHFILE))
+       make -C $@
+
+$(SUBMODULE): $(TMP)/aptitude/doc
+       cp -pR $< $@
+
+clean:
+       $(RM) -r $(SUBMODULE)
+       $(RM) -r $(TMP)/aptitude
diff --git a/contrib/samples/refentry/aptitude/patch.smith.manpage.xml.1 b/contrib/samples/refentry/aptitude/patch.smith.manpage.xml.1
new file mode 100644 (file)
index 0000000..02e0576
--- /dev/null
@@ -0,0 +1,74 @@
+diff -r 9050a3ecc8ec manpage.xml
+--- manpage.xml        Sun Mar 30 13:23:49 2008 -0700
++++ manpage.xml        Tue Apr 01 16:53:01 2008 +0900
+@@ -952,14 +952,14 @@ i A texlive-latex-extra Conflicts textop
+       <term><literal>--allow-new-upgrades</literal></term>
+       <listitem>
+-        When the safe resolver is being used (i.e., <link
++        <simpara>When the safe resolver is being used (i.e., <link
+         linkend='cmdlineSafeResolver'><literal>--safe-resolver</literal></link>
+         was passed or <link
+         linkend='configAlways-Use-Safe-Resolver'><literal>Aptitude::Always-Use-Safe-Resolver</literal></link>
+         is set to <literal>true</literal>), allow the dependency
+         resolver to install upgrades for packages even if <link
+         linkend='configSafe-Resolver-No-New-Upgrades'><literal>Aptitude::Safe-Resolver::No-New-Upgrades</literal></link>
+-        is set.
++        is set.</simpara>
+       </listitem>
+       </varlistentry>
+@@ -967,7 +967,7 @@ i A texlive-latex-extra Conflicts textop
+       <term><literal>--allow-new-installs</literal></term>
+       <listitem>
+-        Allow the <link
++        <simpara>Allow the <link
+         linkend='manpageSafeUpgrade'><literal>safe-upgrade</literal></link>
+         command to install new packages; when the safe resolver is
+         being used (i.e., <link
+@@ -978,7 +978,7 @@ i A texlive-latex-extra Conflicts textop
+         resolver to install new packages.  This option takes effect
+         even if <link
+         linkend='configSafe-Resolver-No-New-Installs'><literal>Aptitude::Safe-Resolver::No-New-Installs</literal></link>
+-        is true.
++        is true.</simpara>
+       </listitem>
+       </varlistentry>
+@@ -986,9 +986,9 @@ i A texlive-latex-extra Conflicts textop
+       <term><literal>--allow-untrusted</literal></term>
+       <listitem>
+-        Install packages from untrusted sources without prompting.
++        <simpara>Install packages from untrusted sources without prompting.
+         You should only use this if you know what you are doing, as
+-        it could easily compromise your system's security.
++        it could easily compromise your system's security.</simpara>
+       </listitem>
+       </varlistentry>
+@@ -1108,14 +1108,14 @@ i A texlive-latex-extra Conflicts textop
+       <term><literal>--no-new-upgrades</literal></term>
+       <listitem>
+-        When the safe resolver is being used (i.e., <link
++        <simpara>When the safe resolver is being used (i.e., <link
+         linkend='cmdlineSafeResolver'><literal>--safe-resolver</literal></link>
+         was passed or <link
+         linkend='configAlways-Use-Safe-Resolver'><literal>Aptitude::Always-Use-Safe-Resolver</literal></link>
+         is set to <literal>true</literal>), allow the dependency
+         resolver to install new packages even if <link
+         linkend='configSafe-Resolver-No-New-Upgrades'><literal>Aptitude::Safe-Resolver::No-New-Installs</literal></link>
+-        is set.
++        is set.</simpara>
+       </listitem>
+       </varlistentry>
+@@ -2131,4 +2131,4 @@ The following packages will be REMOVED:
+       <citerefentry><refentrytitle>apt</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+     </para>
+   </refsect1>
+-</refentry>
+\ No newline at end of file
++</refentry>