[DRE-commits] r5673 - in trunk/rbot/debian: . patches

[Marc Dequènes]

Author: duck
Date: 2010-07-11 11:21:12 +0000 (Sun, 11 Jul 2010)
New Revision: 5673

Added:
   trunk/rbot/debian/patches/buildsys_no_rubygems
Modified:
   trunk/rbot/debian/changelog
   trunk/rbot/debian/control
   trunk/rbot/debian/control.in
   trunk/rbot/debian/patches/series
   trunk/rbot/debian/rules
Log:
[fix] previous upload was too hasty...

Modified: trunk/rbot/debian/changelog
===================================================================
--- trunk/rbot/debian/changelog	2010-07-09 22:24:58 UTC (rev 5672)
+++ trunk/rbot/debian/changelog	2010-07-11 11:21:12 UTC (rev 5673)
@@ -1,3 +1,12 @@
+rbot (0.9.15+post20100705+gitb3aa806-2) unstable; urgency=medium
+
+  * Fixed FTBFS and other cleanups (Closes: 588657).
+  * Increased Standards-Version to 3.9.0 (no changes).
+  * Added patch 'buildsys_no_rubygems' to remove useless rubygems build
+    dependency.
+
+ -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Sun, 11 Jul 2010 12:56:38 +0200
+
 rbot (0.9.15+post20100705+gitb3aa806-1) unstable; urgency=medium
 
   * New upstream release (after months of upstream pinging,

Modified: trunk/rbot/debian/control
===================================================================
--- trunk/rbot/debian/control	2010-07-09 22:24:58 UTC (rev 5672)
+++ trunk/rbot/debian/control	2010-07-11 11:21:12 UTC (rev 5673)
@@ -4,9 +4,9 @@
 Maintainer: Marc Dequènes (Duck) <Duck at DuckCorp.org>
 Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Build-Depends: cdbs (>= 0.4.53),
- debhelper (>= 7.0.1), ruby (>= 1.8), ruby-pkg-tools
+ debhelper (>= 7.0.1), ruby (>= 1.8), ruby-pkg-tools, rake, libgettext-ruby1.8
 Build-Depends-Indep: xsltproc, docbook-xml, docbook-xsl
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
 Homepage: http://ruby-rbot.org/
 
 Package: rbot

Modified: trunk/rbot/debian/control.in
===================================================================
--- trunk/rbot/debian/control.in	2010-07-09 22:24:58 UTC (rev 5672)
+++ trunk/rbot/debian/control.in	2010-07-11 11:21:12 UTC (rev 5673)
@@ -3,9 +3,9 @@
 Priority: optional
 Maintainer: Marc Dequènes (Duck) <Duck at DuckCorp.org>
 Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Build-Depends: @cdbs@, ruby (>= 1.8), ruby-pkg-tools
+Build-Depends: @cdbs@, ruby (>= 1.8), ruby-pkg-tools, rake, libgettext-ruby1.8
 Build-Depends-Indep: xsltproc, docbook-xml, docbook-xsl
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
 Homepage: http://ruby-rbot.org/
 
 Package: rbot

Added: trunk/rbot/debian/patches/buildsys_no_rubygems
===================================================================
--- trunk/rbot/debian/patches/buildsys_no_rubygems	                        (rev 0)
+++ trunk/rbot/debian/patches/buildsys_no_rubygems	2010-07-11 11:21:12 UTC (rev 5673)
@@ -0,0 +1,29 @@
+Index: rbot-0.9.15+post20100705+gitb3aa806/Rakefile
+===================================================================
+--- rbot-0.9.15+post20100705+gitb3aa806.orig/Rakefile	2010-07-05 11:56:33.000000000 +0200
++++ rbot-0.9.15+post20100705+gitb3aa806/Rakefile	2010-07-11 13:05:06.000000000 +0200
+@@ -1,5 +1,4 @@
+ require 'rake'
+-require 'rake/gempackagetask'
+ 
+ task :default => [:buildext]
+ 
+@@ -9,18 +8,6 @@
+ 
+ task :manpages => ['man/rbot.1', 'man/rbot-remote.1']
+ 
+-SPECFILE = 'rbot.gemspec'
+-# The Rakefile is also used after installing the gem, to build
+-# the .mo files. Since in this case the SPECFILE is not available,
+-# we must (and can) skip defining the gem packaging tasks.
+-if File.exist? SPECFILE
+-  spec = eval(File.read(SPECFILE), nil, SPECFILE)
+-  Rake::GemPackageTask.new(spec) do |pkg|
+-    pkg.need_zip = true
+-    pkg.need_tar = true
+-  end
+-end
+-
+ # normalize a po/pot file
+ def normalize_po(fn)
+   content = File.read(fn)

Modified: trunk/rbot/debian/patches/series
===================================================================
--- trunk/rbot/debian/patches/series	2010-07-09 22:24:58 UTC (rev 5672)
+++ trunk/rbot/debian/patches/series	2010-07-11 11:21:12 UTC (rev 5673)
@@ -1 +1,2 @@
+buildsys_no_rubygems
 spell_module_use_aspell_not_ispell

Modified: trunk/rbot/debian/rules
===================================================================
--- trunk/rbot/debian/rules	2010-07-09 22:24:58 UTC (rev 5672)
+++ trunk/rbot/debian/rules	2010-07-11 11:21:12 UTC (rev 5673)
@@ -32,4 +32,5 @@
 clean::
 	rm -rf data/locale
 	rm -f man/*.1
+	rm -f lib/rbot/pkgconfig.rb