[Python-apps-commits] r11108 - in packages/pelican/trunk/debian (7 files)

vcheng at users.alioth.debian.org vcheng at users.alioth.debian.org
Mon Aug 4 08:30:57 UTC 2014 

    Date: Monday, August 4, 2014 @ 08:30:56
  Author: vcheng
Revision: 11108

manually generate manpages

Added:
  packages/pelican/trunk/debian/pelican-import.1
  packages/pelican/trunk/debian/pelican-quickstart.1
  packages/pelican/trunk/debian/pelican-themes.1
  packages/pelican/trunk/debian/pelican.1
Modified:
  packages/pelican/trunk/debian/changelog
  packages/pelican/trunk/debian/control
  packages/pelican/trunk/debian/rules

Modified: packages/pelican/trunk/debian/changelog
===================================================================
--- packages/pelican/trunk/debian/changelog	2014-08-04 04:19:35 UTC (rev 11107)
+++ packages/pelican/trunk/debian/changelog	2014-08-04 08:30:56 UTC (rev 11108)
@@ -1,3 +1,11 @@
+pelican (3.4.0-2) UNRELEASED; urgency=medium
+
+  * Fix broken help2man-generated manpages by manually generating them; this
+    avoids an unwanted build-dependency on python-pelican itself.
+    (Closes: #754612)
+
+ -- Vincent Cheng <vcheng at debian.org>  Mon, 04 Aug 2014 01:22:11 -0700
+
 pelican (3.4.0-1) unstable; urgency=medium
 
   * New upstream release.

Modified: packages/pelican/trunk/debian/control
===================================================================
--- packages/pelican/trunk/debian/control	2014-08-04 04:19:35 UTC (rev 11107)
+++ packages/pelican/trunk/debian/control	2014-08-04 08:30:56 UTC (rev 11108)
@@ -5,7 +5,6 @@
 Uploaders: Ondřej Surý <ondrej at debian.org>, Vincent Cheng <vcheng at debian.org>
 Build-Depends:
  debhelper (>= 7.4.3),
- help2man,
  python-all (>= 2.6.6-3),
  python-setuptools (>= 0.6b3)
 Standards-Version: 3.9.5

Added: packages/pelican/trunk/debian/pelican-import.1
===================================================================
--- packages/pelican/trunk/debian/pelican-import.1	                        (rev 0)
+++ packages/pelican/trunk/debian/pelican-import.1	2014-08-04 08:30:56 UTC (rev 11108)
@@ -0,0 +1,99 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.46.1.
+.TH USAGE: "1" "August 2014" "usage: pelican-import [-h] [--wpfile] [--dotclear] [--posterous] [--tumblr]" "User Commands"
+.SH NAME
+usage: \- import from a feed, Wordpress, or Dotclear files
+.SH DESCRIPTION
+usage: pelican\-import [\-h] [\-\-wpfile] [\-\-dotclear] [\-\-posterous] [\-\-tumblr]
+.TP
+[\-\-feed] [\-o OUTPUT] [\-m MARKUP] [\-\-dir\-cat]
+[\-\-dir\-page] [\-\-filter\-author AUTHOR] [\-\-strip\-raw]
+[\-\-wp\-custpost] [\-\-wp\-attach] [\-\-disable\-slugs]
+[\-e EMAIL] [\-p PASSWORD] [\-b BLOGNAME]
+input
+.PP
+Transform feed, WordPress, Tumblr, Dotclear, or Posterous files into reST
+(rst) or Markdown (md) files. Be sure to have pandoc installed.
+.SS "positional arguments:"
+.TP
+input
+The input file to read
+.SS "optional arguments:"
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
+.TP
+\fB\-\-wpfile\fR
+Wordpress XML export (default: False)
+.TP
+\fB\-\-dotclear\fR
+Dotclear export (default: False)
+.TP
+\fB\-\-posterous\fR
+Posterous export (default: False)
+.TP
+\fB\-\-tumblr\fR
+Tumblr export (default: False)
+.TP
+\fB\-\-feed\fR
+Feed to parse (default: False)
+.TP
+\fB\-o\fR OUTPUT, \fB\-\-output\fR OUTPUT
+Output path (default: output)
+.TP
+\fB\-m\fR MARKUP, \fB\-\-markup\fR MARKUP
+Output markup format (supports rst & markdown)
+(default: rst)
+.TP
+\fB\-\-dir\-cat\fR
+Put files in directories with categories name
+(default: False)
+.TP
+\fB\-\-dir\-page\fR
+Put files recognised as pages in "pages/" subdirectory (wordpress import only) (default: False)
+.TP
+\fB\-\-filter\-author\fR AUTHOR
+Import only post from the specified author (default:
+None)
+.TP
+\fB\-\-strip\-raw\fR
+Strip raw HTML code that can't be converted to markup
+such as flash embeds or iframes (wordpress import
+only) (default: False)
+.TP
+\fB\-\-wp\-custpost\fR
+Put wordpress custom post types in directories. If
+used with \fB\-\-dir\-cat\fR option directories will be created
+as /post_type/category/ (wordpress import only)
+(default: False)
+.TP
+\fB\-\-wp\-attach\fR
+(wordpress import only) Download files uploaded to
+wordpress as attachments. Files will be added to posts
+as a list in the post header. All files will be
+downloaded, even if they aren't associated with a
+post. Files with be downloaded with their original
+path inside the output directory. e.g. output/wpuploads/date/postname/file.jpg \fB\-\-\fR Requires an internet
+connection \fB\-\-\fR (default: False)
+.TP
+\fB\-\-disable\-slugs\fR
+Disable storing slugs from imported posts within
+output. With this disabled, your Pelican URLs may not
+be consistent with your original posts. (default:
+False)
+.TP
+\fB\-e\fR EMAIL, \fB\-\-email\fR EMAIL
+Email address (posterous import only) (default: None)
+.TP
+\fB\-p\fR PASSWORD, \fB\-\-password\fR PASSWORD
+Password (posterous import only) (default: None)
+.TP
+\fB\-b\fR BLOGNAME, \fB\-\-blogname\fR BLOGNAME
+Blog name (Tumblr import only) (default: None)
+.TP
+[\-\-feed] [\-o OUTPUT] [\-m MARKUP] [\-\-dir\-cat]
+[\-\-dir\-page] [\-\-filter\-author AUTHOR] [\-\-strip\-raw]
+[\-\-wp\-custpost] [\-\-wp\-attach] [\-\-disable\-slugs]
+[\-e EMAIL] [\-p PASSWORD] [\-b BLOGNAME]
+input
+.PP
+pelican\-import: error: too few arguments

Added: packages/pelican/trunk/debian/pelican-quickstart.1
===================================================================
--- packages/pelican/trunk/debian/pelican-quickstart.1	                        (rev 0)
+++ packages/pelican/trunk/debian/pelican-quickstart.1	2014-08-04 08:30:56 UTC (rev 11108)
@@ -0,0 +1,26 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.46.1.
+.TH USAGE: "1" "August 2014" "usage: pelican-quickstart [-h] [-p PATH] [-t title] [-a author] [-l lang]" "User Commands"
+.SH NAME
+usage: \- kickstart a Pelican blog
+.SH DESCRIPTION
+usage: pelican\-quickstart [\-h] [\-p PATH] [\-t title] [\-a author] [\-l lang]
+.PP
+A kickstarter for Pelican
+.SS "optional arguments:"
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
+.TP
+\fB\-p\fR PATH, \fB\-\-path\fR PATH
+The path to generate the blog into (default: .)
+.TP
+\fB\-t\fR title, \fB\-\-title\fR title
+Set the title of the website (default: None)
+.TP
+\fB\-a\fR author, \fB\-\-author\fR author
+Set the author name of the website (default: None)
+.TP
+\fB\-l\fR lang, \fB\-\-lang\fR lang
+Set the default web site language (default: None)
+.PP
+pelican\-quickstart: error: unrecognized arguments: \fB\-\-version\fR

Added: packages/pelican/trunk/debian/pelican-themes.1
===================================================================
--- packages/pelican/trunk/debian/pelican-themes.1	                        (rev 0)
+++ packages/pelican/trunk/debian/pelican-themes.1	2014-08-04 08:30:56 UTC (rev 11108)
@@ -0,0 +1,45 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.46.1.
+.TH PELICAN-THEMES "1" "August 2014" "pelican-themes v0.2" "User Commands"
+.SH NAME
+pelican-themes \- install themes for Pelican
+.SH DESCRIPTION
+usage: pelican\-themes [\-h] [\-l | \fB\-p\fR | \fB\-V]\fR [\-i theme path [theme path ...]]
+.TP
+[\-r theme name [theme name ...]]
+[\-U theme path [theme path ...]]
+[\-s theme path [theme path ...]] [\-c] [\-v]
+.PP
+Install themes for Pelican
+.SS "optional arguments:"
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
+.TP
+\fB\-l\fR, \fB\-\-list\fR
+Show the themes already installed and exit
+.TP
+\fB\-p\fR, \fB\-\-path\fR
+Show the themes path and exit
+.TP
+\fB\-V\fR, \fB\-\-version\fR
+Print the version of this script
+.TP
+\fB\-i\fR theme path [theme path ...], \fB\-\-install\fR theme path [theme path ...]
+The themes to install
+.TP
+\fB\-r\fR theme name [theme name ...], \fB\-\-remove\fR theme name [theme name ...]
+The themes to remove
+.TP
+\fB\-U\fR theme path [theme path ...], \fB\-\-upgrade\fR theme path [theme path ...]
+The themes to upgrade
+.TP
+\fB\-s\fR theme path [theme path ...], \fB\-\-symlink\fR theme path [theme path ...]
+Same as `\-\-install', but create a symbolic link
+instead of copying the theme. Useful for theme
+development
+.TP
+\fB\-c\fR, \fB\-\-clean\fR
+Remove the broken symbolic links of the theme path
+.TP
+\fB\-v\fR, \fB\-\-verbose\fR
+Verbose output

Added: packages/pelican/trunk/debian/pelican.1
===================================================================
--- packages/pelican/trunk/debian/pelican.1	                        (rev 0)
+++ packages/pelican/trunk/debian/pelican.1	2014-08-04 08:30:56 UTC (rev 11108)
@@ -0,0 +1,67 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.46.1.
+.TH PELICAN "1" "August 2014" "pelican 3.4.0" "User Commands"
+.SH NAME
+pelican \- tool to generate a static blog
+.SH DESCRIPTION
+usage: pelican [\-h] [\-t THEME] [\-o OUTPUT] [\-s SETTINGS] [\-d] [\-v] [\-q] [\-D]
+.IP
+[\-\-version] [\-r] [\-\-cache\-path CACHE_PATH] [\-\-ignore\-cache]
+[\-w SELECTED_PATHS]
+[path]
+.PP
+A tool to generate a static blog, with restructured text input files.
+.SS "positional arguments:"
+.TP
+path
+Path where to find the content files. (default: None)
+.SS "optional arguments:"
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+show this help message and exit
+.TP
+\fB\-t\fR THEME, \fB\-\-theme\-path\fR THEME
+Path where to find the theme templates. If not
+specified, it will use the default one included with
+pelican. (default: None)
+.TP
+\fB\-o\fR OUTPUT, \fB\-\-output\fR OUTPUT
+Where to output the generated files. If not specified,
+a directory will be created, named "output" in the
+current path. (default: None)
+.TP
+\fB\-s\fR SETTINGS, \fB\-\-settings\fR SETTINGS
+The settings of the application, this is automatically
+set to pelicanconf.py if a file exists with this name.
+(default: None)
+.TP
+\fB\-d\fR, \fB\-\-delete\-output\-directory\fR
+Delete the output directory. (default: None)
+.TP
+\fB\-v\fR, \fB\-\-verbose\fR
+Show all messages. (default: None)
+.TP
+\fB\-q\fR, \fB\-\-quiet\fR
+Show only critical errors. (default: None)
+.TP
+\fB\-D\fR, \fB\-\-debug\fR
+Show all messages, including debug messages. (default:
+None)
+.TP
+\fB\-\-version\fR
+Print the pelican version and exit.
+.TP
+\fB\-r\fR, \fB\-\-autoreload\fR
+Relaunch pelican each time a modification occurs on
+the content files. (default: False)
+.TP
+\fB\-\-cache\-path\fR CACHE_PATH
+Directory in which to store cache files. If not
+specified, defaults to "cache". (default: None)
+.TP
+\fB\-\-ignore\-cache\fR
+Ignore content cache from previous runs by not loading
+cache files. (default: False)
+.TP
+\fB\-w\fR SELECTED_PATHS, \fB\-\-write\-selected\fR SELECTED_PATHS
+Comma separated list of selected paths to write
+(default: None)

Modified: packages/pelican/trunk/debian/rules
===================================================================
--- packages/pelican/trunk/debian/rules	2014-08-04 04:19:35 UTC (rev 11107)
+++ packages/pelican/trunk/debian/rules	2014-08-04 08:30:56 UTC (rev 11108)
@@ -6,15 +6,13 @@
 override_dh_clean:
 	dh_clean
 	rm -f pelican.egg-info/SOURCES.txt pelican.egg-info/requires.txt
-	rm -f debian/*.1
 
-override_dh_install:
-	dh_install
-	# Generate manpages using help2man
-	help2man -N --no-discard-stderr -n "tool to generate a static blog" debian/python-pelican/usr/bin/pelican > debian/pelican.1
-	help2man -N --no-discard-stderr -n "import from a feed, Wordpress, or Dotclear files" debian/python-pelican/usr/bin/pelican-import > debian/pelican-import.1
-	help2man -N --no-discard-stderr -n "kickstart a Pelican blog" debian/python-pelican/usr/bin/pelican-quickstart > debian/pelican-quickstart.1
-	help2man -N --no-discard-stderr -n "install themes for Pelican" debian/python-pelican/usr/bin/pelican-themes > debian/pelican-themes.1
-
 override_dh_installchangelogs:
 	dh_installchangelogs docs/changelog.rst
+
+generate_manpages:
+	# Generate manpages using help2man
+	[ -x /usr/bin/pelican ] && help2man -N --no-discard-stderr -n "tool to generate a static blog" /usr/bin/pelican > debian/pelican.1
+	[ -x /usr/bin/pelican-import ] && help2man -N --no-discard-stderr -n "import from a feed, Wordpress, or Dotclear files" /usr/bin/pelican-import > debian/pelican-import.1
+	[ -x /usr/bin/pelican-quickstart ] && help2man -N --no-discard-stderr -n "kickstart a Pelican blog" /usr/bin/pelican-quickstart > debian/pelican-quickstart.1
+	[ -x /usr/bin/pelican-themes ] && help2man -N --no-discard-stderr -n "install themes for Pelican" /usr/bin/pelican-themes > debian/pelican-themes.1

More information about the Python-apps-commits mailing list