On Thu, Jul 12, 2012 at 12:42:22AM +0200, Cyril Brulebois wrote: > Last upload long ago doesn't mean you get to rewrite the packaging > during freeze, that's really not appreciated. > > Reminder: > http://release.debian.org/wheezy/freeze_policy.html
OK. Thank you. I've attached a debdiff that fixes #676104 without extraneous changes. Does that look acceptable? > > diff -Nru liblastfm-0.4.0~git20090710/debian/changelog > > liblastfm-0.4.0~git20090710/debian/changelog > > --- liblastfm-0.4.0~git20090710/debian/changelog 2012-07-05 > > 15:30:33.000000000 -0700 > > +++ liblastfm-0.4.0~git20090710/debian/changelog 2012-07-03 > > 15:57:50.000000000 -0700 > > @@ -1,3 +1,16 @@ > > +liblastfm (0.4.0~git20090710-2) unstable; urgency=medium > > + > > + * Fix compilation with ruby >= 1.9.2 (Closes: #676104) > > 1.9.2 really? Yes. Starting with version 1.9.2 ruby no longer includes '.' in its $LOAD_PATH. But that version of ruby is in ruby1.9.1. I tried to clarify that in the attached debdiff. > > + * Use source format 3.0 (quilt) > > Again, really not a good time. Until now, I haven't needed to patch the source. Using source format 3.0 (quilt) seems better than modifying the Build-Depends and debian/rules. Or would the latter still be preferable? John
diff -Nru liblastfm-0.4.0~git20090710/debian/changelog liblastfm-0.4.0~git20090710/debian/changelog --- liblastfm-0.4.0~git20090710/debian/changelog 2012-07-11 17:50:05.000000000 -0700 +++ liblastfm-0.4.0~git20090710/debian/changelog 2012-07-11 17:39:31.000000000 -0700 @@ -1,3 +1,10 @@ +liblastfm (0.4.0~git20090710-2) UNRELEASED; urgency=medium + + * Fix compilation with ruby1.9.1 >= 1.9.2 (Closes: #676104) + * Use source format 3.0 (quilt) + + -- John Stamp <jst...@users.sourceforge.net> Wed, 11 Jul 2012 16:47:54 -0700 + liblastfm (0.4.0~git20090710-1) unstable; urgency=low * New upstream release from git snapshot. diff -Nru liblastfm-0.4.0~git20090710/debian/patches/fix-build-with-ruby-1.9.patch liblastfm-0.4.0~git20090710/debian/patches/fix-build-with-ruby-1.9.patch --- liblastfm-0.4.0~git20090710/debian/patches/fix-build-with-ruby-1.9.patch 1969-12-31 16:00:00.000000000 -0800 +++ liblastfm-0.4.0~git20090710/debian/patches/fix-build-with-ruby-1.9.patch 2012-07-11 16:47:01.000000000 -0700 @@ -0,0 +1,28 @@ +Description: Fixes builds agains ruby >= 1.9.2 + Ruby 1.9.2 no longer includes the current directory in the LOAD_PATH + so we'll just use absolute paths instead. +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=676104 +Author: John Stamp <jst...@users.sourceforge.net> +Last-Update: 2012-06-06 +--- a/admin/Makefile.rb ++++ b/admin/Makefile.rb +@@ -6,7 +6,7 @@ + + cwd = File.dirname( __FILE__ ) + require 'find' +-require "#{cwd}/platform.rb" ++require File.expand_path(File.join(File.dirname(__FILE__), 'platform.rb')) + + + ######################################################################### defs +--- a/admin/qpp ++++ b/admin/qpp +@@ -4,7 +4,7 @@ + + cwd=File.dirname __FILE__ + require 'find' +-require "#{cwd}/findsrc" ++require File.expand_path(File.join(File.dirname(__FILE__), 'findsrc.rb')) + + sources = Array.new + headers = Array.new diff -Nru liblastfm-0.4.0~git20090710/debian/patches/series liblastfm-0.4.0~git20090710/debian/patches/series --- liblastfm-0.4.0~git20090710/debian/patches/series 1969-12-31 16:00:00.000000000 -0800 +++ liblastfm-0.4.0~git20090710/debian/patches/series 2012-07-11 16:47:01.000000000 -0700 @@ -0,0 +1 @@ +fix-build-with-ruby-1.9.patch diff -Nru liblastfm-0.4.0~git20090710/debian/source/format liblastfm-0.4.0~git20090710/debian/source/format --- liblastfm-0.4.0~git20090710/debian/source/format 1969-12-31 16:00:00.000000000 -0800 +++ liblastfm-0.4.0~git20090710/debian/source/format 2012-07-11 17:39:31.000000000 -0700 @@ -0,0 +1 @@ +3.0 (quilt)
