[DRE-commits] [SCM] webgen0.5.git branch, master, updated. upstream/0.5.14+dfsg1-4-g0885083
=?UTF-8?Q?Marc=20Dequ=C3=A8nes=20?=(Duck)
Duck at DuckCorp.org
Tue Sep 20 03:25:07 UTC 2011
The following commit has been merged in the master branch:
commit 3b1764db7d33994b3e6ef553b7e9d7676527ccc5
Author: Marc Dequènes (Duck) <Duck at DuckCorp.org>
Date: Tue Sep 20 03:07:47 2011 +0200
[evol] NUR and conversion to gem2deb style
diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 0000000..a5e5e16
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,26 @@
+Webgen is dynamic and some extra features can be activated by installing the
+following packages:
+
+- ruby-redcloth if you want Textile support. (http://hobix.com/textile/)
+- ruby-rmagick if you want automatic thumbnail creation for picture
+ galleries.
+- libexif-ruby1.8 or libexif-ruby1.9.1 if you want to be able to have EXIF
+ information available for image galleries.
+- ruby-bluecloth if you want Markdown support.
+- ruby-builder if you want to be able to programmatically create XHTML/XML
+ documents.
+
+================================================================================
+
+Use the command "webgen help" to see webgen's inline help.
+
+================================================================================
+
+Quickstart tour:
+
+- First type: webgen create sample_site
+A directory sample_site is created containing a webgen site template.
+
+- Go in the newly created directory and type webgen (or webgen run) to generate
+the html pages from the templates.
+
diff --git a/debian/changelog b/debian/changelog
index c411f75..1556f2e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,201 @@
webgen0.5 (0.5.14+dfsg1-1) UNRELEASED; urgency=low
- * Initial release (Closes: #nnnn)
+ * New upstream release.
+ * Switched to gem2deb packaging style.
+ * Switched to the new git repository.
+ * Updated copyright file.
-- Marc Dequènes (Duck) <Duck at DuckCorp.org> Tue, 20 Sep 2011 01:50:28 +0200
+
+webgen0.5 (0.5.13+dfsg-2) unstable; urgency=low
+
+ * Added myself to uploaders
+ * Rename the binary webgen and its corresponding manual page as webgen0.5
+ * Provide webgen using alternatives (closes: #613127)
+ * Bump to standards version 3.9.1
+ * Update dependencies in order to be installable together with the
+ latest webgen0.4
+
+ -- Vincent Fourmond <fourmond at debian.org> Sun, 13 Feb 2011 20:43:06 +0100
+
+webgen0.5 (0.5.13+dfsg-1) unstable; urgency=low
+
+ * New upstream release.
+ * Increased Standards-Version to 3.9.0 (no changes).
+
+ -- Marc Dequènes (Duck) <Duck at DuckCorp.org> Sat, 31 Jul 2010 10:44:54 +0200
+
+webgen0.5 (0.5.12+dfsg-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Marc Dequènes (Duck) <Duck at DuckCorp.org> Thu, 27 May 2010 20:01:14 +0200
+
+webgen0.5 (0.5.11+dfsg-2) unstable; urgency=high
+
+ * Adapted build dependencies to recent changes in the ruby package,
+ fixing FTBFS (Closes #581333).
+ * Removed Build-Conflicts on libxml2-utils, it is not needed anymore.
+
+ -- Marc Dequènes (Duck) <Duck at DuckCorp.org> Wed, 26 May 2010 00:45:32 +0200
+
+webgen0.5 (0.5.11+dfsg-1) unstable; urgency=low
+
+ [ Paul van Tilburg ]
+ * debian/watch: added mangle rule for the Debian version.
+
+ [ Marc Dequènes (Duck) ]
+ * New upstream release:
+ + 'bin_header.diff' patch obsolete.
+ * Switched to dpkg-source 3.0 (quilt) format.
+ * Fixed obsolete-relation-form-in-source (lintian).
+ * Increased Standards-Version to 3.8.4 (no changes).
+ * Uploaded to unstable (Closes: #528563);
+ * Added 'default_style_dfsg' patch to change default style to the only
+ DFSG-compliant one remaining (Closes: #557571).
+
+ -- Marc Dequènes (Duck) <Duck at DuckCorp.org> Wed, 24 Mar 2010 00:35:02 +0100
+
+webgen0.5 (0.5.10+dfsg-1) experimental; urgency=low
+
+ * New upstream release.
+ * Removed non-DFSG compliant content i did not see.
+ * Improved uncomplete copyright file (thanks to Torsten Werner).
+
+ -- Marc Dequènes (Duck) <Duck at DuckCorp.org> Sat, 29 Aug 2009 14:54:08 +0200
+
+webgen0.5 (0.5.8-1) experimental; urgency=low
+
+ [ Marc Dequènes (Duck) ]
+ * New upstream release.
+ * Added myself to the package Uploaders (with Nohar's blessing).
+ * Bumped Standards-Version (no changes).
+ * Suggested installing doc-base along with webgen0.5-doc.
+ * Reworked all build-depends/depends/recommends to match the needs to
+ this new major version, and moved a few optional things as
+ suggestion.
+ * Tightened build-depends on ruby-pkg-tools because of very important
+ fixes.
+ * Switched to debhelper compat level 7, updated debhelper and cdbs
+ minimum version accordingly, and added misc:Depends.
+ * Added missing build-depends on patchutils (needed for cdbs).
+ * Updated patch 'cmdparse2.diff'.
+ * Removed obsolete patches 'shebang-ruby.diff',
+ 'trash_statcounter.diff', and 'drop-fucking-rubygems.diff'.
+ * Removed obsolete website example generation.
+ * Added 'bin_header.diff' patch to fix shebang not being the first
+ line in 'bin/webgen'.
+ * Added depends on libjs-jquery and added a symlink to avoid
+ duplicating softwares.
+ * Added doc-base support.
+ * Still disabling webgui ('disable_webgui.diff' patch and files
+ removal)
+
+ [ Lucas Nussbaum ]
+ * Added Vcs-* fields.
+
+ -- Marc Dequènes (Duck) <Duck at DuckCorp.org> Mon, 10 Aug 2009 00:59:34 +0200
+
+webgen0.4 (0.4.7-2) unstable; urgency=low
+
+ [ Vincent Fourmond ]
+ * Add Build-Conflicts on libxml2-utils because the build hangs if
+ xmllint is found.
+ * Add Build-Depends on graphviz for the documentation
+
+ [ Arnaud Cornet ]
+ * Fix use of DEB_RUBY_LIBDIR that changed semantics in ruby-pkg-tools 0.14.
+ (Closes: #486500), build depend on ruby-pkg-tools >= 0.14.
+ * Merge Vincent's patch.
+ * Add build conflict with webgen < 0.4.
+ * Bump standard version to 3.8.0 (no change needed).
+
+ -- Arnaud Cornet <acornet at debian.org> Sun, 22 Jun 2008 16:35:34 +0200
+
+webgen0.4 (0.4.7-1) unstable; urgency=low
+
+ * New Upstream Version
+ * Bump standards version (no change needed).
+ * Move -doc package to doc section.
+
+ -- Arnaud Cornet <acornet at debian.org> Sat, 02 Feb 2008 12:57:09 +0100
+
+webgen0.4 (0.4.6-1) unstable; urgency=low
+
+ * New Upstream Version
+ * Add Homepage dpkg header.
+ * Update my email address.
+ * Add build-deps on libmaruku-ruby and librmagick-ruby, for better doc
+ generation.
+
+ -- Arnaud Cornet <acornet at debian.org> Wed, 24 Oct 2007 22:09:19 +0200
+
+webgen0.4 (0.4.5-1) unstable; urgency=low
+
+ * New Upstream Version (Closes: #432332).
+ * Refresh trash_statcounter.diff.
+ * debian/README.Debian: document features gained by installing each
+ recommended package.
+
+ -- Arnaud Cornet <arnaud.cornet at gmail.com> Thu, 19 Jul 2007 15:05:35 +0200
+
+webgen0.4 (0.4.2-1) unstable; urgency=low
+
+ * New Upstream Version
+ * Handle shabang more precisely.
+ * Add optional dependencies in recommends (libbluecloth-ruby and
+ libbuilder-ruby).
+ * Add -doc in webgen0.4 recommends.
+ * Move to quilt patch system.
+ * Man page now provided by upstream.
+
+ -- Arnaud Cornet <arnaud.cornet at gmail.com> Sat, 12 May 2007 11:55:26 +0200
+
+webgen0.4 (0.4.1-1) experimental; urgency=low
+
+ * New upstream release
+ * Update man page.
+ * Add libexif-ruby in Recommends.
+ * Change source package to webgen0.4, conflict with webgen. We make two
+ different packages (webgen and webgen0.4) because they are source-
+ incompatible. This is to ease the transition for webgen users.
+ * Update cmdparse2.diff.
+ * Cleanup debian/rules.
+ * Remove webgen/gui, which is not ready.
+ * Generate webgen documentation in webgen0.4-doc package.
+
+ -- Arnaud Cornet <arnaud.cornet at gmail.com> Sun, 4 Feb 2007 17:36:13 +0100
+
+webgen (0.3.8-2) unstable; urgency=low
+
+ * Update standards version to 3.7.2. Use Build-Depends-Indep instead
+ of Build-Depends for ruby-pkg-tools and ruby.
+ * Switch to use #!/usr/bin/ruby instead of #!/usr/bin/env ruby
+ (Closes: #388357).
+ * Added watchfile.
+ * Use ruby CDBS class.
+
+ -- Arnaud Cornet <arnaud.cornet at gmail.com> Sat, 23 Sep 2006 18:23:42 +0200
+
+webgen (0.3.8-1) unstable; urgency=low
+
+ * New upstream "bugfix" release
+
+ -- Arnaud Cornet <arnaud.cornet at gmail.com> Sat, 31 Dec 2005 13:40:04 +0100
+
+webgen (0.3.7-1) unstable; urgency=low
+
+ * New upstream release.
+ * Changed to require cmdparse2.
+ * Drop binaries that use to qt.
+ * Added setup.rb licence to debian/copyright.
+ * Add dependency on rdoc, fixes bug #344660.
+
+ -- Arnaud Cornet <arnaud.cornet at gmail.com> Sat, 24 Dec 2005 20:17:46 +0100
+
+webgen (0.3.6-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Arnaud Cornet <arnaud.cornet at gmail.com> Sun, 28 Aug 2005 13:06:39 +0200
+
diff --git a/debian/control b/debian/control
index 0974bae..8bf7328 100644
--- a/debian/control
+++ b/debian/control
@@ -1,23 +1,43 @@
Source: webgen0.5
Section: ruby
Priority: optional
-Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Uploaders: Marc Dequènes (Duck) <Duck at DuckCorp.org>
+Maintainer: Marc Dequènes (Duck) <Duck at DuckCorp.org>
+Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>,
+ Vincent Fourmond <fourmond at debian.org>
DM-Upload-Allowed: yes
Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.8~)
+Build-Depends-Indep: graphviz
Standards-Version: 3.9.2
-#Vcs-Git: git://git.debian.org/pkg-ruby-extras/webgen0.5.git
-#Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/webgen0.5.git;a=summary
+Vcs-Git: git://git.debian.org/pkg-ruby-extras/webgen0.5.git
+Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/webgen0.5.git;a=summary
Homepage: http://webgen.rubyforge.org
XS-Ruby-Versions: all
Package: webgen0.5
Architecture: all
XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
-# cmdparse (>= 2.0.2), kramdown (= 0.10.0), maruku (>= 0.6.0, development), rake (>= 0.8.3, development), ramaze (>= 2009.04, development), launchy (>= 0.3.2, development), rcov (>= 0.8.1.2.0, development), rubyforge (>= 2.0.2, development), RedCloth (>= 4.1.9, development), haml (>= 3.0.12, development), builder (>= 2.1.0, development), rdoc (>= 2.4.3, development), coderay (>= 0.8.312, development), erubis (>= 2.6.5, development), rdiscount (>= 1.3.5, development), archive-tar-minitar (>= 0.5.2, development)
-Description: webgen is a fast, powerful, and extensible static website generator.
+# libjs-jquery (when webgui is usuable)
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, ruby-cmdparse, ruby-maruku
+Recommends: ruby-redcloth | ruby-bluecloth, ruby-rmagick
+Suggests: webgen0.5-doc, libexif-ruby1.8 | libexif-ruby1.9.1, ruby-builder, rake, libhaml-ruby1.8, liberubis-ruby1.8 | liberubis-ruby1.9.1
+Conflicts: webgen (<= 0.3.8-3), webgen0.4 (<= 0.4.7-4)
+Breaks: webgen (<= 0.3.8-3), webgen0.4 (<= 0.4.7-4)
+Description: fast, powerful, and extensible static website generator
webgen is used to generate static websites from templates and content
files (which can be written in a markup language). It can generate
dynamic content like menus on the fly and comes with many powerful
extensions.
+
+Package: webgen0.5-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Suggests: doc-base
+Description: fast, powerful, and extensible static website generator -- API documentation
+ webgen is used to generate static websites from templates and content
+ files (which can be written in a markup language). It can generate
+ dynamic content like menus on the fly and comes with many powerful
+ extensions.
+ .
+ This is the Rdoc-generated documentation for Webgen.
+
diff --git a/debian/copyright b/debian/copyright
index 1fcbab9..7383b00 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,16 +1,91 @@
-Format: http://dep.debian.net/deps/dep5
-Upstream-Name: webgen
-Source: FIXME <http://example.com/>
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174&view=co
+Upstream-Name: Webgen
+Upstream-Contact: Thomas Leitner <t_leitner at gmx.at>
+Source: http://rubygems.org/gems/webgen
+
Files: *
-Copyright: <years> <put author's name and email here>
- <years> <likewise for another author>
-License: GPL-2+ (FIXME)
+Copyright: © 2004-2009 Thomas Leitner
+License: GPL-2
+
+Files: setup.rb
+Copyright: © 2000-2004 Minero Aoki
+License: LGPL-2.1
+
+Files: data/webgen/webgui/public/js/jquery.js
+Copyright: © 2008 John Resig
+License: MIT or GPL-2
+
+Files: data/webgen/webgui/public/js/jquery.autocomplete.js
+Copyright: © 2007 Dylan Verheul, Dan G. Switzer, Anjesh Tuladhar, Jörn Zaefferer
+License: MIT or GPL-2
+
+Files: lib/webgen/webgentask.rb
+Copyright: © 2007 Jeremy Hinegardner
+ © 2007 Massimiliano Filacchioni
+ © 2007-2009 Thomas Leitner
+License: GPL-2
+
+Files: data/webgen/website_bundles/style/1024px data/webgen/website_bundles/style/andreas*
+Copyright: © 2008 Andreas Viklund
+ © 2008 Thomas Leitner
+License: custom
+ see http://andreasviklund.com/about/copyright
+Comment: licence on a remote and possibly changing website is problematic, and
+ the updated conditions are non-free:
+ Template-specific add-on material that is available on the single template
+ pages, for example replacement header images or backgrounds, are free to use
+ as specified with the templates. Re-distribution of this material and use
+ for other purposes than as template add-ons will require a written permission
+ from the add-on author.
+ This content was then removed.
+
+Files: debian/*
+Copyright: Copyright (C) 2005-2008 Arnaud Cornet <arnaud.cornet at gmail.com>
+ Copyright (C) 2009-2011 Marc Dequènes <Duck at DuckCorp.org>
+ Copyright (C) 2008,2011 Vincent Fourmond <fourmond at debian.org>
+License: GPL-2
+
+
+License: LGPL-2.1
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation,
+ version 2.1 of the License.
+ .
+ This library 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
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+License: MIT
+ permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "software"), to deal
+ in the software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the software, and to permit persons to whom the software is
+ furnished to do so, subject to the following conditions:
+ .
+ the above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the software.
+ .
+ the software is provided "as is", without warranty of any kind, express or
+ implied, including but not limited to the warranties of merchantability,
+ fitness for a particular purpose and noninfringement. in no event shall the
+ authors or copyright holders be liable for any claim, damages or other
+ liability, whether in an action of contract, tort or otherwise, arising from,
+ out of or in connection with the software or the use or other dealings in the
+ software.
+
+License: GPL-2
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 2 of the License, or (at your option) any later
- version.
+ License as published by the Free Software Foundation,
+ version 2 of the License.
.
This program is distributed in the hope that it will be
useful, but WITHOUT ANY WARRANTY; without even the implied
@@ -27,7 +102,3 @@ License: GPL-2+ (FIXME)
License version 2 can be found in the file
`/usr/share/common-licenses/GPL-2'.
-Files: debian/*
-Copyright: 2011 Marc Dequènes (Duck) <Duck at DuckCorp.org>
-License:
- [LICENSE TEXT]
diff --git a/debian/patches/cmdparse2.diff b/debian/patches/cmdparse2.diff
new file mode 100644
index 0000000..7633a11
--- /dev/null
+++ b/debian/patches/cmdparse2.diff
@@ -0,0 +1,12 @@
+Index: webgen0.5-0.5.8/lib/webgen/cli.rb
+===================================================================
+--- webgen0.5-0.5.8.orig/lib/webgen/cli.rb 2009-05-05 08:08:33.000000000 +0200
++++ webgen0.5-0.5.8/lib/webgen/cli.rb 2009-06-27 17:28:08.000000000 +0200
+@@ -1,6 +1,6 @@
+ # -*- encoding: utf-8 -*-
+
+-require 'cmdparse'
++require 'cmdparse2'
+ require 'webgen/website'
+ require 'webgen/version'
+
diff --git a/debian/patches/default_style_dfsg b/debian/patches/default_style_dfsg
new file mode 100644
index 0000000..cb276b0
--- /dev/null
+++ b/debian/patches/default_style_dfsg
@@ -0,0 +1,48 @@
+Index: webgen0.5-0.5.11+dfsg/data/webgen/webgui/controller/main.rb
+===================================================================
+--- webgen0.5-0.5.11+dfsg.orig/data/webgen/webgui/controller/main.rb 2010-03-24 00:26:42.000000000 +0100
++++ webgen0.5-0.5.11+dfsg/data/webgen/webgui/controller/main.rb 2010-03-24 00:27:19.000000000 +0100
+@@ -88,7 +88,7 @@
+ end
+
+ def create_website
+- @cur_bundle = request['website_bundle'] || @cur_bundle || 'style-andreas07'
++ @cur_bundle = request['website_bundle'] || @cur_bundle || 'simple'
+
+ if request['create_site']
+ wm = Webgen::WebsiteManager.new(session['website_dir'])
+Index: webgen0.5-0.5.11+dfsg/doc/manual.page
+===================================================================
+--- webgen0.5-0.5.11+dfsg.orig/doc/manual.page 2010-03-24 00:26:52.000000000 +0100
++++ webgen0.5-0.5.11+dfsg/doc/manual.page 2010-03-24 00:27:25.000000000 +0100
+@@ -55,7 +55,7 @@
+ name or a bundle URL.
+
+ > If you don't specify the `-b` option, the default value is used which applies the `default`
+- > and the `style-andreas07` bundles. The former only creates a simple `src/index.page` sothat
++ > and the `simple` bundles. The former only creates a simple `src/index.page` sothat
+ > some output can be seen and the latter applies a nice layout.
+ {:.information}
+
+Index: webgen0.5-0.5.11+dfsg/lib/webgen/cli/create_command.rb
+===================================================================
+--- webgen0.5-0.5.11+dfsg.orig/lib/webgen/cli/create_command.rb 2010-03-24 00:26:56.000000000 +0100
++++ webgen0.5-0.5.11+dfsg/lib/webgen/cli/create_command.rb 2010-03-24 00:27:29.000000000 +0100
+@@ -16,7 +16,7 @@
+ self.short_desc = 'Create a basic webgen website from website bundles'
+ self.options = CmdParse::OptionParserWrapper.new do |opts|
+ opts.separator "Options:"
+- opts.on('-b', '--bundle BUNDLE', String, "A website bundle name/URL or 'none'. Can be used more than once (default: [default, style-andreas07])") do |val|
++ opts.on('-b', '--bundle BUNDLE', String, "A website bundle name/URL or 'none'. Can be used more than once (default: [default, simple])") do |val|
+ if val.downcase == 'none'
+ @bundles = nil
+ elsif !@bundles.nil?
+@@ -52,7 +52,7 @@
+ paths = wm.create_website
+ begin
+ if @bundles
+- @bundles = ['default', 'style-andreas07'] if @bundles.empty?
++ @bundles = ['default', 'simple'] if @bundles.empty?
+ @bundles.each {|name| paths += wm.apply_bundle(Utils.match_bundle_name(wm, name)) }
+ end
+ rescue
diff --git a/debian/patches/disable_webgui.diff b/debian/patches/disable_webgui.diff
new file mode 100644
index 0000000..5de0931
--- /dev/null
+++ b/debian/patches/disable_webgui.diff
@@ -0,0 +1,12 @@
+Index: webgen0.5-0.5.8/lib/webgen/cli.rb
+===================================================================
+--- webgen0.5-0.5.8.orig/lib/webgen/cli.rb 2009-06-27 22:50:05.000000000 +0200
++++ webgen0.5-0.5.8/lib/webgen/cli.rb 2009-06-27 22:50:15.000000000 +0200
+@@ -61,7 +61,6 @@
+
+ autoload :RunCommand, 'webgen/cli/run_command'
+ autoload :CreateCommand, 'webgen/cli/create_command'
+- autoload :WebguiCommand, 'webgen/cli/webgui_command'
+ autoload :ApplyCommand, 'webgen/cli/apply_command'
+
+ autoload :Utils, 'webgen/cli/utils'
diff --git a/debian/patches/drop-fucking-rubygems.diff b/debian/patches/drop-fucking-rubygems.diff
new file mode 100644
index 0000000..f685b08
--- /dev/null
+++ b/debian/patches/drop-fucking-rubygems.diff
@@ -0,0 +1,18 @@
+Index: webgen0.4/data/webgen/gallery_styles/slides/collage.rb
+===================================================================
+--- webgen0.4.orig/data/webgen/gallery_styles/slides/collage.rb 2007-10-24 22:03:30.000000000 +0200
++++ webgen0.4/data/webgen/gallery_styles/slides/collage.rb 2007-10-24 22:03:31.000000000 +0200
+@@ -1,4 +1,3 @@
+-require 'rubygems'
+ require 'RMagick'
+
+ REF = self
+Index: webgen0.4/doc/plugin/gallery/slides/collage.rb
+===================================================================
+--- webgen0.4.orig/doc/plugin/gallery/slides/collage.rb 2007-10-24 22:03:22.000000000 +0200
++++ webgen0.4/doc/plugin/gallery/slides/collage.rb 2007-10-24 22:03:25.000000000 +0200
+@@ -1,4 +1,3 @@
+-require 'rubygems'
+ require 'RMagick'
+
+ REF = self
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d111fab
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+cmdparse2.diff
+disable_webgui.diff
+default_style_dfsg
diff --git a/debian/rules b/debian/rules
index a5e7dc8..bcb8d97 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,3 +13,33 @@
%:
dh $@ --buildsystem=ruby --with ruby
+
+override_dh_auto_build:
+ dh_auto_build
+ rdoc --all --inline-source --diagram --fileboxes --line-numbers --fmt=html --main lib/webgen/website.rb \
+ -o build-doc/rdoc lib
+
+override_dh_auto_install:
+ dh_auto_install
+ # webgui is not usuable
+ rm -f debian/webgen0.5/usr/lib/ruby/vendor_ruby/webgen/cli/webgui_command.rb
+ # avoid software duplication (when webgui is usuable)
+ #rm debian/webgen0.5/usr/share/webgen/webgui/public/js/jquery.js
+ #dh_link -p webgen0.5 usr/share/javascript/jquery/jquery.js usr/share/webgen/webgui/public/js/jquery.js
+ # rename the webgen binary as webgen0.5, to allow alternative
+ mv debian/webgen0.5/usr/bin/webgen debian/webgen0.5/usr/bin/webgen0.5
+
+override_dh_install:
+ dh_install --remaining-packages
+ # webgui is not usuable
+ rm -rf debian/webgen0.5/usr/share/webgen/webgui
+
+override_dh_installman:
+ dh_installman --remaining-packages
+ # rename the webgen manpage as webgen0.5, to allow alternative
+ mv debian/webgen0.5/usr/share/man/man1/webgen.1 debian/webgen0.5/usr/share/man/man1/webgen0.5.1
+
+override_dh_auto_clean:
+ dh_auto_clean
+ rm -rf build-doc
+
diff --git a/debian/watch b/debian/watch
index 15d6ad6..b432d75 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
version=3
-http://pkg-ruby-extras.alioth.debian.org/cgi-bin/gemwatch/webgen .*/webgen-(.*).tar.gz
+opts=dversionmangle=s/\+dfsg(\d+)?// \
+ http://pkg-ruby-extras.alioth.debian.org/cgi-bin/gemwatch/webgen .*/webgen-(.*).tar.gz
diff --git a/debian/webgen0.5-doc.doc-base b/debian/webgen0.5-doc.doc-base
new file mode 100644
index 0000000..5075a40
--- /dev/null
+++ b/debian/webgen0.5-doc.doc-base
@@ -0,0 +1,10 @@
+Document: webgen
+Title: Webgen Documentation
+Author: Thomas Leitner
+Abstract: Rdoc-generated API documentation.
+Section: Programming/Ruby
+
+Format: HTML
+Index: /usr/share/doc/webgen0.5-doc/rdoc/index.html
+Files: /usr/share/doc/webgen0.5-doc/rdoc/*
+
diff --git a/debian/webgen0.5-doc.docs b/debian/webgen0.5-doc.docs
new file mode 100644
index 0000000..beb1baf
--- /dev/null
+++ b/debian/webgen0.5-doc.docs
@@ -0,0 +1,3 @@
+AUTHORS
+THANKS
+build-doc/rdoc
diff --git a/debian/webgen0.5.docs b/debian/webgen0.5.docs
deleted file mode 100644
index 443148f..0000000
--- a/debian/webgen0.5.docs
+++ /dev/null
@@ -1,5 +0,0 @@
-# FIXME: doc/ dir found in source. Consider installing the docs.
-# Examples:
-# doc/manual.html
-# doc/site/*
-# FIXME: READMEs found
diff --git a/debian/webgen0.5.install b/debian/webgen0.5.install
index 0d931d7..f93a51a 100644
--- a/debian/webgen0.5.install
+++ b/debian/webgen0.5.install
@@ -1,3 +1 @@
-# FIXME: data/ dir found in source. Consider installing it somewhere.
-# Examples:
-# data/* /usr/share/webgen0.5/
+data/webgen/* usr/share/webgen/
diff --git a/debian/webgen0.5.manpages b/debian/webgen0.5.manpages
index f643af7..c8290ad 100644
--- a/debian/webgen0.5.manpages
+++ b/debian/webgen0.5.manpages
@@ -1,2 +1 @@
-# FIXME: man/ dir found in source. Consider installing manpages
-# man/man1/webgen.1
+man/man1/webgen.1
diff --git a/debian/webgen0.5.postinst b/debian/webgen0.5.postinst
new file mode 100644
index 0000000..bedbec8
--- /dev/null
+++ b/debian/webgen0.5.postinst
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "configure" ]
+then
+ update-alternatives --install /usr/bin/webgen webgen /usr/bin/webgen0.5 50 \
+ --slave /usr/share/man/man1/webgen.1.gz webgen.1.gz /usr/share/man/man1/webgen0.5.1.gz
+fi
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
diff --git a/debian/webgen0.5.prerm b/debian/webgen0.5.prerm
new file mode 100644
index 0000000..8dccf61
--- /dev/null
+++ b/debian/webgen0.5.prerm
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "remove" ]
+then
+ update-alternatives --remove webgen /usr/bin/webgen0.5
+fi
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
--
webgen0.5.git
More information about the Pkg-ruby-extras-commits
mailing list