[Pkg-ruby-extras-maintainers] r409 - in tools/ruby-pkg-tools/trunk: bin debian

[Lucas Nussbaum]

Author: lucas-guest
Date: 2006-03-23 10:06:20 +0000 (Thu, 23 Mar 2006)
New Revision: 409

Modified:
   tools/ruby-pkg-tools/trunk/bin/pkg-ruby-get-sources
   tools/ruby-pkg-tools/trunk/debian/changelog
   tools/ruby-pkg-tools/trunk/debian/control
   tools/ruby-pkg-tools/trunk/debian/control.in
Log:
Added the uscan --dehs strategy to pkg-ruby-get-sources

Modified: tools/ruby-pkg-tools/trunk/bin/pkg-ruby-get-sources
===================================================================
--- tools/ruby-pkg-tools/trunk/bin/pkg-ruby-get-sources	2006-03-23 10:02:16 UTC (rev 408)
+++ tools/ruby-pkg-tools/trunk/bin/pkg-ruby-get-sources	2006-03-23 10:06:20 UTC (rev 409)
@@ -25,6 +25,7 @@
 require 'yaml'
 require 'getoptlong'
 require 'open-uri'
+require 'rexml/document'
 
 $sources_file = "/usr/share/ruby-pkg-tools/pkg-ruby-extras.sources"
 $sources_url = "http://pkg-ruby-extras.alioth.debian.org/pkg-ruby-extras.sources"
@@ -263,6 +264,29 @@
   puts "I: No watch file for this package." if $verbose
 end
 
+# Now try to use the output of uscan --dehs to get a source tarball URL
+if File::exist?('debian/watch')
+  begin
+    puts "I: Running uscan --dehs and parsing the output ..." if $verbose
+    i = IO::popen('uscan --dehs')
+    d = REXML::Document::new(i.read)
+    i.close
+    v = d.elements['/dehs/upstream-version'].text
+    if v == version
+      tarball = d.elements['/dehs/upstream-url'].text
+      puts "I: Found source tarball for package #{package}-#{version}: #{tarball}" if $verbose
+      if download(package,version,tarball) then
+        exit 0
+      end
+    else
+      puts "I: uscan --dehs only gave us a tarball for v. #{v}, while we were looking for #{version}." if $verbose
+    end
+  rescue
+    puts "I: The uscan --dehs strategy failed." if $verbose
+  end
+end
+  
+# Try to get the source URL from a sources file
 [ $sources_file, $sources_url ].each { |file|
   sources = get_available_sources(file)
   if (sources) then

Modified: tools/ruby-pkg-tools/trunk/debian/changelog
===================================================================
--- tools/ruby-pkg-tools/trunk/debian/changelog	2006-03-23 10:02:16 UTC (rev 408)
+++ tools/ruby-pkg-tools/trunk/debian/changelog	2006-03-23 10:06:20 UTC (rev 409)
@@ -7,8 +7,12 @@
   * Set the Maintainer field back to me.  I will be mainly responsible for
     this package.
 
- -- Paul van Tilburg <paulvt at debian.org>  Thu, 23 Mar 2006 07:58:51 +0100
+  [ Lucas Nussbaum ]
+  * Added another strategy for fetching the upstream tarball: running
+    uscan --dehs and parsing the output.
 
+ -- Lucas Nussbaum <lucas at lucas-nussbaum.net>  Thu, 23 Mar 2006 11:04:51 +0100
+
 ruby-pkg-tools (0.8) unstable; urgency=low
 
   [ Paul van Tilburg ]

Modified: tools/ruby-pkg-tools/trunk/debian/control
===================================================================
--- tools/ruby-pkg-tools/trunk/debian/control	2006-03-23 10:02:16 UTC (rev 408)
+++ tools/ruby-pkg-tools/trunk/debian/control	2006-03-23 10:06:20 UTC (rev 409)
@@ -1,15 +1,15 @@
 Source: ruby-pkg-tools
 Section: devel
 Priority: optional
-Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Uploaders: Antonio S. de A. Terceiro <asaterceiro at inf.ufrgs.br>, David Moreno Garza <damog at debian.org>, David Nusinow <dnusinow at debian.org>, Paul van Tilburg <paulvt at debian.org>, Esteban Manchado Velázquez <zoso at debian.org>, Arnaud Cornet <arnaud.cornet at gmail.com>, Lucas Nussbaum <lucas at lucas-nussbaum.net>, Thierry Reding <thierry at doppeltgemoppelt.de>, Marc Dequènes (Duck) <Duck at DuckCorp.org>, Ari Pollak <ari at debian.org>
+Maintainer: Paul van Tilburg <paulvt at debian.org>
+Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>, Antonio S. de A. Terceiro <asaterceiro at inf.ufrgs.br>, David Moreno Garza <damog at debian.org>, David Nusinow <dnusinow at debian.org>, Esteban Manchado Velázquez <zoso at debian.org>, Arnaud Cornet <arnaud.cornet at gmail.com>, Lucas Nussbaum <lucas at lucas-nussbaum.net>, Thierry Reding <thierry at doppeltgemoppelt.de>, Marc Dequènes (Duck) <Duck at DuckCorp.org>, Ari Pollak <ari at debian.org>
 Build-Depends-Indep: cdbs, debhelper (>= 4.1)
 Standards-Version: 3.6.2
 
 Package: ruby-pkg-tools
 Architecture: all
 Depends: ruby
-Recommends: svn-buildpackage
+Recommends: svn-buildpackage, devscripts, libwww-perl
 Description: Tools for building Debian Ruby packages
  This package contains some useful tools for building Debian Ruby packages
  and is used by the Debian Ruby Maintainers Team. It includes:

Modified: tools/ruby-pkg-tools/trunk/debian/control.in
===================================================================
--- tools/ruby-pkg-tools/trunk/debian/control.in	2006-03-23 10:02:16 UTC (rev 408)
+++ tools/ruby-pkg-tools/trunk/debian/control.in	2006-03-23 10:06:20 UTC (rev 409)
@@ -9,7 +9,7 @@
 Package: ruby-pkg-tools
 Architecture: all
 Depends: ruby
-Recommends: svn-buildpackage
+Recommends: svn-buildpackage, devscripts, libwww-perl
 Description: Tools for building Debian Ruby packages
  This package contains some useful tools for building Debian Ruby packages
  and is used by the Debian Ruby Maintainers Team. It includes: