[Pkg-ruby-extras-maintainers] r782 - in
packages/hobix/trunk/debian: . patches
Paul van Tilburg
paulvt at costa.debian.org
Fri Aug 11 21:17:50 UTC 2006
Author: paulvt
Date: 2006-08-11 21:17:50 +0000 (Fri, 11 Aug 2006)
New Revision: 782
Added:
packages/hobix/trunk/debian/patches/01_disable-upgrade.diff
packages/hobix/trunk/debian/patches/02_fix-porter-stemmer.diff
packages/hobix/trunk/debian/patches/03_rm-rubygems-from-rakefile.diff
Removed:
packages/hobix/trunk/debian/patches/02_fix_porter_stemmer.diff
Modified:
packages/hobix/trunk/debian/changelog
packages/hobix/trunk/debian/control
packages/hobix/trunk/debian/control.in
Log:
* Added patch to remove all the rubygems stuff from the Rakefile
(not needed and introduces an unnecessary build-depend on rubygems).
* Updated the patch that disables the upgrade command.
* Added missing build-depend on rake.
Modified: packages/hobix/trunk/debian/changelog
===================================================================
--- packages/hobix/trunk/debian/changelog 2006-08-11 20:44:14 UTC (rev 781)
+++ packages/hobix/trunk/debian/changelog 2006-08-11 21:17:50 UTC (rev 782)
@@ -11,12 +11,15 @@
* Enabled the generation of RDoc documentation generation via upstream
provided Rakefile (in debian/rules) and also included it in the
package (debian/docs).
- * Added build-depend-indep on rdoc.
+ * Added build-depend-indep on rdoc and rake.
* Put the package under team control, add uploaders.mk to debian/rules
and introduce debian/control.in with uploaders set to
@RUBY_EXTRAS_TEAM at .
+ * Updated the patch to disable self-upgrading by hobix (01_disable-upgrade.diff).
+ * Added a patch to disable rubygems requirement in the Rakefile
+ (03_rm-rubygems-from-rakefill.diff).
- -- Paul van Tilburg <paulvt at debian.org> Fri, 11 Aug 2006 22:37:26 +0200
+ -- Paul van Tilburg <paulvt at debian.org> Fri, 11 Aug 2006 23:16:44 +0200
hobix (0.3e+cvs20051115-1) luon-experimental; urgency=low
Modified: packages/hobix/trunk/debian/control
===================================================================
--- packages/hobix/trunk/debian/control 2006-08-11 20:44:14 UTC (rev 781)
+++ packages/hobix/trunk/debian/control 2006-08-11 21:17:50 UTC (rev 782)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Paul van Tilburg <paulvt at debian.org>
Build-Depends: debhelper (>= 5), cdbs
-Build-Depends-Indep: ruby-pkg-tools (> 0.3), patchutils, ruby, rdoc
+Build-Depends-Indep: ruby-pkg-tools (> 0.3), patchutils, ruby, rdoc, rake
Standards-Version: 3.7.2
Package: hobix
Modified: packages/hobix/trunk/debian/control.in
===================================================================
--- packages/hobix/trunk/debian/control.in 2006-08-11 20:44:14 UTC (rev 781)
+++ packages/hobix/trunk/debian/control.in 2006-08-11 21:17:50 UTC (rev 782)
@@ -4,7 +4,7 @@
Maintainer: Paul van Tilburg <paulvt at debian.org>
Uploaders: @RUBY_EXTRAS_TEAM@
Build-Depends: debhelper (>= 5), cdbs
-Build-Depends-Indep: ruby-pkg-tools (> 0.3), patchutils, ruby, rdoc
+Build-Depends-Indep: ruby-pkg-tools (> 0.3), patchutils, ruby, rdoc, rake
Standards-Version: 3.7.2
Package: hobix
Added: packages/hobix/trunk/debian/patches/01_disable-upgrade.diff
===================================================================
--- packages/hobix/trunk/debian/patches/01_disable-upgrade.diff 2006-08-11 20:44:14 UTC (rev 781)
+++ packages/hobix/trunk/debian/patches/01_disable-upgrade.diff 2006-08-11 21:17:50 UTC (rev 782)
@@ -0,0 +1,26 @@
+diff -Nabur hobix-0.4+cvs20060808.orig/lib/hobix/commandline.rb hobix-0.4+cvs20060808/lib/hobix/commandline.rb
+--- hobix-0.4+cvs20060808.orig/lib/hobix/commandline.rb 2006-06-09 00:09:49.000000000 +0200
++++ hobix-0.4+cvs20060808/lib/hobix/commandline.rb 2006-08-11 22:58:59.000000000 +0200
+@@ -102,14 +102,16 @@
+ end
+
+ # Update your Hobix setup
+- def upgrade_app_explain; "Check for updates to Hobix."; end
++ def upgrade_app_explain; "Check for updates to Hobix [partially disabled in Debian]."; end
+ def upgrade_app_args; []; end
+ def upgrade_app( config )
+- require 'rbconfig'
+- require 'open-uri'
+- c = ::Config::CONFIG.merge( config )
+- eval(open("http://go.hobix.com/").read)
+-
++ #require 'rbconfig'
++ #require 'open-uri'
++ #c = ::Config::CONFIG.merge( config )
++ #eval(open("http://go.hobix.com/").read)
++ puts "** Retrieving a new Hobix version is disabled in Debian, " +
++ "please update via apt/dpkg!"
++ puts "Only performing administrative upgrade task (if any)..."
+
+ # Now look at all blogs and delete entries/index.{hobix,search}
+ if @config['weblogs'].respond_to? :sort
Added: packages/hobix/trunk/debian/patches/02_fix-porter-stemmer.diff
===================================================================
--- packages/hobix/trunk/debian/patches/02_fix-porter-stemmer.diff 2006-08-11 20:44:14 UTC (rev 781)
+++ packages/hobix/trunk/debian/patches/02_fix-porter-stemmer.diff 2006-08-11 21:17:50 UTC (rev 782)
@@ -0,0 +1,16 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## hobix-porter-stemmer.patch.dpatch by <paulvt at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: -p
+
+--- lib/hobix/search/porter_stemmer.rb 14 Jul 2005 04:40:21 -0000 1.2
++++ lib/hobix/search/porter_stemmer.rb 26 Oct 2005 12:39:53 -0000
+@@ -1,7 +1,3 @@
+-#! /local/ruby/bin/ruby
+-#
+-# $Id: porter_stemmer.rb 96 2005-07-14 04:40:21Z why $
+-#
+ # Lifted from SimpleSearch by Chad Fowler / Dave Thomas / Allen Condit / perhaps other unseeable folks in the distance ...
+ #
+ # See example usage at the end of this file.
Deleted: packages/hobix/trunk/debian/patches/02_fix_porter_stemmer.diff
===================================================================
--- packages/hobix/trunk/debian/patches/02_fix_porter_stemmer.diff 2006-08-11 20:44:14 UTC (rev 781)
+++ packages/hobix/trunk/debian/patches/02_fix_porter_stemmer.diff 2006-08-11 21:17:50 UTC (rev 782)
@@ -1,16 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## hobix-porter-stemmer.patch.dpatch by <paulvt at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: -p
-
---- lib/hobix/search/porter_stemmer.rb 14 Jul 2005 04:40:21 -0000 1.2
-+++ lib/hobix/search/porter_stemmer.rb 26 Oct 2005 12:39:53 -0000
-@@ -1,7 +1,3 @@
--#! /local/ruby/bin/ruby
--#
--# $Id: porter_stemmer.rb 96 2005-07-14 04:40:21Z why $
--#
- # Lifted from SimpleSearch by Chad Fowler / Dave Thomas / Allen Condit / perhaps other unseeable folks in the distance ...
- #
- # See example usage at the end of this file.
Added: packages/hobix/trunk/debian/patches/03_rm-rubygems-from-rakefile.diff
===================================================================
--- packages/hobix/trunk/debian/patches/03_rm-rubygems-from-rakefile.diff 2006-08-11 20:44:14 UTC (rev 781)
+++ packages/hobix/trunk/debian/patches/03_rm-rubygems-from-rakefile.diff 2006-08-11 21:17:50 UTC (rev 782)
@@ -0,0 +1,57 @@
+diff -Nabur hobix-0.4+cvs20060808.orig/Rakefile hobix-0.4+cvs20060808/Rakefile
+--- hobix-0.4+cvs20060808.orig/Rakefile 2006-08-11 23:09:10.000000000 +0200
++++ hobix-0.4+cvs20060808/Rakefile 2006-08-11 23:10:21.000000000 +0200
+@@ -1,6 +1,5 @@
+ require 'rake'
+ require 'rake/clean'
+-require 'rake/gempackagetask'
+ require 'rake/rdoctask'
+ require 'fileutils'
+ include FileUtils
+@@ -35,46 +34,3 @@
+ # cp "extras/permalink.gif", "doc/rdoc/"
+ sh %{scp -r doc/rdoc/* #{ENV['USER']}@rubyforge.org:/var/www/gforge-projects/hobix/}
+ end
+-
+-spec =
+- Gem::Specification.new do |s|
+- s.name = NAME
+- s.version = VERS
+- s.platform = Gem::Platform::RUBY
+- s.has_rdoc = true
+- s.extra_rdoc_files = ["README", "doc/CHANGELOG", "COPYING"]
+- s.rdoc_options += RDOC_OPTS + ['--exclude', '^(contrib)\/']
+- s.summary = "the white pantsuit of weblahhing"
+- s.description = s.summary
+- s.author = "why the lucky stiff"
+- s.email = 'why at ruby-lang.org'
+- s.homepage = 'http://hobix.com'
+- s.executables = ['hobix']
+-
+- s.add_dependency('RedCloth')
+- s.required_ruby_version = '>= 1.8.2'
+-
+- s.files = %w(COPYING README Rakefile) +
+- Dir.glob("{bin,doc,test,share,lib,contrib}/**/*") +
+- Dir.glob("ext/**/*.{h,c,rb}") +
+- Dir.glob("examples/**/*.rb")
+-
+- s.require_path = "lib"
+- # s.extensions = FileList["ext/**/extconf.rb"].to_a
+- s.bindir = "bin"
+- end
+-
+-Rake::GemPackageTask.new(spec) do |p|
+- p.need_tar = true
+- p.need_zip = true
+- p.gem_spec = spec
+-end
+-
+-task :install do
+- sh %{rake gem}
+- sh %{sudo gem install pkg/#{NAME}-#{VERS}}
+-end
+-
+-task :uninstall => [:clean] do
+- sh %{sudo gem uninstall #{NAME}}
+-end
More information about the pkg-ruby-extras-maintainers
mailing list