--- Begin Message ---
Package: naturaldocs
Version: 1.51-1.1
Tags: patch
Severity: wishlist
Hi. I've just uploaded a NMU of naturaldocs to the 7 day delayed upload
queue to fix the reproducable build issue. The upload used the attached
patch.
Please let me know if you want to do the upload yourself, and it not
missing in action. :)
--
Happy hacking
Petter Reinholdtsen
diff -Nru naturaldocs-1.51/debian/changelog naturaldocs-1.51/debian/changelog
--- naturaldocs-1.51/debian/changelog 2016-03-07 22:44:22.000000000 +0000
+++ naturaldocs-1.51/debian/changelog 2016-03-07 22:42:46.000000000 +0000
@@ -1,3 +1,15 @@
+naturaldocs (1.51-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Added homepage to debian/control.
+ * Raise debhelper compat level from 5 to 9 and convert source
+ format to 3.0 (quilt).
+ * Added patch from Chris Lamb to make the output
+ reproducible (Closes: #778962).
+ * Drop unwanted article from short package description start.
+
+ -- Petter Reinholdtsen <[email protected]> Mon, 07 Mar 2016 22:29:28 +0000
+
naturaldocs (1.51-1) unstable; urgency=low
* New upstream release (Closes: #488097, ##458557)
diff -Nru naturaldocs-1.51/debian/compat naturaldocs-1.51/debian/compat
--- naturaldocs-1.51/debian/compat 2016-03-07 22:44:22.000000000 +0000
+++ naturaldocs-1.51/debian/compat 2016-03-07 22:32:22.000000000 +0000
@@ -1 +1 @@
-5
+9
diff -Nru naturaldocs-1.51/debian/control naturaldocs-1.51/debian/control
--- naturaldocs-1.51/debian/control 2016-03-07 22:44:22.000000000 +0000
+++ naturaldocs-1.51/debian/control 2016-03-07 22:37:36.000000000 +0000
@@ -2,13 +2,14 @@
Section: devel
Priority: extra
Maintainer: Federico Di Gregorio <[email protected]>
-Build-Depends: debhelper (>= 5)
-Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.7
+Homepage: http://www.naturaldocs.org/
Package: naturaldocs
Architecture: all
Depends: ${perl:Depends}, ${misc:Depends}
-Description: an extensible, multi-language documentation generator
+Description: extensible, multi-language documentation generator
Natural Docs is an extensible, multi-language documentation
generator. You document your code in a natural syntax that reads
like plain English. Natural Docs then scans your code and builds
diff -Nru naturaldocs-1.51/debian/patches/debian-1.51-1.patch naturaldocs-1.51/debian/patches/debian-1.51-1.patch
--- naturaldocs-1.51/debian/patches/debian-1.51-1.patch 1970-01-01 00:00:00.000000000 +0000
+++ naturaldocs-1.51/debian/patches/debian-1.51-1.patch 2016-03-07 22:40:34.000000000 +0000
@@ -0,0 +1,109 @@
+Description: Changes found in version 1.51-1
+ Changes do to upstream code in version 1.51-1, when the package was
+ converted to the 3.0 (quilt) format.
+Author: unknown
+Forwarded: unknown
+Reviewed-By: Petter Reinholdtsen <[email protected]>
+Last-Update: 2016-03-07
+
+--- /dev/null
++++ naturaldocs-1.51/naturaldocs
+@@ -0,0 +1,2 @@
++#!/bin/sh
++exec /usr/bin/perl /usr/share/perl5/naturaldocs/NaturalDocs $@
+--- /dev/null
++++ naturaldocs-1.51/naturaldocs.1
+@@ -0,0 +1,93 @@
++.\" Hey, EMACS: -*- nroff -*-
++.\" First parameter, NAME, should be all caps
++.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
++.\" other parameters are allowed: see man(7), man(1)
++.TH NATURALDOCS 1 "May 2007"
++.\" Please adjust this date whenever revising the manpage.
++.\"
++.\" Some roff macros, for reference:
++.\" .nh disable hyphenation
++.\" .hy enable hyphenation
++.\" .ad l left justify
++.\" .ad b justify to both left and right margins
++.\" .nf disable filling
++.\" .fi enable filling
++.\" .br insert line break
++.\" .sp <n> insert n+1 empty lines
++.\" for manpage-specific macros, see man(7)
++.SH NAME
++NaturalDocs \- an extensible, multi\-language documentation generator
++.SH SYNOPSIS
++.ad l
++.B naturaldocs
++-i <input (source) directory> [-i <input (source) directory> ...] -o <output format> <output directory> [-o <output format> <output directory> ...] -p <project directory> [options]
++.ad b
++.SH DESCRIPTION
++This manual page documents briefly the .B naturaldocs command. Note that \fBnaturaldocs\fP is a wrapper script that on Debian invokes the real \fBNaturalDocs\fP perl program. So, the real, original name of the program is NaturalDocs but on
++Debian systems you invoke it as naturaldocs.
++.PP
++\fBNatural Docs\fP is is an open-source, extensible, multi-language documentation generator. You document your code in a natural syntax that reads like plain English. Natural Docs then scans your code and builds high-quality HTML documentation from it.
++.SH OPTIONS
++A summary of options, extracted from the help printed by the \fB-h\fP
++switch is included below.
++For a complete description of how NaturalDocs works, see the text
++files in the /usr/share/doc/naturaldocs directory.
++.sp
++\fIRequired parameters\fR:
++.TP
++.B \-i, \-\-input, \-\-source DIR
++Specifies an input (source) directory. Required.
++.br
++Can be specified multiple times.
++.TP
++.B \-o, \-\-output FMT DIR
++Specifies an output format and directory. Required.
++.br
++Can be specified multiple times, but only once per directory. Possible output formats are HTML and FramedHTML.
++.TP
++.B \-p, \-\-project DIR
++Specifies the project directory. Required.
++.br
++There needs to be a unique project directory for every source directory.
++.sp
++.PP
++\fIOptional parameters\fR:
++.TP
++.B \-s, \-\-style STYLE [STYLE ...]
++Specifies the CSS style when building HTML output. If multiple styles are specified, they will all be included in the order given.
++.TP
++.B \-img, \-\-image DIR
++Specifies an image directory. Can be specified multiple times. Start with \fB*\fP to specify a relative directory, as in -img */images.
++.TP
++.B \-do, \-\-documented\-only
++Specifies only documented code aspects should be included in the output.
++.TP
++.B \-t, \-\-tab\-length LEN
++Specifies the number of spaces tabs should be expanded to. This only needs to be set if you use tabs in example code and text diagrams. Defaults to 4.
++.TP
++.B \-xi, \-\-exclude\-input, \-\-exclude\-source
++Excludes an input (source) directory from the documentation. Automatically done for the project and output directories. Can be specified multiple times.
++.TP
++.B \-nag, \-\-no\-auto\-group
++Turns off auto-grouping completely.
++.TP
++.B \-oft, \-\-only\-file\-titles
++Source files will only use the file name as the title.
++.TP
++.B \-r, \-\-rebuild
++Rebuilds all output and data files from scratch. Does not affect the menu file.
++.TP
++.B \-ro, \-\-rebuild\-output
++Rebuilds all output files from scratch.
++.TP
++.B \-q, \-\-quiet
++Suppresses all non-error output.
++.TP
++.B \-?, \-h, \-\-help
++Displays syntax reference.
++.br
++.SH AUTHOR
++NaturalDocs was written by Greg Valure <[email protected]>.
++.PP
++This manual page was written by Federico Di Gregorio <[email protected]>,
++for the Debian project (but may be used by others).
diff -Nru naturaldocs-1.51/debian/patches/reproducable-ordering.patch naturaldocs-1.51/debian/patches/reproducable-ordering.patch
--- naturaldocs-1.51/debian/patches/reproducable-ordering.patch 1970-01-01 00:00:00.000000000 +0000
+++ naturaldocs-1.51/debian/patches/reproducable-ordering.patch 2016-03-07 22:35:05.000000000 +0000
@@ -0,0 +1,24 @@
+Description: Make generated output predictable
+ This make packages built using naturaldocs reproducable.
+Author: Chris Lamb <[email protected]>
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Bug-Debian: https://bugs.debian.org/778962
+Forwarded: no
+Reviewed-By: Petter Reinholdtsen <[email protected]>
+Last-Update: 2016-03-07
+
+--- naturaldocs-1.51.orig/Modules/NaturalDocs/Builder/HTMLBase.pm
++++ naturaldocs-1.51/Modules/NaturalDocs/Builder/HTMLBase.pm
+@@ -578,7 +578,7 @@ sub EndBuild #(hasChanged)
+ }
+
+
+- my @indexes = keys %{NaturalDocs::Menu->Indexes()};
++ my @indexes = sort keys %{NaturalDocs::Menu->Indexes()};
+
+ open(FH_INDEXINFOJS, '>' . NaturalDocs::File->JoinPaths( $self->JavaScriptDirectory(), 'searchdata.js'));
+ binmode(FH_INDEXINFOJS, ':encoding(UTF-8)');
diff -Nru naturaldocs-1.51/debian/patches/series naturaldocs-1.51/debian/patches/series
--- naturaldocs-1.51/debian/patches/series 1970-01-01 00:00:00.000000000 +0000
+++ naturaldocs-1.51/debian/patches/series 2016-03-07 22:33:30.000000000 +0000
@@ -0,0 +1,2 @@
+debian-1.51-1.patch
+reproducable-ordering.patch
diff -Nru naturaldocs-1.51/debian/rules naturaldocs-1.51/debian/rules
--- naturaldocs-1.51/debian/rules 2016-03-07 22:44:22.000000000 +0000
+++ naturaldocs-1.51/debian/rules 2016-03-07 22:37:21.000000000 +0000
@@ -41,7 +41,7 @@
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
cp -ra Modules Config JavaScript Styles NaturalDocs \
debian/naturaldocs/$(perlmoddir)/naturaldocs
diff -Nru naturaldocs-1.51/debian/source/format naturaldocs-1.51/debian/source/format
--- naturaldocs-1.51/debian/source/format 1970-01-01 00:00:00.000000000 +0000
+++ naturaldocs-1.51/debian/source/format 2016-03-07 22:30:33.000000000 +0000
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru naturaldocs-1.51/naturaldocs naturaldocs-1.51/naturaldocs
--- naturaldocs-1.51/naturaldocs 2016-03-07 22:44:22.000000000 +0000
+++ naturaldocs-1.51/naturaldocs 1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-#!/bin/sh
-exec /usr/bin/perl /usr/share/perl5/naturaldocs/NaturalDocs $@
-
diff -Nru naturaldocs-1.51/naturaldocs.1 naturaldocs-1.51/naturaldocs.1
--- naturaldocs-1.51/naturaldocs.1 2016-03-07 22:44:22.000000000 +0000
+++ naturaldocs-1.51/naturaldocs.1 1970-01-01 00:00:00.000000000 +0000
@@ -1,94 +0,0 @@
-.\" Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH NATURALDOCS 1 "May 2007"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh disable hyphenation
-.\" .hy enable hyphenation
-.\" .ad l left justify
-.\" .ad b justify to both left and right margins
-.\" .nf disable filling
-.\" .fi enable filling
-.\" .br insert line break
-.\" .sp <n> insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-NaturalDocs \- an extensible, multi\-language documentation generator
-.SH SYNOPSIS
-.ad l
-.B naturaldocs
--i <input (source) directory> [-i <input (source) directory> ...] -o <output format> <output directory> [-o <output format> <output directory> ...] -p <project directory> [options]
-.ad b
-.SH DESCRIPTION
-This manual page documents briefly the .B naturaldocs command. Note that \fBnaturaldocs\fP is a wrapper script that on Debian invokes the real \fBNaturalDocs\fP perl program. So, the real, original name of the program is NaturalDocs but on
-Debian systems you invoke it as naturaldocs.
-.PP
-\fBNatural Docs\fP is is an open-source, extensible, multi-language documentation generator. You document your code in a natural syntax that reads like plain English. Natural Docs then scans your code and builds high-quality HTML documentation from it.
-.SH OPTIONS
-A summary of options, extracted from the help printed by the \fB-h\fP
-switch is included below.
-For a complete description of how NaturalDocs works, see the text
-files in the /usr/share/doc/naturaldocs directory.
-.sp
-\fIRequired parameters\fR:
-.TP
-.B \-i, \-\-input, \-\-source DIR
-Specifies an input (source) directory. Required.
-.br
-Can be specified multiple times.
-.TP
-.B \-o, \-\-output FMT DIR
-Specifies an output format and directory. Required.
-.br
-Can be specified multiple times, but only once per directory. Possible output formats are HTML and FramedHTML.
-.TP
-.B \-p, \-\-project DIR
-Specifies the project directory. Required.
-.br
-There needs to be a unique project directory for every source directory.
-.sp
-.PP
-\fIOptional parameters\fR:
-.TP
-.B \-s, \-\-style STYLE [STYLE ...]
-Specifies the CSS style when building HTML output. If multiple styles are specified, they will all be included in the order given.
-.TP
-.B \-img, \-\-image DIR
-Specifies an image directory. Can be specified multiple times. Start with \fB*\fP to specify a relative directory, as in -img */images.
-.TP
-.B \-do, \-\-documented\-only
-Specifies only documented code aspects should be included in the output.
-.TP
-.B \-t, \-\-tab\-length LEN
-Specifies the number of spaces tabs should be expanded to. This only needs to be set if you use tabs in example code and text diagrams. Defaults to 4.
-.TP
-.B \-xi, \-\-exclude\-input, \-\-exclude\-source
-Excludes an input (source) directory from the documentation. Automatically done for the project and output directories. Can be specified multiple times.
-.TP
-.B \-nag, \-\-no\-auto\-group
-Turns off auto-grouping completely.
-.TP
-.B \-oft, \-\-only\-file\-titles
-Source files will only use the file name as the title.
-.TP
-.B \-r, \-\-rebuild
-Rebuilds all output and data files from scratch. Does not affect the menu file.
-.TP
-.B \-ro, \-\-rebuild\-output
-Rebuilds all output files from scratch.
-.TP
-.B \-q, \-\-quiet
-Suppresses all non-error output.
-.TP
-.B \-?, \-h, \-\-help
-Displays syntax reference.
-.br
-.SH AUTHOR
-NaturalDocs was written by Greg Valure <[email protected]>.
-.PP
-This manual page was written by Federico Di Gregorio <[email protected]>,
-for the Debian project (but may be used by others).
-
--- End Message ---
