[DRE-commits] r6047 - in trunk/webgen0.4/debian: . patches
Vincent Fourmond
fourmond at alioth.debian.org
Sun Feb 13 22:48:36 UTC 2011
Author: fourmond
Date: 2011-02-13 22:48:35 +0000 (Sun, 13 Feb 2011)
New Revision: 6047
Added:
trunk/webgen0.4/debian/patches/drop-rubygems.diff
trunk/webgen0.4/debian/patches/webgen-to-webgen0.4.diff
Removed:
trunk/webgen0.4/debian/patches/drop-fucking-rubygems.diff
Modified:
trunk/webgen0.4/debian/changelog
trunk/webgen0.4/debian/patches/series
trunk/webgen0.4/debian/rules
Log:
[webgen0.4] rename directories from webgen to webgen0.4
Modified: trunk/webgen0.4/debian/changelog
===================================================================
--- trunk/webgen0.4/debian/changelog 2011-02-13 19:44:04 UTC (rev 6046)
+++ trunk/webgen0.4/debian/changelog 2011-02-13 22:48:35 UTC (rev 6047)
@@ -1,3 +1,12 @@
+webgen0.4 (0.4.7-5) unstable; urgency=low
+
+ * Improved naming of patches for diplomatic reasons...
+ * Rename all webgen directories as webgen0.4, to not install the same
+ files as other webgen versions. Now, really closes: #613126.
+ -> webgen-to-webgen0.4.diff
+
+ -- Vincent Fourmond <fourmond at debian.org> Sun, 13 Feb 2011 23:43:14 +0100
+
webgen0.4 (0.4.7-4) unstable; urgency=low
[ Paul van Tilburg ]
Deleted: trunk/webgen0.4/debian/patches/drop-fucking-rubygems.diff
===================================================================
--- trunk/webgen0.4/debian/patches/drop-fucking-rubygems.diff 2011-02-13 19:44:04 UTC (rev 6046)
+++ trunk/webgen0.4/debian/patches/drop-fucking-rubygems.diff 2011-02-13 22:48:35 UTC (rev 6047)
@@ -1,18 +0,0 @@
-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
Copied: trunk/webgen0.4/debian/patches/drop-rubygems.diff (from rev 6044, trunk/webgen0.4/debian/patches/drop-fucking-rubygems.diff)
===================================================================
--- trunk/webgen0.4/debian/patches/drop-rubygems.diff (rev 0)
+++ trunk/webgen0.4/debian/patches/drop-rubygems.diff 2011-02-13 22:48:35 UTC (rev 6047)
@@ -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
Modified: trunk/webgen0.4/debian/patches/series
===================================================================
--- trunk/webgen0.4/debian/patches/series 2011-02-13 19:44:04 UTC (rev 6046)
+++ trunk/webgen0.4/debian/patches/series 2011-02-13 22:48:35 UTC (rev 6047)
@@ -1,5 +1,6 @@
cmdparse2.diff
trash_statcounter.diff
shebang-ruby.diff
-drop-fucking-rubygems.diff
+drop-rubygems.diff
textile-line-breaks.diff
+webgen-to-webgen0.4.diff
Added: trunk/webgen0.4/debian/patches/webgen-to-webgen0.4.diff
===================================================================
--- trunk/webgen0.4/debian/patches/webgen-to-webgen0.4.diff (rev 0)
+++ trunk/webgen0.4/debian/patches/webgen-to-webgen0.4.diff 2011-02-13 22:48:35 UTC (rev 6047)
@@ -0,0 +1,702 @@
+Index: webgen0.4-0.4.7/lib/webgen/cli.rb
+===================================================================
+--- webgen0.4-0.4.7.orig/lib/webgen/cli.rb 2011-02-13 23:36:01.252602951 +0100
++++ webgen0.4-0.4.7/lib/webgen/cli.rb 2011-02-13 23:36:01.284601924 +0100
+@@ -23,7 +23,7 @@
+ require 'rbconfig'
+ require 'fileutils'
+ require 'cmdparse2'
+-require 'webgen/website'
++require 'webgen0.4/website'
+
+ module Webgen
+
+Index: webgen0.4-0.4.7/lib/webgen/gui/main.rb
+===================================================================
+--- webgen0.4-0.4.7.orig/lib/webgen/gui/main.rb 2008-01-12 13:41:25.000000000 +0100
++++ webgen0.4-0.4.7/lib/webgen/gui/main.rb 2011-02-13 23:36:01.284601924 +0100
+@@ -7,8 +7,8 @@
+
+ require 'Qt'
+ require 'cgi'
+-require 'webgen/gui/common'
+-require 'webgen/gui/new_website_dlg'
++require 'webgen0.4/gui/common'
++require 'webgen0.4/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.4/DIR' )
+ end
+
+ def new
+Index: webgen0.4-0.4.7/lib/webgen/languages.rb
+===================================================================
+--- webgen0.4-0.4.7.orig/lib/webgen/languages.rb 2008-01-12 13:41:25.000000000 +0100
++++ webgen0.4-0.4.7/lib/webgen/languages.rb 2011-02-13 23:36:01.284601924 +0100
+@@ -20,7 +20,7 @@
+ #++
+ #
+
+-require 'webgen/config'
++require 'webgen0.4/config'
+
+ module Webgen
+
+Index: webgen0.4-0.4.7/lib/webgen/node.rb
+===================================================================
+--- webgen0.4-0.4.7.orig/lib/webgen/node.rb 2008-01-12 13:41:25.000000000 +0100
++++ webgen0.4-0.4.7/lib/webgen/node.rb 2011-02-13 23:36:01.284601924 +0100
+@@ -22,7 +22,7 @@
+
+ require 'uri'
+ require 'pathname'
+-require 'webgen/composite'
++require 'webgen0.4/composite'
+
+ # The Node class is used for building the internal data structure which represents the output tree.
+ class Node
+Index: webgen0.4-0.4.7/lib/webgen/plugin.rb
+===================================================================
+--- webgen0.4-0.4.7.orig/lib/webgen/plugin.rb 2008-01-12 13:41:25.000000000 +0100
++++ webgen0.4-0.4.7/lib/webgen/plugin.rb 2011-02-13 23:36:01.284601924 +0100
+@@ -25,7 +25,7 @@
+ require 'ostruct'
+ require 'logger'
+ require 'tsort'
+-require 'webgen/config'
++require 'webgen0.4/config'
+
+ class OpenStruct
+ public :table #:nodoc:#
+@@ -564,7 +564,7 @@
+
+ def self.load_default_plugins( loader = DEFAULT_PLUGIN_LOADER )
+ loader.load_from_dir( File.join( File.dirname( __FILE__ ), 'plugins' ),
+- File.dirname( __FILE__ ).sub( /webgen$/, '' ) )
++ File.dirname( __FILE__ ).sub( /webgen(0.4)?$/, '' ) )
+ end
+
+ # Set this constant to +false+ before requiring the file to not load the default plugins.
+Index: webgen0.4-0.4.7/lib/webgen/plugins/contentconverters/haml.rb
+===================================================================
+--- webgen0.4-0.4.7.orig/lib/webgen/plugins/contentconverters/haml.rb 2008-01-12 13:41:25.000000000 +0100
++++ webgen0.4-0.4.7/lib/webgen/plugins/contentconverters/haml.rb 2011-02-13 23:36:01.288601410 +0100
+@@ -26,7 +26,7 @@
+ :info => "Haml/Sass can be used as content format" ) do
+
+ require 'haml'
+- load_plugin 'webgen/plugins/contentconverters/default'
++ load_plugin 'webgen0.4/plugins/contentconverters/default'
+
+ module ContentConverters
+
+Index: webgen0.4-0.4.7/lib/webgen/plugins/contentconverters/html.rb
+===================================================================
+--- webgen0.4-0.4.7.orig/lib/webgen/plugins/contentconverters/html.rb 2008-01-12 13:41:25.000000000 +0100
++++ webgen0.4-0.4.7/lib/webgen/plugins/contentconverters/html.rb 2011-02-13 23:36:01.288601410 +0100
+@@ -20,7 +20,7 @@
+ #++
+ #
+
+-load_plugin 'webgen/plugins/contentconverters/default'
++load_plugin 'webgen0.4/plugins/contentconverters/default'
+
+ module ContentConverters
+
+Index: webgen0.4-0.4.7/lib/webgen/plugins/contentconverters/markdown.rb
+===================================================================
+--- webgen0.4-0.4.7.orig/lib/webgen/plugins/contentconverters/markdown.rb 2008-01-12 13:41:25.000000000 +0100
++++ webgen0.4-0.4.7/lib/webgen/plugins/contentconverters/markdown.rb 2011-02-13 23:36:01.288601410 +0100
+@@ -26,7 +26,7 @@
+ :info => "Markdown can be used as content format" ) do
+
+ require 'bluecloth'
+- load_plugin 'webgen/plugins/contentconverters/default'
++ load_plugin 'webgen0.4/plugins/contentconverters/default'
+
+ module ContentConverters
+
+Index: webgen0.4-0.4.7/lib/webgen/plugins/contentconverters/maruku.rb
+===================================================================
+--- webgen0.4-0.4.7.orig/lib/webgen/plugins/contentconverters/maruku.rb 2008-01-12 13:41:25.000000000 +0100
++++ webgen0.4-0.4.7/lib/webgen/plugins/contentconverters/maruku.rb 2011-02-13 23:36:01.288601410 +0100
+@@ -4,7 +4,7 @@
+ :info => "Markdown + (extra) can be used as content format" ) do
+
+ require 'maruku'
+- load_plugin 'webgen/plugins/contentconverters/default'
++ load_plugin 'webgen0.4/plugins/contentconverters/default'
+
+ module ContentConverters
+
+Index: webgen0.4-0.4.7/lib/webgen/plugins/contentconverters/rdoc.rb
+===================================================================
+--- webgen0.4-0.4.7.orig/lib/webgen/plugins/contentconverters/rdoc.rb 2008-01-12 13:41:25.000000000 +0100
++++ webgen0.4-0.4.7/lib/webgen/plugins/contentconverters/rdoc.rb 2011-02-13 23:36:01.288601410 +0100
+@@ -22,7 +22,7 @@
+
+ require 'rdoc/markup/simple_markup'
+ require 'rdoc/markup/simple_markup/to_html'
+-load_plugin 'webgen/plugins/contentconverters/default'
++load_plugin 'webgen0.4/plugins/contentconverters/default'
+
+ module ContentConverters
+
+Index: webgen0.4-0.4.7/lib/webgen/plugins/contentconverters/textile.rb
+===================================================================
+--- webgen0.4-0.4.7.orig/lib/webgen/plugins/contentconverters/textile.rb 2011-02-13 23:36:01.280602848 +0100
++++ webgen0.4-0.4.7/lib/webgen/plugins/contentconverters/textile.rb 2011-02-13 23:36:01.288601410 +0100
+@@ -26,7 +26,7 @@
+ :info => "Textile can be used as content format" ) do
+
+ require 'redcloth'
+- load_plugin 'webgen/plugins/contentconverters/default'
++ load_plugin 'webgen0.4/plugins/contentconverters/default'
+
+ module ContentConverters
+
+Index: webgen0.4-0.4.7/lib/webgen/plugins/contentconverters/xmlbuilder.rb
+===================================================================
+--- webgen0.4-0.4.7.orig/lib/webgen/plugins/contentconverters/xmlbuilder.rb 2008-01-12 13:41:25.000000000 +0100
++++ webgen0.4-0.4.7/lib/webgen/plugins/contentconverters/xmlbuilder.rb 2011-02-13 23:36:01.288601410 +0100
+@@ -27,7 +27,7 @@
+ :info => "The builder library can be used to create XHTML/XML content" ) do
+
+ require 'builder'
+- load_plugin 'webgen/plugins/contentconverters/default'
++ load_plugin 'webgen0.4/plugins/contentconverters/default'
+
+ module ContentConverters
+
+Index: webgen0.4-0.4.7/lib/webgen/plugins/coreplugins/resourcemanager.rb
+===================================================================
+--- webgen0.4-0.4.7.orig/lib/webgen/plugins/coreplugins/resourcemanager.rb 2008-01-12 13:41:25.000000000 +0100
++++ webgen0.4-0.4.7/lib/webgen/plugins/coreplugins/resourcemanager.rb 2011-02-13 23:36:01.288601410 +0100
+@@ -21,8 +21,8 @@
+ #
+
+ require 'fileutils'
+-load_plugin 'webgen/plugins/tags/tag_processor'
+-load_plugin 'webgen/plugins/filehandlers/filehandler'
++load_plugin 'webgen0.4/plugins/tags/tag_processor'
++load_plugin 'webgen0.4/plugins/filehandlers/filehandler'
+
+ module CorePlugins
+
+Index: webgen0.4-0.4.7/lib/webgen/plugins/filehandlers/copy.rb
+===================================================================
+--- webgen0.4-0.4.7.orig/lib/webgen/plugins/filehandlers/copy.rb 2008-01-12 13:41:25.000000000 +0100
++++ webgen0.4-0.4.7/lib/webgen/plugins/filehandlers/copy.rb 2011-02-13 23:36:01.288601410 +0100
+@@ -22,7 +22,7 @@
+
+ require 'fileutils'
+ require 'erb'
+-load_plugin 'webgen/plugins/filehandlers/filehandler'
++load_plugin 'webgen0.4/plugins/filehandlers/filehandler'
+
+ module FileHandlers
+
+Index: webgen0.4-0.4.7/lib/webgen/plugins/filehandlers/directory.rb
+===================================================================
+--- webgen0.4-0.4.7.orig/lib/webgen/plugins/filehandlers/directory.rb 2008-01-12 13:41:25.000000000 +0100
++++ webgen0.4-0.4.7/lib/webgen/plugins/filehandlers/directory.rb 2011-02-13 23:36:01.288601410 +0100
+@@ -20,8 +20,8 @@
+ #++
+ #
+
+-load_plugin 'webgen/plugins/filehandlers/filehandler.rb'
+-require 'webgen/node'
++load_plugin 'webgen0.4/plugins/filehandlers/filehandler.rb'
++require 'webgen0.4/node'
+
+ module FileHandlers
+
+Index: webgen0.4-0.4.7/lib/webgen/plugins/filehandlers/filehandler.rb
+===================================================================
+--- webgen0.4-0.4.7.orig/lib/webgen/plugins/filehandlers/filehandler.rb 2008-01-12 13:41:25.000000000 +0100
++++ webgen0.4-0.4.7/lib/webgen/plugins/filehandlers/filehandler.rb 2011-02-13 23:36:01.288601410 +0100
+@@ -22,9 +22,9 @@
+
+ require 'set'
+ require 'yaml'
+-require 'webgen/node'
+-require 'webgen/listener'
+-require 'webgen/languages'
++require 'webgen0.4/node'
++require 'webgen0.4/listener'
++require 'webgen0.4/languages'
+
+ module FileHandlers
+
+Index: webgen0.4-0.4.7/lib/webgen/plugins/filehandlers/gallery.rb
+===================================================================
+--- webgen0.4-0.4.7.orig/lib/webgen/plugins/filehandlers/gallery.rb 2008-01-12 13:41:25.000000000 +0100
++++ webgen0.4-0.4.7/lib/webgen/plugins/filehandlers/gallery.rb 2011-02-13 23:36:01.288601410 +0100
+@@ -20,9 +20,9 @@
+ #++
+ #
+
+-load_plugin 'webgen/plugins/filehandlers/filehandler'
+-load_plugin 'webgen/plugins/filehandlers/directory'
+-load_plugin 'webgen/plugins/filehandlers/page'
++load_plugin 'webgen0.4/plugins/filehandlers/filehandler'
++load_plugin 'webgen0.4/plugins/filehandlers/directory'
++load_plugin 'webgen0.4/plugins/filehandlers/page'
+
+ load_optional_part( 'gallery-exif',
+ :needed_gems => ['exifr'],
+Index: webgen0.4-0.4.7/lib/webgen/plugins/filehandlers/page.rb
+===================================================================
+--- webgen0.4-0.4.7.orig/lib/webgen/plugins/filehandlers/page.rb 2008-01-12 13:41:25.000000000 +0100
++++ webgen0.4-0.4.7/lib/webgen/plugins/filehandlers/page.rb 2011-02-13 23:36:01.288601410 +0100
+@@ -20,11 +20,11 @@
+ #++
+ #
+
+-load_plugin 'webgen/plugins/filehandlers/filehandler'
+-require 'webgen/listener'
+-require 'webgen/languages'
+-require 'webgen/content'
+-require 'webgen/node'
++load_plugin 'webgen0.4/plugins/filehandlers/filehandler'
++require 'webgen0.4/listener'
++require 'webgen0.4/languages'
++require 'webgen0.4/content'
++require 'webgen0.4/node'
+
+ module FileHandlers
+
+Index: webgen0.4-0.4.7/lib/webgen/plugins/filehandlers/sipttra.rb
+===================================================================
+--- webgen0.4-0.4.7.orig/lib/webgen/plugins/filehandlers/sipttra.rb 2008-01-12 13:41:25.000000000 +0100
++++ webgen0.4-0.4.7/lib/webgen/plugins/filehandlers/sipttra.rb 2011-02-13 23:36:01.288601410 +0100
+@@ -22,10 +22,10 @@
+
+ require 'yaml'
+ require 'erb'
+-require 'webgen/sipttra_format'
++require 'webgen0.4/sipttra_format'
+
+-load_plugin 'webgen/plugins/filehandlers/filehandler'
+-load_plugin 'webgen/plugins/filehandlers/page'
++load_plugin 'webgen0.4/plugins/filehandlers/filehandler'
++load_plugin 'webgen0.4/plugins/filehandlers/page'
+
+
+ module FileHandlers
+Index: webgen0.4-0.4.7/lib/webgen/plugins/filehandlers/template.rb
+===================================================================
+--- webgen0.4-0.4.7.orig/lib/webgen/plugins/filehandlers/template.rb 2008-01-12 13:41:25.000000000 +0100
++++ webgen0.4-0.4.7/lib/webgen/plugins/filehandlers/template.rb 2011-02-13 23:36:01.288601410 +0100
+@@ -20,7 +20,7 @@
+ #++
+ #
+
+-load_plugin 'webgen/plugins/filehandlers/page'
++load_plugin 'webgen0.4/plugins/filehandlers/page'
+
+ module FileHandlers
+
+Index: webgen0.4-0.4.7/lib/webgen/plugins/htmlvalidators/xmllint.rb
+===================================================================
+--- webgen0.4-0.4.7.orig/lib/webgen/plugins/htmlvalidators/xmllint.rb 2008-01-12 13:41:25.000000000 +0100
++++ webgen0.4-0.4.7/lib/webgen/plugins/htmlvalidators/xmllint.rb 2011-02-13 23:36:01.292601727 +0100
+@@ -20,8 +20,8 @@
+ #++
+ #
+
+-load_plugin 'webgen/plugins/htmlvalidators/default'
+-require 'webgen/extcommand'
++load_plugin 'webgen0.4/plugins/htmlvalidators/default'
++require 'webgen0.4/extcommand'
+
+ module HtmlValidators
+
+Index: webgen0.4-0.4.7/lib/webgen/plugins/menustyles/horizontal.rb
+===================================================================
+--- webgen0.4-0.4.7.orig/lib/webgen/plugins/menustyles/horizontal.rb 2008-01-12 13:41:25.000000000 +0100
++++ webgen0.4-0.4.7/lib/webgen/plugins/menustyles/horizontal.rb 2011-02-13 23:36:01.292601727 +0100
+@@ -20,7 +20,7 @@
+ #++
+ #
+
+-load_plugin 'webgen/plugins/menustyles/default'
++load_plugin 'webgen0.4/plugins/menustyles/default'
+
+ module MenuStyles
+
+Index: webgen0.4-0.4.7/lib/webgen/plugins/menustyles/horizontal_dropdown.rb
+===================================================================
+--- webgen0.4-0.4.7.orig/lib/webgen/plugins/menustyles/horizontal_dropdown.rb 2008-01-12 13:41:25.000000000 +0100
++++ webgen0.4-0.4.7/lib/webgen/plugins/menustyles/horizontal_dropdown.rb 2011-02-13 23:36:01.292601727 +0100
+@@ -20,7 +20,7 @@
+ #++
+ #
+
+-load_plugin 'webgen/plugins/menustyles/default'
++load_plugin 'webgen0.4/plugins/menustyles/default'
+
+ module MenuStyles
+
+Index: webgen0.4-0.4.7/lib/webgen/plugins/menustyles/section.rb
+===================================================================
+--- webgen0.4-0.4.7.orig/lib/webgen/plugins/menustyles/section.rb 2008-01-12 13:41:25.000000000 +0100
++++ webgen0.4-0.4.7/lib/webgen/plugins/menustyles/section.rb 2011-02-13 23:36:01.292601727 +0100
+@@ -20,7 +20,7 @@
+ #++
+ #
+
+-load_plugin 'webgen/plugins/menustyles/default'
++load_plugin 'webgen0.4/plugins/menustyles/default'
+
+ module MenuStyles
+
+Index: webgen0.4-0.4.7/lib/webgen/plugins/menustyles/vertical.rb
+===================================================================
+--- webgen0.4-0.4.7.orig/lib/webgen/plugins/menustyles/vertical.rb 2008-01-12 13:41:25.000000000 +0100
++++ webgen0.4-0.4.7/lib/webgen/plugins/menustyles/vertical.rb 2011-02-13 23:36:01.292601727 +0100
+@@ -20,7 +20,7 @@
+ #++
+ #
+
+-load_plugin 'webgen/plugins/menustyles/default'
++load_plugin 'webgen0.4/plugins/menustyles/default'
+
+ module MenuStyles
+
+Index: webgen0.4-0.4.7/lib/webgen/plugins/menustyles/vertical_dropdown.rb
+===================================================================
+--- webgen0.4-0.4.7.orig/lib/webgen/plugins/menustyles/vertical_dropdown.rb 2008-01-12 13:41:25.000000000 +0100
++++ webgen0.4-0.4.7/lib/webgen/plugins/menustyles/vertical_dropdown.rb 2011-02-13 23:36:01.292601727 +0100
+@@ -20,7 +20,7 @@
+ #++
+ #
+
+-load_plugin 'webgen/plugins/menustyles/default'
++load_plugin 'webgen0.4/plugins/menustyles/default'
+
+ module MenuStyles
+
+Index: webgen0.4-0.4.7/lib/webgen/plugins/miscplugins/rendered_files.rb
+===================================================================
+--- webgen0.4-0.4.7.orig/lib/webgen/plugins/miscplugins/rendered_files.rb 2008-01-12 13:41:25.000000000 +0100
++++ webgen0.4-0.4.7/lib/webgen/plugins/miscplugins/rendered_files.rb 2011-02-13 23:36:01.292601727 +0100
+@@ -28,7 +28,7 @@
+
+
+
+-load_plugin 'webgen/plugins/filehandlers/filehandler'
++load_plugin 'webgen0.4/plugins/filehandlers/filehandler'
+
+ module MiscPlugins
+
+Index: webgen0.4-0.4.7/lib/webgen/plugins/miscplugins/smileyreplacer.rb
+===================================================================
+--- webgen0.4-0.4.7.orig/lib/webgen/plugins/miscplugins/smileyreplacer.rb 2008-01-12 13:41:25.000000000 +0100
++++ webgen0.4-0.4.7/lib/webgen/plugins/miscplugins/smileyreplacer.rb 2011-02-13 23:36:01.292601727 +0100
+@@ -20,8 +20,8 @@
+ #++
+ #
+
+-load_plugin 'webgen/plugins/filehandlers/page'
+-load_plugin 'webgen/plugins/coreplugins/resourcemanager'
++load_plugin 'webgen0.4/plugins/filehandlers/page'
++load_plugin 'webgen0.4/plugins/coreplugins/resourcemanager'
+
+ module MiscPlugins
+
+Index: webgen0.4-0.4.7/lib/webgen/plugins/tags/block.rb
+===================================================================
+--- webgen0.4-0.4.7.orig/lib/webgen/plugins/tags/block.rb 2008-01-12 13:41:25.000000000 +0100
++++ webgen0.4-0.4.7/lib/webgen/plugins/tags/block.rb 2011-02-13 23:36:01.292601727 +0100
+@@ -20,7 +20,7 @@
+ #++
+ #
+
+-load_plugin 'webgen/plugins/tags/tag_processor'
++load_plugin 'webgen0.4/plugins/tags/tag_processor'
+
+ module Tags
+
+Index: webgen0.4-0.4.7/lib/webgen/plugins/tags/breadcrumbtrail.rb
+===================================================================
+--- webgen0.4-0.4.7.orig/lib/webgen/plugins/tags/breadcrumbtrail.rb 2008-01-12 13:41:25.000000000 +0100
++++ webgen0.4-0.4.7/lib/webgen/plugins/tags/breadcrumbtrail.rb 2011-02-13 23:36:01.292601727 +0100
+@@ -20,7 +20,7 @@
+ #++
+ #
+
+-load_plugin 'webgen/plugins/tags/tag_processor'
++load_plugin 'webgen0.4/plugins/tags/tag_processor'
+
+ module Tags
+
+Index: webgen0.4-0.4.7/lib/webgen/plugins/tags/customvar.rb
+===================================================================
+--- webgen0.4-0.4.7.orig/lib/webgen/plugins/tags/customvar.rb 2008-01-12 13:41:25.000000000 +0100
++++ webgen0.4-0.4.7/lib/webgen/plugins/tags/customvar.rb 2011-02-13 23:36:01.292601727 +0100
+@@ -20,7 +20,7 @@
+ #++
+ #
+
+-load_plugin 'webgen/plugins/tags/tag_processor'
++load_plugin 'webgen0.4/plugins/tags/tag_processor'
+
+ module Tags
+
+Index: webgen0.4-0.4.7/lib/webgen/plugins/tags/date.rb
+===================================================================
+--- webgen0.4-0.4.7.orig/lib/webgen/plugins/tags/date.rb 2008-01-12 13:41:25.000000000 +0100
++++ webgen0.4-0.4.7/lib/webgen/plugins/tags/date.rb 2011-02-13 23:36:01.292601727 +0100
+@@ -20,7 +20,7 @@
+ #++
+ #
+
+-load_plugin 'webgen/plugins/tags/tag_processor'
++load_plugin 'webgen0.4/plugins/tags/tag_processor'
+
+ module Tags
+
+Index: webgen0.4-0.4.7/lib/webgen/plugins/tags/download.rb
+===================================================================
+--- webgen0.4-0.4.7.orig/lib/webgen/plugins/tags/download.rb 2008-01-12 13:41:25.000000000 +0100
++++ webgen0.4-0.4.7/lib/webgen/plugins/tags/download.rb 2011-02-13 23:36:01.292601727 +0100
+@@ -20,8 +20,8 @@
+ #++
+ #
+
+-load_plugin 'webgen/plugins/tags/tag_processor'
+-load_plugin 'webgen/plugins/coreplugins/resourcemanager'
++load_plugin 'webgen0.4/plugins/tags/tag_processor'
++load_plugin 'webgen0.4/plugins/coreplugins/resourcemanager'
+ require 'yaml'
+ require 'uri'
+ require 'open-uri'
+Index: webgen0.4-0.4.7/lib/webgen/plugins/tags/executecommand.rb
+===================================================================
+--- webgen0.4-0.4.7.orig/lib/webgen/plugins/tags/executecommand.rb 2008-01-12 13:41:25.000000000 +0100
++++ webgen0.4-0.4.7/lib/webgen/plugins/tags/executecommand.rb 2011-02-13 23:36:01.292601727 +0100
+@@ -21,9 +21,9 @@
+ #
+
+ require 'cgi'
+-require 'webgen/extcommand'
+-load_plugin 'webgen/plugins/tags/tag_processor'
+-load_plugin 'webgen/plugins/miscplugins/syntax_highlighter'
++require 'webgen0.4/extcommand'
++load_plugin 'webgen0.4/plugins/tags/tag_processor'
++load_plugin 'webgen0.4/plugins/miscplugins/syntax_highlighter'
+
+ module Tags
+
+Index: webgen0.4-0.4.7/lib/webgen/plugins/tags/htmlmetainfo.rb
+===================================================================
+--- webgen0.4-0.4.7.orig/lib/webgen/plugins/tags/htmlmetainfo.rb 2008-01-12 13:41:25.000000000 +0100
++++ webgen0.4-0.4.7/lib/webgen/plugins/tags/htmlmetainfo.rb 2011-02-13 23:36:01.292601727 +0100
+@@ -1,4 +1,4 @@
+-load_plugin 'webgen/plugins/tags/tag_processor'
++load_plugin 'webgen0.4/plugins/tags/tag_processor'
+
+ module Tags
+
+Index: webgen0.4-0.4.7/lib/webgen/plugins/tags/includefile.rb
+===================================================================
+--- webgen0.4-0.4.7.orig/lib/webgen/plugins/tags/includefile.rb 2008-01-12 13:41:25.000000000 +0100
++++ webgen0.4-0.4.7/lib/webgen/plugins/tags/includefile.rb 2011-02-13 23:36:01.292601727 +0100
+@@ -21,8 +21,8 @@
+ #
+
+ require 'cgi'
+-load_plugin 'webgen/plugins/tags/tag_processor'
+-load_plugin 'webgen/plugins/miscplugins/syntax_highlighter'
++load_plugin 'webgen0.4/plugins/tags/tag_processor'
++load_plugin 'webgen0.4/plugins/miscplugins/syntax_highlighter'
+
+ module Tags
+
+Index: webgen0.4-0.4.7/lib/webgen/plugins/tags/langbar.rb
+===================================================================
+--- webgen0.4-0.4.7.orig/lib/webgen/plugins/tags/langbar.rb 2008-01-12 13:41:25.000000000 +0100
++++ webgen0.4-0.4.7/lib/webgen/plugins/tags/langbar.rb 2011-02-13 23:36:01.292601727 +0100
+@@ -20,7 +20,7 @@
+ #++
+ #
+
+-load_plugin 'webgen/plugins/tags/tag_processor'
++load_plugin 'webgen0.4/plugins/tags/tag_processor'
+
+ module Tags
+
+Index: webgen0.4-0.4.7/lib/webgen/plugins/tags/menu.rb
+===================================================================
+--- webgen0.4-0.4.7.orig/lib/webgen/plugins/tags/menu.rb 2008-01-12 13:41:25.000000000 +0100
++++ webgen0.4-0.4.7/lib/webgen/plugins/tags/menu.rb 2011-02-13 23:36:01.292601727 +0100
+@@ -20,8 +20,8 @@
+ #++
+ #
+
+-require 'webgen/node'
+-load_plugin 'webgen/plugins/tags/tag_processor'
++require 'webgen0.4/node'
++load_plugin 'webgen0.4/plugins/tags/tag_processor'
+
+ module Tags
+
+Index: webgen0.4-0.4.7/lib/webgen/plugins/tags/meta.rb
+===================================================================
+--- webgen0.4-0.4.7.orig/lib/webgen/plugins/tags/meta.rb 2008-01-12 13:41:25.000000000 +0100
++++ webgen0.4-0.4.7/lib/webgen/plugins/tags/meta.rb 2011-02-13 23:36:01.292601727 +0100
+@@ -20,7 +20,7 @@
+ #++
+ #
+
+-load_plugin 'webgen/plugins/tags/tag_processor'
++load_plugin 'webgen0.4/plugins/tags/tag_processor'
+
+ module Tags
+
+Index: webgen0.4-0.4.7/lib/webgen/plugins/tags/news.rb
+===================================================================
+--- webgen0.4-0.4.7.orig/lib/webgen/plugins/tags/news.rb 2008-01-12 13:41:25.000000000 +0100
++++ webgen0.4-0.4.7/lib/webgen/plugins/tags/news.rb 2011-02-13 23:36:01.292601727 +0100
+@@ -18,7 +18,7 @@
+ #++
+ #
+
+-load_plugin 'webgen/plugins/tags/tag_processor'
++load_plugin 'webgen0.4/plugins/tags/tag_processor'
+
+ require 'parsedate'
+ require 'stringio'
+Index: webgen0.4-0.4.7/lib/webgen/plugins/tags/relocatable.rb
+===================================================================
+--- webgen0.4-0.4.7.orig/lib/webgen/plugins/tags/relocatable.rb 2008-01-12 13:41:25.000000000 +0100
++++ webgen0.4-0.4.7/lib/webgen/plugins/tags/relocatable.rb 2011-02-13 23:36:01.292601727 +0100
+@@ -20,7 +20,7 @@
+ #++
+ #
+
+-load_plugin 'webgen/plugins/tags/tag_processor'
++load_plugin 'webgen0.4/plugins/tags/tag_processor'
+ require 'uri'
+
+ module Tags
+Index: webgen0.4-0.4.7/lib/webgen/plugins/tags/sitemap.rb
+===================================================================
+--- webgen0.4-0.4.7.orig/lib/webgen/plugins/tags/sitemap.rb 2008-01-12 13:41:25.000000000 +0100
++++ webgen0.4-0.4.7/lib/webgen/plugins/tags/sitemap.rb 2011-02-13 23:36:01.292601727 +0100
+@@ -20,8 +20,8 @@
+ #++
+ #
+
+-load_plugin 'webgen/plugins/tags/tag_processor'
+-load_plugin 'webgen/plugins/filehandlers/page'
++load_plugin 'webgen0.4/plugins/tags/tag_processor'
++load_plugin 'webgen0.4/plugins/filehandlers/page'
+
+ module Tags
+
+Index: webgen0.4-0.4.7/lib/webgen/plugins/tags/wikilink.rb
+===================================================================
+--- webgen0.4-0.4.7.orig/lib/webgen/plugins/tags/wikilink.rb 2008-01-12 13:41:25.000000000 +0100
++++ webgen0.4-0.4.7/lib/webgen/plugins/tags/wikilink.rb 2011-02-13 23:36:01.296602187 +0100
+@@ -20,7 +20,7 @@
+ #++
+ #
+
+-load_plugin 'webgen/plugins/tags/tag_processor'
++load_plugin 'webgen0.4/plugins/tags/tag_processor'
+
+ module Tags
+
+Index: webgen0.4-0.4.7/lib/webgen/rake/webgentask.rb
+===================================================================
+--- webgen0.4-0.4.7.orig/lib/webgen/rake/webgentask.rb 2008-01-12 13:41:25.000000000 +0100
++++ webgen0.4-0.4.7/lib/webgen/rake/webgentask.rb 2011-02-13 23:36:01.296602187 +0100
+@@ -43,7 +43,7 @@
+ #
+ # === Basics
+ #
+- # require 'webgen/rake/webgentask'
++ # require 'webgen0.4/rake/webgentask'
+ #
+ # Webgen::Rake::WebgenTask.new do |t|
+ # t.directory = File.join(Dir.pwd, "webgen")
+@@ -117,7 +117,7 @@
+ # some items from webgen may be sensitive to the
+ # current directory when it runs
+
+- require 'webgen/website'
++ require 'webgen0.4/website'
+ @website = Webgen::WebSite.new @directory
+ @out_dir = File.expand_path(@website.param_for_plugin('Core/Configuration', 'outDir'))
+ @website.render
+Index: webgen0.4-0.4.7/lib/webgen/test.rb
+===================================================================
+--- webgen0.4-0.4.7.orig/lib/webgen/test.rb 2008-01-12 13:41:25.000000000 +0100
++++ webgen0.4-0.4.7/lib/webgen/test.rb 2011-02-13 23:36:01.296602187 +0100
+@@ -1,9 +1,9 @@
+-require 'webgen/config'
++require 'webgen0.4/config'
+
+ Webgen::LOAD_DEFAULT_PLUGINS = false
+
+ require 'test/unit'
+-require 'webgen/plugin'
++require 'webgen0.4/plugin'
+
+ module Webgen
+
+@@ -76,7 +76,7 @@
+ # Specifies +files+ as the plugin files which define the plugin which should be tested and its
+ # dependencies.
+ def plugin_files( files = nil )
+- (files.nil? ? @plugin_files.to_a + ['webgen/plugins/coreplugins/configuration.rb'] : @plugin_files = files )
++ (files.nil? ? @plugin_files.to_a + ['webgen0.4/plugins/coreplugins/configuration.rb'] : @plugin_files = files )
+ end
+
+ # The name of the plugin which should be tested.
+Index: webgen0.4-0.4.7/lib/webgen/website.rb
+===================================================================
+--- webgen0.4-0.4.7.orig/lib/webgen/website.rb 2008-01-12 13:41:25.000000000 +0100
++++ webgen0.4-0.4.7/lib/webgen/website.rb 2011-02-13 23:36:01.296602187 +0100
+@@ -23,8 +23,8 @@
+ require 'pathname'
+ require 'yaml'
+ require 'fileutils'
+-require 'webgen/config'
+-require 'webgen/plugin'
++require 'webgen0.4/config'
++require 'webgen0.4/plugin'
+
+ module Webgen
+
+Index: webgen0.4-0.4.7/bin/webgen
+===================================================================
+--- webgen0.4-0.4.7.orig/bin/webgen 2011-02-13 23:36:01.264602810 +0100
++++ webgen0.4-0.4.7/bin/webgen 2011-02-13 23:36:01.296602187 +0100
+@@ -1,4 +1,4 @@
+ #!/usr/bin/ruby
+
+-require 'webgen/cli'
++require 'webgen0.4/cli'
+ Webgen::cli_main
+Index: webgen0.4-0.4.7/lib/webgen/config.rb
+===================================================================
+--- webgen0.4-0.4.7.orig/lib/webgen/config.rb 2008-01-12 13:41:25.000000000 +0100
++++ webgen0.4-0.4.7/lib/webgen/config.rb 2011-02-13 23:36:15.292268836 +0100
+@@ -42,7 +42,7 @@
+ unless defined?( @@data_dir )
+ @@data_dir = File.expand_path( File.join( File.dirname( __FILE__ ), '..', '..', 'data', 'webgen') )
+
+- @@data_dir = File.expand_path( File.join( Config::CONFIG["datadir"], "webgen" ) ) if !File.exists?( @@data_dir )
++ @@data_dir = File.expand_path( File.join( Config::CONFIG["datadir"], "webgen0.4" ) ) if !File.exists?( @@data_dir )
+
+ raise "Could not find webgen data directory! This is a bug, report it please!" unless File.directory?( @@data_dir )
+ end
Modified: trunk/webgen0.4/debian/rules
===================================================================
--- trunk/webgen0.4/debian/rules 2011-02-13 19:44:04 UTC (rev 6046)
+++ trunk/webgen0.4/debian/rules 2011-02-13 22:48:35 UTC (rev 6047)
@@ -9,13 +9,24 @@
DEB_RUBY_CONFIG_ARGS = --prefix=/usr --site-ruby-common=$(DEB_RUBY_LIBDIR) --site-ruby=$(DEB_RUBY_LIBDIR) --shebang=never
DEB_RUBY_CLEAN_TARGET = clean
+
+cur_inst_dir = debian/$(cdbs_curpkg)
+
install/webgen0.4::
- rm -rf debian/webgen0.4/usr/lib/ruby/1.8/webgen/gui
- mv debian/webgen0.4/usr/bin/webgen debian/webgen0.4/usr/bin/webgen0.4
- mv debian/webgen0.4/usr/share/man/man1/webgen.1 debian/webgen0.4/usr/share/man/man1/webgen0.4.1
+# Removing the gui, not mature enough and too painful to support for now
+ rm -rf $(cur_inst_dir)/usr/lib/ruby/1.8/webgen/gui
+# Move to webgen0.4
+ mv $(cur_inst_dir)/usr/bin/webgen $(cur_inst_dir)/usr/bin/webgen0.4
+ mv $(cur_inst_dir)/usr/share/man/man1/webgen.1 $(cur_inst_dir)/usr/share/man/man1/webgen0.4.1
+
+ mv $(cur_inst_dir)/usr/lib/ruby/1.8/webgen $(cur_inst_dir)/usr/lib/ruby/1.8/webgen0.4
+ mv $(cur_inst_dir)/usr/share/webgen $(cur_inst_dir)/usr/share/webgen0.4
+
build/webgen0.4-doc::
+ (cd lib; ln -s webgen webgen0.4)
(cd doc ; ruby -I ../lib ../bin/webgen)
+ (cd lib; rm -f webgen0.4)
install/webgen0.4-doc::
mkdir -p debian/webgen0.4-doc/usr/share/doc/webgen0.4-doc
More information about the Pkg-ruby-extras-commits
mailing list