[DRE-commits] r5002 - in trunk/webgen0.5/debian: . patches source
Marc Dequènes
duck at alioth.debian.org
Tue Mar 23 23:39:23 UTC 2010
Author: duck
Date: 2010-03-23 23:39:23 +0000 (Tue, 23 Mar 2010)
New Revision: 5002
Added:
trunk/webgen0.5/debian/patches/default_style_dfsg
trunk/webgen0.5/debian/source/
trunk/webgen0.5/debian/source/format
Removed:
trunk/webgen0.5/debian/patches/bin_header.diff
Modified:
trunk/webgen0.5/debian/changelog
trunk/webgen0.5/debian/control
trunk/webgen0.5/debian/patches/series
trunk/webgen0.5/debian/rules
Log:
[evol] NUR, format 3, policy 3.8.4, #528563, #557571
Modified: trunk/webgen0.5/debian/changelog
===================================================================
--- trunk/webgen0.5/debian/changelog 2010-03-23 22:48:17 UTC (rev 5001)
+++ trunk/webgen0.5/debian/changelog 2010-03-23 23:39:23 UTC (rev 5002)
@@ -1,9 +1,20 @@
-webgen0.5 (0.5.10+dfsg-2) UNRELEASED; urgency=low
+webgen0.5 (0.5.11+dfsg-1) unstable; urgency=low
+ [ Paul van Tilburg ]
* debian/watch: added mangle rule for the Debian version.
- -- Paul van Tilburg <paulvt at debian.org> Sat, 12 Sep 2009 09:57:48 +0200
+ [ 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.
Modified: trunk/webgen0.5/debian/control
===================================================================
--- trunk/webgen0.5/debian/control 2010-03-23 22:48:17 UTC (rev 5001)
+++ trunk/webgen0.5/debian/control 2010-03-23 23:39:23 UTC (rev 5002)
@@ -3,17 +3,17 @@
Priority: optional
Maintainer: Arnaud Cornet <acornet at debian.org>
Uploaders: Marc Dequènes (Duck) <Duck at DuckCorp.org>, Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Build-Depends: cdbs (>= 0.4.27), debhelper (>= 7.0.1), quilt, patchutils (>= 0.2.25), ruby, ruby-pkg-tools (>= 0.6), libcmdparse2-ruby, libmaruku-ruby, libfacets-ruby
+Build-Depends: cdbs (>= 0.4.27), debhelper (>= 7.0.1), ruby, ruby-pkg-tools (>= 0.6), libcmdparse2-ruby, libmaruku-ruby
Build-Depends-Indep: rdoc (>= 1.8.1), graphviz
-Build-Conflicts: libxml2-utils, webgen (< 0.4), webgen0.4
+Build-Conflicts: libxml2-utils, webgen (<< 0.4), webgen0.4
Vcs-Svn: svn://svn.debian.org/svn/pkg-ruby-extras/trunk/webgen0.5/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-ruby-extras/trunk/webgen0.5/
-Standards-Version: 3.8.2
+Standards-Version: 3.8.4
Homepage: http://webgen.rubyforge.org/
Package: webgen0.5
Architecture: all
-Depends: ${misc:Depends}, ruby, libcmdparse2-ruby, libfacets-ruby, libmaruku-ruby, libjs-jquery
+Depends: ${misc:Depends}, ruby, libcmdparse2-ruby, libmaruku-ruby, libjs-jquery
Recommends: libredcloth-ruby | libbluecloth-ruby, librmagick-ruby
Suggests: webgen0.5-doc, doc-base, libexif-ruby, libbuilder-ruby, rdoc, rake, libhaml-ruby, libbuilder-ruby, liberubis-ruby
Conflicts: webgen, webgen0.4
Deleted: trunk/webgen0.5/debian/patches/bin_header.diff
===================================================================
--- trunk/webgen0.5/debian/patches/bin_header.diff 2010-03-23 22:48:17 UTC (rev 5001)
+++ trunk/webgen0.5/debian/patches/bin_header.diff 2010-03-23 23:39:23 UTC (rev 5002)
@@ -1,10 +0,0 @@
-Index: webgen0.5-0.5.8/bin/webgen
-===================================================================
---- webgen0.5-0.5.8.orig/bin/webgen 2009-06-27 22:13:48.000000000 +0200
-+++ webgen0.5-0.5.8/bin/webgen 2009-06-27 22:13:58.000000000 +0200
-@@ -1,5 +1,3 @@
--# -*- encoding: utf-8 -*-
--
- #!/usr/bin/env ruby
-
- require 'webgen/cli'
Added: trunk/webgen0.5/debian/patches/default_style_dfsg
===================================================================
--- trunk/webgen0.5/debian/patches/default_style_dfsg (rev 0)
+++ trunk/webgen0.5/debian/patches/default_style_dfsg 2010-03-23 23:39:23 UTC (rev 5002)
@@ -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
Modified: trunk/webgen0.5/debian/patches/series
===================================================================
--- trunk/webgen0.5/debian/patches/series 2010-03-23 22:48:17 UTC (rev 5001)
+++ trunk/webgen0.5/debian/patches/series 2010-03-23 23:39:23 UTC (rev 5002)
@@ -1,3 +1,3 @@
cmdparse2.diff
-bin_header.diff
disable_webgui.diff
+default_style_dfsg
Modified: trunk/webgen0.5/debian/rules
===================================================================
--- trunk/webgen0.5/debian/rules 2010-03-23 22:48:17 UTC (rev 5001)
+++ trunk/webgen0.5/debian/rules 2010-03-23 23:39:23 UTC (rev 5002)
@@ -1,6 +1,5 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/ruby-pkg-tools/1/class/ruby-common.mk
DEB_RUBY_SIMPLE_PACKAGES=webgen0.5
Added: trunk/webgen0.5/debian/source/format
===================================================================
--- trunk/webgen0.5/debian/source/format (rev 0)
+++ trunk/webgen0.5/debian/source/format 2010-03-23 23:39:23 UTC (rev 5002)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the Pkg-ruby-extras-commits
mailing list