[DRE-commits] r6059 - in trunk/webgen/debian: . patches
Vincent Fourmond
fourmond at alioth.debian.org
Mon Feb 14 20:43:53 UTC 2011
Author: fourmond
Date: 2011-02-14 20:43:52 +0000 (Mon, 14 Feb 2011)
New Revision: 6059
Added:
trunk/webgen/debian/patches/webgen-to-webgen0.3.diff
trunk/webgen/debian/webgen.postinst
trunk/webgen/debian/webgen.prerm
trunk/webgen/debian/webgen0.3.1
Removed:
trunk/webgen/debian/webgen.1
Modified:
trunk/webgen/debian/changelog
trunk/webgen/debian/control
trunk/webgen/debian/copyright
trunk/webgen/debian/patches/series
trunk/webgen/debian/rules
trunk/webgen/debian/watch
trunk/webgen/debian/webgen.manpages
Log:
[webgen] Finally make all versions of webgen cohabitate
Modified: trunk/webgen/debian/changelog
===================================================================
--- trunk/webgen/debian/changelog 2011-02-14 19:07:59 UTC (rev 6058)
+++ trunk/webgen/debian/changelog 2011-02-14 20:43:52 UTC (rev 6059)
@@ -4,8 +4,18 @@
* Switching to source format 3.0 (quilt)
* Separated patches into cmdparse2.diff and shebang.diff
* Bumping dh compatibility level to 7
+ * Fixed few small glitches in debian/copyright
+ * Now conforms to standards 3.9.1
+ * Move the binary and manual page to webgen0.3
+ * Rename the library and shared data directories from webgen to webgen0.3
+ -> webgen-to-webgen0.3.diff
+ * Use alternatives to provide the webgen binary and manual pages
+ (closes: #613128)
+ * Now all versions of webgen should be installable concurently
+ (closes: #607470)
+ * Updated watchfile to only look for the 0.3 series.
- -- Vincent Fourmond <fourmond at debian.org> Mon, 14 Feb 2011 20:05:21 +0100
+ -- Vincent Fourmond <fourmond at debian.org> Mon, 14 Feb 2011 21:42:21 +0100
webgen (0.3.8-3) unstable; urgency=low
Modified: trunk/webgen/debian/control
===================================================================
--- trunk/webgen/debian/control 2011-02-14 19:07:59 UTC (rev 6058)
+++ trunk/webgen/debian/control 2011-02-14 20:43:52 UTC (rev 6059)
@@ -5,14 +5,16 @@
Uploaders: Vincent Fourmond <fourmond at debian.org>,
Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
Build-Depends: cdbs, debhelper (>= 7), ruby, ruby-pkg-tools (>= 0.14)
-Standards-Version: 3.7.2
+Standards-Version: 3.9.1
Vcs-Svn: svn://svn.debian.org/svn/pkg-ruby-extras/trunk/webgen/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-ruby-extras/trunk/webgen/
Package: webgen
Architecture: all
-Depends: ruby, libcmdparse2-ruby, rdoc
+Depends: ruby, libcmdparse2-ruby, rdoc, ${misc:Depends}
Recommends: libredcloth-ruby, librmagick-ruby
+Conflicts: webgen0.4 (<= 0.4.7-4), webgen0.5 (<= 0.5.13+dfsg-1)
+Breaks: webgen0.4 (<= 0.4.7-4), webgen0.5 (<= 0.5.13+dfsg-1)
Description: A template based static website generator
Webgen is used to generate web pages from page description and template files.
You create one template file in which you define the layout of your page and
Modified: trunk/webgen/debian/copyright
===================================================================
--- trunk/webgen/debian/copyright 2011-02-14 19:07:59 UTC (rev 6058)
+++ trunk/webgen/debian/copyright 2011-02-14 20:43:52 UTC (rev 6059)
@@ -5,8 +5,10 @@
Upstream Author: Thomas Leitner
-Copyright:
+Copyright 2004 by Thomas Leitner
+License:
+
This package 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; version 2 dated June, 1991.
@@ -22,8 +24,8 @@
02110-1301, USA.
On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
The setup.rb file included in the package's source is released under the GNU
LGPL. On Debian systems, the complete text of the GNU Lesser General Public
-can be found in `/usr/share/common-licenses/LGPL'.
+can be found in `/usr/share/common-licenses/LGPL-2'.
Modified: trunk/webgen/debian/patches/series
===================================================================
--- trunk/webgen/debian/patches/series 2011-02-14 19:07:59 UTC (rev 6058)
+++ trunk/webgen/debian/patches/series 2011-02-14 20:43:52 UTC (rev 6059)
@@ -1,2 +1,3 @@
cmdparse2.diff
shebang.diff
+webgen-to-webgen0.3.diff
Added: trunk/webgen/debian/patches/webgen-to-webgen0.3.diff
===================================================================
--- trunk/webgen/debian/patches/webgen-to-webgen0.3.diff (rev 0)
+++ trunk/webgen/debian/patches/webgen-to-webgen0.3.diff 2011-02-14 20:43:52 UTC (rev 6059)
@@ -0,0 +1,521 @@
+Index: webgen-0.3.8/lib/webgen.rb
+===================================================================
+--- webgen-0.3.8.orig/lib/webgen.rb 2011-02-14 21:40:08.955026296 +0100
++++ webgen-0.3.8/lib/webgen.rb 2011-02-14 21:40:08.983020839 +0100
+@@ -23,8 +23,8 @@
+ require 'rbconfig'
+ require 'fileutils'
+ require 'cmdparse2'
+-require 'webgen/plugin'
+-require 'webgen/gui/common'
++require 'webgen0.3/plugin'
++require 'webgen0.3/gui/common'
+
+
+ module Webgen
+Index: webgen-0.3.8/lib/webgen/gui/main.rb
+===================================================================
+--- webgen-0.3.8.orig/lib/webgen/gui/main.rb 2005-12-24 12:36:54.000000000 +0100
++++ webgen-0.3.8/lib/webgen/gui/main.rb 2011-02-14 21:40:08.983020839 +0100
+@@ -7,8 +7,8 @@
+
+ require 'Qt'
+ require 'cgi'
+-require 'webgen/gui/common'
+-require 'webgen/gui/new_website_dlg'
++require 'webgen0.3/gui/common'
++require 'webgen0.3/gui/new_website_dlg'
+
+
+ class Object
+@@ -80,7 +80,7 @@
+ setCaption( 'webgen GUI' )
+ setup_window
+ setup_menus
+- @website = Webgen::Website.new( '/home/thomas/work/projects/trunk/webgen/DIR' )
++ @website = Webgen::Website.new( '/home/thomas/work/projects/trunk/webgen0.3/DIR' )
+ end
+
+ def new
+Index: webgen-0.3.8/lib/webgen/node.rb
+===================================================================
+--- webgen-0.3.8.orig/lib/webgen/node.rb 2005-12-24 12:37:41.000000000 +0100
++++ webgen-0.3.8/lib/webgen/node.rb 2011-02-14 21:40:08.983020839 +0100
+@@ -21,7 +21,7 @@
+ #
+
+ require 'uri'
+-require 'webgen/composite'
++require 'webgen0.3/composite'
+
+ class Node
+
+Index: webgen-0.3.8/lib/webgen/plugin.rb
+===================================================================
+--- webgen-0.3.8.orig/lib/webgen/plugin.rb 2005-12-24 12:37:41.000000000 +0100
++++ webgen-0.3.8/lib/webgen/plugin.rb 2011-02-14 21:40:08.983020839 +0100
+@@ -230,8 +230,8 @@
+ end
+ end
+
+- require 'webgen/plugins/coreplugins/logging'
+- require 'webgen/plugins/coreplugins/configuration'
++ require 'webgen0.3/plugins/coreplugins/logging'
++ require 'webgen0.3/plugins/coreplugins/configuration'
+
+ end
+
+Index: webgen-0.3.8/lib/webgen/plugins/contenthandlers/html.rb
+===================================================================
+--- webgen-0.3.8.orig/lib/webgen/plugins/contenthandlers/html.rb 2005-12-24 12:37:41.000000000 +0100
++++ webgen-0.3.8/lib/webgen/plugins/contenthandlers/html.rb 2011-02-14 21:40:08.983020839 +0100
+@@ -20,7 +20,7 @@
+ #++
+ #
+
+-require 'webgen/plugins/contenthandlers/default'
++require 'webgen0.3/plugins/contenthandlers/default'
+
+ module ContentHandlers
+
+Index: webgen-0.3.8/lib/webgen/plugins/contenthandlers/markdown.rb
+===================================================================
+--- webgen-0.3.8.orig/lib/webgen/plugins/contenthandlers/markdown.rb 2005-12-24 12:37:41.000000000 +0100
++++ webgen-0.3.8/lib/webgen/plugins/contenthandlers/markdown.rb 2011-02-14 21:40:08.999020336 +0100
+@@ -23,7 +23,7 @@
+
+ begin
+ require 'bluecloth'
+- require 'webgen/plugins/contenthandlers/default'
++ require 'webgen0.3/plugins/contenthandlers/default'
+
+ module ContentHandlers
+
+Index: webgen-0.3.8/lib/webgen/plugins/contenthandlers/rdoc.rb
+===================================================================
+--- webgen-0.3.8.orig/lib/webgen/plugins/contenthandlers/rdoc.rb 2005-12-24 12:37:41.000000000 +0100
++++ webgen-0.3.8/lib/webgen/plugins/contenthandlers/rdoc.rb 2011-02-14 21:40:09.003026664 +0100
+@@ -22,7 +22,7 @@
+
+ require 'rdoc/markup/simple_markup'
+ require 'rdoc/markup/simple_markup/to_html'
+-require 'webgen/plugins/contenthandlers/default'
++require 'webgen0.3/plugins/contenthandlers/default'
+
+ module ContentHandlers
+
+Index: webgen-0.3.8/lib/webgen/plugins/contenthandlers/textile.rb
+===================================================================
+--- webgen-0.3.8.orig/lib/webgen/plugins/contenthandlers/textile.rb 2005-12-24 12:37:41.000000000 +0100
++++ webgen-0.3.8/lib/webgen/plugins/contenthandlers/textile.rb 2011-02-14 21:40:09.003026664 +0100
+@@ -22,7 +22,7 @@
+
+ begin
+ require 'redcloth'
+- require 'webgen/plugins/contenthandlers/default'
++ require 'webgen0.3/plugins/contenthandlers/default'
+
+ module ContentHandlers
+
+Index: webgen-0.3.8/lib/webgen/plugins/coreplugins/configuration.rb
+===================================================================
+--- webgen-0.3.8.orig/lib/webgen/plugins/coreplugins/configuration.rb 2011-02-14 21:40:08.955026296 +0100
++++ webgen-0.3.8/lib/webgen/plugins/coreplugins/configuration.rb 2011-02-14 21:41:13.230687472 +0100
+@@ -23,8 +23,8 @@
+ require 'find'
+ require 'tsort'
+ require 'cmdparse2'
+-require 'webgen/node'
+-require 'webgen/plugin'
++require 'webgen0.3/node'
++require 'webgen0.3/plugin'
+
+ # Helper class for calculating plugin dependencies.
+ class Dependency < Hash
+@@ -64,7 +64,7 @@
+ # Returns the data directory of webgen.
+ def self.data_dir
+ unless defined?( @@data_dir )
+- @@data_dir = File.join( Config::CONFIG["datadir"], "webgen" )
++ @@data_dir = File.join( Config::CONFIG["datadir"], "webgen0.3" )
+
+ if defined?( Gem::Cache )
+ gem = Gem::Cache.from_installed_gems.search( "webgen", "=#{Webgen::VERSION.join('.')}" ).last
+@@ -89,7 +89,7 @@
+
+ # Does all the initialisation stuff
+ def init_all
+- load_plugins( File.dirname( __FILE__).sub( /coreplugins$/,'' ), File.dirname( __FILE__).sub(/webgen\/plugins\/coreplugins$/, '') )
++ load_plugins( File.dirname( __FILE__).sub( /coreplugins$/,'' ), File.dirname( __FILE__).sub(/webgen0.3\/plugins\/coreplugins$/, '') )
+ load_plugins( 'plugin', '' )
+ init_plugins
+ end
+Index: webgen-0.3.8/lib/webgen/plugins/coreplugins/logging.rb
+===================================================================
+--- webgen-0.3.8.orig/lib/webgen/plugins/coreplugins/logging.rb 2005-12-24 12:37:41.000000000 +0100
++++ webgen-0.3.8/lib/webgen/plugins/coreplugins/logging.rb 2011-02-14 21:40:09.003026664 +0100
+@@ -21,7 +21,7 @@
+ #
+
+ require 'logger'
+-require 'webgen/plugin'
++require 'webgen0.3/plugin'
+
+ module Webgen
+
+Index: webgen-0.3.8/lib/webgen/plugins/coreplugins/resourcemanager.rb
+===================================================================
+--- webgen-0.3.8.orig/lib/webgen/plugins/coreplugins/resourcemanager.rb 2005-12-24 12:37:41.000000000 +0100
++++ webgen-0.3.8/lib/webgen/plugins/coreplugins/resourcemanager.rb 2011-02-14 21:40:09.003026664 +0100
+@@ -22,8 +22,8 @@
+
+ require 'rbconfig'
+ require 'fileutils'
+-require 'webgen/plugins/tags/tags'
+-require 'webgen/plugins/filehandlers/filehandler'
++require 'webgen0.3/plugins/tags/tags'
++require 'webgen0.3/plugins/filehandlers/filehandler'
+
+ module CorePlugins
+
+Index: webgen-0.3.8/lib/webgen/plugins/filehandlers/backing.rb
+===================================================================
+--- webgen-0.3.8.orig/lib/webgen/plugins/filehandlers/backing.rb 2005-12-24 12:37:41.000000000 +0100
++++ webgen-0.3.8/lib/webgen/plugins/filehandlers/backing.rb 2011-02-14 21:40:09.003026664 +0100
+@@ -20,9 +20,9 @@
+ #++
+ #
+
+-require 'webgen/plugins/filehandlers/filehandler'
+-require 'webgen/plugins/filehandlers/directory'
+-require 'webgen/plugins/filehandlers/page'
++require 'webgen0.3/plugins/filehandlers/filehandler'
++require 'webgen0.3/plugins/filehandlers/directory'
++require 'webgen0.3/plugins/filehandlers/page'
+
+ module FileHandlers
+
+Index: webgen-0.3.8/lib/webgen/plugins/filehandlers/copy.rb
+===================================================================
+--- webgen-0.3.8.orig/lib/webgen/plugins/filehandlers/copy.rb 2005-12-24 12:37:41.000000000 +0100
++++ webgen-0.3.8/lib/webgen/plugins/filehandlers/copy.rb 2011-02-14 21:40:09.003026664 +0100
+@@ -21,7 +21,7 @@
+ #
+
+ require 'fileutils'
+-require 'webgen/plugins/filehandlers/filehandler'
++require 'webgen0.3/plugins/filehandlers/filehandler'
+
+ module FileHandlers
+
+Index: webgen-0.3.8/lib/webgen/plugins/filehandlers/directory.rb
+===================================================================
+--- webgen-0.3.8.orig/lib/webgen/plugins/filehandlers/directory.rb 2005-12-24 12:37:41.000000000 +0100
++++ webgen-0.3.8/lib/webgen/plugins/filehandlers/directory.rb 2011-02-14 21:40:09.003026664 +0100
+@@ -20,7 +20,7 @@
+ #++
+ #
+
+-require 'webgen/plugins/filehandlers/filehandler'
++require 'webgen0.3/plugins/filehandlers/filehandler'
+
+ module FileHandlers
+
+Index: webgen-0.3.8/lib/webgen/plugins/filehandlers/filehandler.rb
+===================================================================
+--- webgen-0.3.8.orig/lib/webgen/plugins/filehandlers/filehandler.rb 2005-12-24 12:37:41.000000000 +0100
++++ webgen-0.3.8/lib/webgen/plugins/filehandlers/filehandler.rb 2011-02-14 21:40:09.003026664 +0100
+@@ -21,7 +21,7 @@
+ #
+
+ require 'set'
+-require 'webgen/listener'
++require 'webgen0.3/listener'
+
+ module FileHandlers
+
+Index: webgen-0.3.8/lib/webgen/plugins/filehandlers/gallery.rb
+===================================================================
+--- webgen-0.3.8.orig/lib/webgen/plugins/filehandlers/gallery.rb 2005-12-24 12:37:41.000000000 +0100
++++ webgen-0.3.8/lib/webgen/plugins/filehandlers/gallery.rb 2011-02-14 21:40:09.003026664 +0100
+@@ -20,9 +20,9 @@
+ #++
+ #
+
+-require 'webgen/plugins/filehandlers/filehandler'
+-require 'webgen/plugins/filehandlers/directory'
+-require 'webgen/plugins/filehandlers/page'
++require 'webgen0.3/plugins/filehandlers/filehandler'
++require 'webgen0.3/plugins/filehandlers/directory'
++require 'webgen0.3/plugins/filehandlers/page'
+
+ module FileHandlers
+
+Index: webgen-0.3.8/lib/webgen/plugins/filehandlers/page.rb
+===================================================================
+--- webgen-0.3.8.orig/lib/webgen/plugins/filehandlers/page.rb 2005-12-24 12:37:41.000000000 +0100
++++ webgen-0.3.8/lib/webgen/plugins/filehandlers/page.rb 2011-02-14 21:40:09.003026664 +0100
+@@ -20,8 +20,8 @@
+ #++
+ #
+
+-require 'webgen/plugins/filehandlers/filehandler'
+-require 'webgen/listener'
++require 'webgen0.3/plugins/filehandlers/filehandler'
++require 'webgen0.3/listener'
+ require 'yaml'
+ require 'erb'
+
+Index: webgen-0.3.8/lib/webgen/plugins/filehandlers/template.rb
+===================================================================
+--- webgen-0.3.8.orig/lib/webgen/plugins/filehandlers/template.rb 2005-12-24 12:37:41.000000000 +0100
++++ webgen-0.3.8/lib/webgen/plugins/filehandlers/template.rb 2011-02-14 21:40:09.003026664 +0100
+@@ -20,7 +20,7 @@
+ #++
+ #
+
+-require 'webgen/plugins/filehandlers/filehandler'
++require 'webgen0.3/plugins/filehandlers/filehandler'
+
+ module FileHandlers
+
+Index: webgen-0.3.8/lib/webgen/plugins/htmlvalidators/xmllint.rb
+===================================================================
+--- webgen-0.3.8.orig/lib/webgen/plugins/htmlvalidators/xmllint.rb 2005-12-24 12:37:41.000000000 +0100
++++ webgen-0.3.8/lib/webgen/plugins/htmlvalidators/xmllint.rb 2011-02-14 21:40:09.003026664 +0100
+@@ -20,7 +20,7 @@
+ #++
+ #
+
+-require 'webgen/plugins/htmlvalidators/default'
++require 'webgen0.3/plugins/htmlvalidators/default'
+ require "tempfile"
+
+ # Allows one to get stdout and stderr from an executed command. Original version
+Index: webgen-0.3.8/lib/webgen/plugins/menustyles/horizontal.rb
+===================================================================
+--- webgen-0.3.8.orig/lib/webgen/plugins/menustyles/horizontal.rb 2005-12-24 12:37:41.000000000 +0100
++++ webgen-0.3.8/lib/webgen/plugins/menustyles/horizontal.rb 2011-02-14 21:40:09.003026664 +0100
+@@ -20,7 +20,7 @@
+ #++
+ #
+
+-require 'webgen/plugins/menustyles/default'
++require 'webgen0.3/plugins/menustyles/default'
+
+ module MenuStyles
+
+Index: webgen-0.3.8/lib/webgen/plugins/menustyles/horizontal_dropdown.rb
+===================================================================
+--- webgen-0.3.8.orig/lib/webgen/plugins/menustyles/horizontal_dropdown.rb 2005-12-24 12:37:41.000000000 +0100
++++ webgen-0.3.8/lib/webgen/plugins/menustyles/horizontal_dropdown.rb 2011-02-14 21:40:09.003026664 +0100
+@@ -20,7 +20,7 @@
+ #++
+ #
+
+-require 'webgen/plugins/menustyles/default'
++require 'webgen0.3/plugins/menustyles/default'
+
+ module MenuStyles
+
+Index: webgen-0.3.8/lib/webgen/plugins/menustyles/partial.rb
+===================================================================
+--- webgen-0.3.8.orig/lib/webgen/plugins/menustyles/partial.rb 2005-12-24 12:37:41.000000000 +0100
++++ webgen-0.3.8/lib/webgen/plugins/menustyles/partial.rb 2011-02-14 21:40:09.003026664 +0100
+@@ -20,7 +20,7 @@
+ #++
+ #
+
+-require 'webgen/plugins/menustyles/default'
++require 'webgen0.3/plugins/menustyles/default'
+
+ module MenuStyles
+
+Index: webgen-0.3.8/lib/webgen/plugins/menustyles/vertical.rb
+===================================================================
+--- webgen-0.3.8.orig/lib/webgen/plugins/menustyles/vertical.rb 2005-12-24 12:37:41.000000000 +0100
++++ webgen-0.3.8/lib/webgen/plugins/menustyles/vertical.rb 2011-02-14 21:40:09.003026664 +0100
+@@ -20,7 +20,7 @@
+ #++
+ #
+
+-require 'webgen/plugins/menustyles/default'
++require 'webgen0.3/plugins/menustyles/default'
+
+ module MenuStyles
+
+Index: webgen-0.3.8/lib/webgen/plugins/menustyles/vertical_dropdown.rb
+===================================================================
+--- webgen-0.3.8.orig/lib/webgen/plugins/menustyles/vertical_dropdown.rb 2005-12-24 12:37:41.000000000 +0100
++++ webgen-0.3.8/lib/webgen/plugins/menustyles/vertical_dropdown.rb 2011-02-14 21:40:09.003026664 +0100
+@@ -20,7 +20,7 @@
+ #++
+ #
+
+-require 'webgen/plugins/menustyles/default'
++require 'webgen0.3/plugins/menustyles/default'
+
+ module MenuStyles
+
+Index: webgen-0.3.8/lib/webgen/plugins/miscplugins/smileyreplacer.rb
+===================================================================
+--- webgen-0.3.8.orig/lib/webgen/plugins/miscplugins/smileyreplacer.rb 2005-12-24 12:37:41.000000000 +0100
++++ webgen-0.3.8/lib/webgen/plugins/miscplugins/smileyreplacer.rb 2011-02-14 21:40:09.007020355 +0100
+@@ -20,8 +20,8 @@
+ #++
+ #
+
+-require 'webgen/plugins/filehandlers/filehandler'
+-require 'webgen/plugins/coreplugins/resourcemanager'
++require 'webgen0.3/plugins/filehandlers/filehandler'
++require 'webgen0.3/plugins/coreplugins/resourcemanager'
+
+ module MiscPlugins
+
+Index: webgen-0.3.8/lib/webgen/plugins/tags/breadcrumbtrail.rb
+===================================================================
+--- webgen-0.3.8.orig/lib/webgen/plugins/tags/breadcrumbtrail.rb 2005-12-24 12:37:41.000000000 +0100
++++ webgen-0.3.8/lib/webgen/plugins/tags/breadcrumbtrail.rb 2011-02-14 21:40:09.007020355 +0100
+@@ -20,7 +20,7 @@
+ #++
+ #
+
+-require 'webgen/plugins/tags/tags'
++require 'webgen0.3/plugins/tags/tags'
+
+ module Tags
+
+Index: webgen-0.3.8/lib/webgen/plugins/tags/date.rb
+===================================================================
+--- webgen-0.3.8.orig/lib/webgen/plugins/tags/date.rb 2005-12-24 12:37:41.000000000 +0100
++++ webgen-0.3.8/lib/webgen/plugins/tags/date.rb 2011-02-14 21:40:09.007020355 +0100
+@@ -20,7 +20,7 @@
+ #++
+ #
+
+-require 'webgen/plugins/tags/tags'
++require 'webgen0.3/plugins/tags/tags'
+
+ module Tags
+
+Index: webgen-0.3.8/lib/webgen/plugins/tags/download.rb
+===================================================================
+--- webgen-0.3.8.orig/lib/webgen/plugins/tags/download.rb 2005-12-24 12:37:41.000000000 +0100
++++ webgen-0.3.8/lib/webgen/plugins/tags/download.rb 2011-02-14 21:40:09.007020355 +0100
+@@ -20,8 +20,8 @@
+ #++
+ #
+
+-require 'webgen/plugins/tags/tags'
+-require 'webgen/plugins/coreplugins/resourcemanager'
++require 'webgen0.3/plugins/tags/tags'
++require 'webgen0.3/plugins/coreplugins/resourcemanager'
+ require 'yaml'
+ require 'uri'
+ require 'open-uri'
+Index: webgen-0.3.8/lib/webgen/plugins/tags/executecommand.rb
+===================================================================
+--- webgen-0.3.8.orig/lib/webgen/plugins/tags/executecommand.rb 2005-12-24 12:37:41.000000000 +0100
++++ webgen-0.3.8/lib/webgen/plugins/tags/executecommand.rb 2011-02-14 21:40:09.007020355 +0100
+@@ -21,7 +21,7 @@
+ #
+
+ require 'cgi'
+-require 'webgen/plugins/tags/tags'
++require 'webgen0.3/plugins/tags/tags'
+
+ module Tags
+
+Index: webgen-0.3.8/lib/webgen/plugins/tags/includefile.rb
+===================================================================
+--- webgen-0.3.8.orig/lib/webgen/plugins/tags/includefile.rb 2005-12-24 12:37:41.000000000 +0100
++++ webgen-0.3.8/lib/webgen/plugins/tags/includefile.rb 2011-02-14 21:40:09.007020355 +0100
+@@ -21,7 +21,7 @@
+ #
+
+ require 'cgi'
+-require 'webgen/plugins/tags/tags'
++require 'webgen0.3/plugins/tags/tags'
+
+ module Tags
+
+Index: webgen-0.3.8/lib/webgen/plugins/tags/langbar.rb
+===================================================================
+--- webgen-0.3.8.orig/lib/webgen/plugins/tags/langbar.rb 2005-12-24 12:37:41.000000000 +0100
++++ webgen-0.3.8/lib/webgen/plugins/tags/langbar.rb 2011-02-14 21:40:09.007020355 +0100
+@@ -20,7 +20,7 @@
+ #++
+ #
+
+-require 'webgen/plugins/tags/tags'
++require 'webgen0.3/plugins/tags/tags'
+
+ module Tags
+
+Index: webgen-0.3.8/lib/webgen/plugins/tags/menu.rb
+===================================================================
+--- webgen-0.3.8.orig/lib/webgen/plugins/tags/menu.rb 2005-12-24 12:37:41.000000000 +0100
++++ webgen-0.3.8/lib/webgen/plugins/tags/menu.rb 2011-02-14 21:40:09.007020355 +0100
+@@ -20,8 +20,8 @@
+ #++
+ #
+
+-require 'webgen/node'
+-require 'webgen/plugins/tags/tags'
++require 'webgen0.3/node'
++require 'webgen0.3/plugins/tags/tags'
+
+ module Tags
+
+Index: webgen-0.3.8/lib/webgen/plugins/tags/meta.rb
+===================================================================
+--- webgen-0.3.8.orig/lib/webgen/plugins/tags/meta.rb 2005-12-24 12:37:41.000000000 +0100
++++ webgen-0.3.8/lib/webgen/plugins/tags/meta.rb 2011-02-14 21:40:09.007020355 +0100
+@@ -20,7 +20,7 @@
+ #++
+ #
+
+-require 'webgen/plugins/tags/tags'
++require 'webgen0.3/plugins/tags/tags'
+
+ module Tags
+
+Index: webgen-0.3.8/lib/webgen/plugins/tags/relocatable.rb
+===================================================================
+--- webgen-0.3.8.orig/lib/webgen/plugins/tags/relocatable.rb 2005-12-24 12:37:41.000000000 +0100
++++ webgen-0.3.8/lib/webgen/plugins/tags/relocatable.rb 2011-02-14 21:40:09.007020355 +0100
+@@ -20,7 +20,7 @@
+ #++
+ #
+
+-require 'webgen/plugins/tags/tags'
++require 'webgen0.3/plugins/tags/tags'
+ require 'uri'
+
+ module Tags
+Index: webgen-0.3.8/lib/webgen/plugins/tags/sitemap.rb
+===================================================================
+--- webgen-0.3.8.orig/lib/webgen/plugins/tags/sitemap.rb 2005-12-24 12:37:41.000000000 +0100
++++ webgen-0.3.8/lib/webgen/plugins/tags/sitemap.rb 2011-02-14 21:40:09.007020355 +0100
+@@ -20,7 +20,7 @@
+ #++
+ #
+
+-require 'webgen/plugins/tags/tags'
++require 'webgen0.3/plugins/tags/tags'
+
+ module Tags
+
+Index: webgen-0.3.8/lib/webgen/plugins/tags/wikilink.rb
+===================================================================
+--- webgen-0.3.8.orig/lib/webgen/plugins/tags/wikilink.rb 2005-12-24 12:37:41.000000000 +0100
++++ webgen-0.3.8/lib/webgen/plugins/tags/wikilink.rb 2011-02-14 21:40:09.007020355 +0100
+@@ -20,7 +20,7 @@
+ #++
+ #
+
+-require 'webgen/plugins/tags/tags'
++require 'webgen0.3/plugins/tags/tags'
+
+ module Tags
+
Modified: trunk/webgen/debian/rules
===================================================================
--- trunk/webgen/debian/rules 2011-02-14 19:07:59 UTC (rev 6058)
+++ trunk/webgen/debian/rules 2011-02-14 20:43:52 UTC (rev 6059)
@@ -6,17 +6,17 @@
DEB_RUBY_CONFIG_ARGS = --prefix=/usr --site-ruby-common=$(DEB_RUBY_LIBDIR) --site-ruby=$(DEB_RUBY_LIBDIR)
DEB_RUBY_CLEAN_TARGET = clean
+cur_inst_dir = debian/$(cdbs_curpkg)
+
+
install/webgen::
sed -i -e "s=^#! */usr/bin/ruby.*$$=#!/usr/bin/ruby=g" \
debian/webgen/usr/bin/webgen
rm -f debian/webgen/usr/bin/webgen-gallery-editor
rm -f debian/webgen/usr/bin/webgen-gui
+# Move to webgen0.3
+ mv $(cur_inst_dir)/usr/bin/webgen $(cur_inst_dir)/usr/bin/webgen0.3
+ mv $(cur_inst_dir)/usr/lib/ruby/1.8/webgen $(cur_inst_dir)/usr/lib/ruby/1.8/webgen0.3
+ mv $(cur_inst_dir)/usr/share/webgen $(cur_inst_dir)/usr/share/webgen0.3
-
-#install/webgen-gui::
-# ruby setup.rb install --prefix=debian/webgen-gui
-# rm -f debian/webgen-gui/usr/bin/webgen
-# rm -rf debian/webgen-gui/usr/lib/
-# rm -rf debian/webgen-gui/usr/share/
-
Modified: trunk/webgen/debian/watch
===================================================================
--- trunk/webgen/debian/watch 2011-02-14 19:07:59 UTC (rev 6058)
+++ trunk/webgen/debian/watch 2011-02-14 20:43:52 UTC (rev 6059)
@@ -1,2 +1,2 @@
version=3
-http://rubyforge.org/frs/?group_id=296 .*webgen-(.*)\.t.*
+http://rubyforge.org/frs/?group_id=296 .*webgen-(0\.3\..*)\.t.*
Deleted: trunk/webgen/debian/webgen.1
===================================================================
--- trunk/webgen/debian/webgen.1 2011-02-14 19:07:59 UTC (rev 6058)
+++ trunk/webgen/debian/webgen.1 2011-02-14 20:43:52 UTC (rev 6059)
@@ -1,58 +0,0 @@
-.TH "WEBGEN" 1 "August 2005" "Debian GNU/Linux" "User Commands"
-.SH NAME
-webgen \- a template based static website generator
-.SH SYNOPSIS
-.B webgen
-[\fIglobal options\fR]
-\fIcommand\fR
-[\fIcommand arguments\fR]
-.SH DESCRIPTION
-Webgen is used to generate web pages from page description and template files.
-You create one template file in which you define the layout of your page and
-where the content should go. After that you can create page description files
-in which you only define the content.
-.SH GLOBAL OPTIONS
-.TP
-.B \-V, \-\-verbosity level
-Set verbosity to the given \fIlevel\fR.
-.TP
-.B \-L, \-\-[no\-]logfile
-Log to a file.
-.TP
-.B \-h, \-\-help [command]
-Show help (optionally for a specific \fIcommand\fR).
-.TP
-.B \-v, \-\-version
-Show the version of the program and exit.
-.SH COMMANDS
-.TP
-\fBclean\fR
-Removes the generated or all files from the output directory
-.TP
-\fBcreate\fR
-Creates the basic directories and files for webgen. This includes the
-source and output directories, the log and the plugin directory. Also, a
-basic template plus a CSS and an index file are created.
-Takes the \fIdirectory\fR to create the webgen structure in as an argument.
-.TP
-\fBrun\fR
-Runs webgen which will result in the generation of the HTML data
-in the output directory from the files in the source directory.
-This command is used as the default command when no command was issued.
-.TP
-\fBshow\fR
-Shows all available plugins or their configuration items.
-Takes either \fIconfig\fR or \fIplugins\fR as an argument.
-.TP
-\fBhelp\fR
-Provides help for the individual commands.
-.TP
-\fBversion\fR
-Shows the version of the program and exit.
-.SH SEE ALSO
-The webgen website, http://webgen.rubyforge.org/ for more information.
-.SH AUTHOR
-webgen was written by Thomas Leitner <t_leitner at gmx.at>
-.PP
-This manual page was written by Paul van Tilburg <paulvt at debian.org>
-for the Debian project (but may be used by others).
Modified: trunk/webgen/debian/webgen.manpages
===================================================================
--- trunk/webgen/debian/webgen.manpages 2011-02-14 19:07:59 UTC (rev 6058)
+++ trunk/webgen/debian/webgen.manpages 2011-02-14 20:43:52 UTC (rev 6059)
@@ -1 +1 @@
-debian/webgen.1
+debian/webgen0.3.1
Added: trunk/webgen/debian/webgen.postinst
===================================================================
--- trunk/webgen/debian/webgen.postinst (rev 0)
+++ trunk/webgen/debian/webgen.postinst 2011-02-14 20:43:52 UTC (rev 6059)
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "configure" ]
+then
+ update-alternatives --install /usr/bin/webgen webgen /usr/bin/webgen0.3 30 \
+ --slave /usr/share/man/man1/webgen.1.gz webgen.1.gz /usr/share/man/man1/webgen0.3.1.gz
+fi
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
Added: trunk/webgen/debian/webgen.prerm
===================================================================
--- trunk/webgen/debian/webgen.prerm (rev 0)
+++ trunk/webgen/debian/webgen.prerm 2011-02-14 20:43:52 UTC (rev 6059)
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "remove" ]
+then
+ update-alternatives --remove webgen /usr/bin/webgen0.3
+fi
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
Copied: trunk/webgen/debian/webgen0.3.1 (from rev 6058, trunk/webgen/debian/webgen.1)
===================================================================
--- trunk/webgen/debian/webgen0.3.1 (rev 0)
+++ trunk/webgen/debian/webgen0.3.1 2011-02-14 20:43:52 UTC (rev 6059)
@@ -0,0 +1,58 @@
+.TH "WEBGEN" 1 "August 2005" "Debian GNU/Linux" "User Commands"
+.SH NAME
+webgen \- a template based static website generator
+.SH SYNOPSIS
+.B webgen
+[\fIglobal options\fR]
+\fIcommand\fR
+[\fIcommand arguments\fR]
+.SH DESCRIPTION
+Webgen is used to generate web pages from page description and template files.
+You create one template file in which you define the layout of your page and
+where the content should go. After that you can create page description files
+in which you only define the content.
+.SH GLOBAL OPTIONS
+.TP
+.B \-V, \-\-verbosity level
+Set verbosity to the given \fIlevel\fR.
+.TP
+.B \-L, \-\-[no\-]logfile
+Log to a file.
+.TP
+.B \-h, \-\-help [command]
+Show help (optionally for a specific \fIcommand\fR).
+.TP
+.B \-v, \-\-version
+Show the version of the program and exit.
+.SH COMMANDS
+.TP
+\fBclean\fR
+Removes the generated or all files from the output directory
+.TP
+\fBcreate\fR
+Creates the basic directories and files for webgen. This includes the
+source and output directories, the log and the plugin directory. Also, a
+basic template plus a CSS and an index file are created.
+Takes the \fIdirectory\fR to create the webgen structure in as an argument.
+.TP
+\fBrun\fR
+Runs webgen which will result in the generation of the HTML data
+in the output directory from the files in the source directory.
+This command is used as the default command when no command was issued.
+.TP
+\fBshow\fR
+Shows all available plugins or their configuration items.
+Takes either \fIconfig\fR or \fIplugins\fR as an argument.
+.TP
+\fBhelp\fR
+Provides help for the individual commands.
+.TP
+\fBversion\fR
+Shows the version of the program and exit.
+.SH SEE ALSO
+The webgen website, http://webgen.rubyforge.org/ for more information.
+.SH AUTHOR
+webgen was written by Thomas Leitner <t_leitner at gmx.at>
+.PP
+This manual page was written by Paul van Tilburg <paulvt at debian.org>
+for the Debian project (but may be used by others).
More information about the Pkg-ruby-extras-commits
mailing list