[DRE-commits] [SCM] gem2deb.git branch, master, updated. 69527a952f75392364d8d9c04cb367b55f061f7a

[Lucas Nussbaum]

The following commit has been merged in the master branch:
commit 69527a952f75392364d8d9c04cb367b55f061f7a
Merge: 4abb098ec818b5d2359805c58536ef140d1e4e5a 5f05789460e2e50d5e9b5050e6e4e9e11b86f45b
Author: Lucas Nussbaum <lucas at lucas-nussbaum.net>
Date:   Mon Mar 14 11:38:09 2011 +0100

    Merge remote branch 'spk/rebuild-fix'

diff --combined lib/gem2deb/dh_make_ruby.rb
index f2dd76a,f4a27a9..507c6f0
--- a/lib/gem2deb/dh_make_ruby.rb
+++ b/lib/gem2deb/dh_make_ruby.rb
@@@ -152,14 -152,16 +152,16 @@@ module Gem2De
        if !File.directory?(gem_dirname)
          raise "Extracting did not create #{gem_dirname} directory."
        end
-       if gem_dirname != source_dirname
+       if gem_dirname != source_dirname && !File.exists?(source_dirname)
          FileUtils.mv gem_dirname, source_dirname
        end
      end
  
      def create_debian_boilerplates
        FileUtils.mkdir_p('debian')
-       run "dch --create --empty --fromdirname 'Initial release (Closes: #nnnn)'"
+       unless File.exists?('debian/changelog')
+         run "dch --create --empty --fromdirname 'Initial release (Closes: #nnnn)'"
+       end
        templates.each do |template|
          FileUtils.mkdir_p(template.directory)
          File.open(template.filename, 'w') do |f|
@@@ -378,7 -380,11 +380,11 @@@ Depends: <%= package.dependencies.join(
  # <%= package.gem_dependencies.join(', ') %>
  <% end %>
  Description: <%= short_description ? short_description : 'FIXME' %>
- <%= long_description ? long_description.lines.map { |line| ' ' + (line.strip.empty? ? '.' : line.strip) }.join("\n") + "\n" : ' <insert long description, indented with spaces>' %>
+ <% if long_description %>
+ <%= long_description.lines.map { |line| ' ' + (line.strip.empty? ? '.' : line.strip) }.join("\n") + "\n" %>
+ <% else %>
+ <%= " <insert long description, indented with spaces>\n" %>
+ <% end %>
  <% end %>
  >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> debian/rules
  #!/usr/bin/make -f
@@@ -396,38 -402,6 +402,38 @@@
  7
  >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> debian/copyright
  FIXME. fill-in with DEP5 copyright file. http://dep.debian.net/deps/dep5/
 +Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=173
 +Upstream-Name: <%= gem_name %>
 +Source: FIXME (URL where source can be downloaded)
 +
 +Files: *
 +Copyright: Copyright 1998 John Doe <jdoe at example.com>
 +License: GPL-2+
 + This program is free software; you can redistribute it
 + and/or modify it under the terms of the GNU General Public
 + License as published by the Free Software Foundation; either
 + version 2 of the License, or (at your option) any later
 + version.
 + .
 + This program is distributed in the hope that it will be
 + useful, but WITHOUT ANY WARRANTY; without even the implied
 + warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 + PURPOSE.  See the GNU General Public License for more
 + details.
 + .
 + You should have received a copy of the GNU General Public
 + License along with this package; if not, write to the Free
 + Software Foundation, Inc., 51 Franklin St, Fifth Floor,
 + Boston, MA  02110-1301 USA
 + .
 + On Debian systems, the full text of the GNU General Public
 + License version 2 can be found in the file
 + `/usr/share/common-licenses/GPL-2'.
 +
 +Files: debian/*
 +Copyright: Copyright 1998 Jane Smith <jsmith at example.net>
 +License:
 + [LICENSE TEXT]
  >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> debian/watch
  version=3
  http://pkg-ruby-extras.alioth.debian.org/cgi-bin/gemwatch/<%= gem_name %> .*/<%= gem_name %>-(.*).tar.gz

-- 
gem2deb.git