[DRE-commits] r5040 - in trunk/libdifflcs-ruby/debian: . patches source

Tue Apr 6 18:36:26 UTC 2010

Author: tiber-guest
Date: 2010-04-06 18:36:22 +0000 (Tue, 06 Apr 2010)
New Revision: 5040

Added:
   trunk/libdifflcs-ruby/debian/patches/10_shebangs.patch
   trunk/libdifflcs-ruby/debian/patches/series
   trunk/libdifflcs-ruby/debian/source/
   trunk/libdifflcs-ruby/debian/source/format
Removed:
   trunk/libdifflcs-ruby/debian/libdifflcs-ruby1.8.dirs
   trunk/libdifflcs-ruby/debian/libdifflcs-ruby1.9.debhelper.log
   trunk/libdifflcs-ruby/debian/libdifflcs-ruby1.9.substvars
   trunk/libdifflcs-ruby/debian/patches/00list
   trunk/libdifflcs-ruby/debian/patches/10_shebangs.dpatch
   trunk/libdifflcs-ruby/debian/source.lintian-overrides
Modified:
   trunk/libdifflcs-ruby/debian/changelog
   trunk/libdifflcs-ruby/debian/control
   trunk/libdifflcs-ruby/debian/rules
Log:
* Dropped shebang replacement for /usr/bin from 10_shebangs.dpatch -
  libsetup-ruby will take care
* Renamed /usr/bin/*1.9 -> *1.9.1 (Closes: #570434)
* Backup and restore scripts with shebang line to work around #571981 in
  libsetup-ruby
* Switched to source format 3.0 (quilt)
* Updated package description

Modified: trunk/libdifflcs-ruby/debian/changelog
===================================================================

--- trunk/libdifflcs-ruby/debian/changelog	2010-04-05 23:36:03 UTC (rev 5039)
+++ trunk/libdifflcs-ruby/debian/changelog	2010-04-06 18:36:22 UTC (rev 5040)
@@ -1,3 +1,15 @@
+libdifflcs-ruby (1.1.2-5) unstable; urgency=low
+
+  * Dropped shebang replacement for /usr/bin from 10_shebangs.dpatch -
+    libsetup-ruby will take care
+  * Renamed /usr/bin/*1.9 -> *1.9.1 (Closes: #570434)
+  * Backup and restore scripts with shebang line to work around #571981 in
+    libsetup-ruby
+  * Switched to source format 3.0 (quilt)
+  * Updated package description
+
+ -- Tobias Grimm <etobi at debian.org>  Tue, 06 Apr 2010 19:43:50 +0200
+
 libdifflcs-ruby (1.1.2-4) unstable; urgency=low
 
   * Move from ruby1.9 to ruby1.9.1 (Closes: #569887).

Modified: trunk/libdifflcs-ruby/debian/control
===================================================================
--- trunk/libdifflcs-ruby/debian/control	2010-04-05 23:36:03 UTC (rev 5039)
+++ trunk/libdifflcs-ruby/debian/control	2010-04-06 18:36:22 UTC (rev 5040)
@@ -2,7 +2,7 @@
 Section: ruby
 Priority: optional
 Maintainer: Tobias Grimm <etobi at debian.org>
-Build-Depends: debhelper (>> 6.0.0), ruby-pkg-tools (>= 0.17), cdbs, libsetup-ruby1.8, dpatch
+Build-Depends: debhelper (>> 6.0.0), ruby-pkg-tools (>= 0.17), cdbs, libsetup-ruby1.8
 Build-Depends-Indep: ruby1.8, ruby1.9.1
 Standards-Version: 3.8.4
 Homepage: http://raa.ruby-lang.org/project/diff-lcs
@@ -27,7 +27,7 @@
  differences between two sequenced enumerable containers. The
  implementation is based on Mario I. Wolczko's Smalltalk version
  .
- This is the package for ruby 1.9.
+ This is the package for ruby 1.9.1.
 
 Package: libdifflcs-ruby
 Architecture: all
@@ -38,5 +38,5 @@
  differences between two sequenced enumerable containers. The
  implementation is based on Mario I. Wolczko's Smalltalk version
  .
- This package provide documentation and depends on the package 
- containing the actual library for the default Ruby version.
+ This is a dependency package, which depends on a libdifflcs package
+ built for the default Ruby version.

Deleted: trunk/libdifflcs-ruby/debian/libdifflcs-ruby1.8.dirs
===================================================================
--- trunk/libdifflcs-ruby/debian/libdifflcs-ruby1.8.dirs	2010-04-05 23:36:03 UTC (rev 5039)
+++ trunk/libdifflcs-ruby/debian/libdifflcs-ruby1.8.dirs	2010-04-06 18:36:22 UTC (rev 5040)
@@ -1,2 +0,0 @@
-usr/lib/ruby/1.8
-usr/bin

Deleted: trunk/libdifflcs-ruby/debian/libdifflcs-ruby1.9.debhelper.log
===================================================================
--- trunk/libdifflcs-ruby/debian/libdifflcs-ruby1.9.debhelper.log	2010-04-05 23:36:03 UTC (rev 5039)
+++ trunk/libdifflcs-ruby/debian/libdifflcs-ruby1.9.debhelper.log	2010-04-06 18:36:22 UTC (rev 5040)
@@ -1,31 +0,0 @@
-dh_installdirs
-dh_installdirs
-dh_installdocs
-dh_installexamples
-dh_installman
-dh_installinfo
-dh_installmenu
-dh_installcron
-dh_installinit
-dh_installdebconf
-dh_installemacsen
-dh_installcatalogs
-dh_installpam
-dh_installlogrotate
-dh_installlogcheck
-dh_installchangelogs
-dh_installudev
-dh_lintian
-dh_install
-dh_link
-dh_installmime
-dh_strip
-dh_compress
-dh_fixperms
-dh_makeshlibs
-dh_installdeb
-dh_perl
-dh_shlibdeps
-dh_gencontrol
-dh_md5sums
-dh_builddeb

Deleted: trunk/libdifflcs-ruby/debian/libdifflcs-ruby1.9.substvars
===================================================================
--- trunk/libdifflcs-ruby/debian/libdifflcs-ruby1.9.substvars	2010-04-05 23:36:03 UTC (rev 5039)
+++ trunk/libdifflcs-ruby/debian/libdifflcs-ruby1.9.substvars	2010-04-06 18:36:22 UTC (rev 5040)
@@ -1 +0,0 @@
-misc:Depends=

Deleted: trunk/libdifflcs-ruby/debian/patches/00list
===================================================================
--- trunk/libdifflcs-ruby/debian/patches/00list	2010-04-05 23:36:03 UTC (rev 5039)
+++ trunk/libdifflcs-ruby/debian/patches/00list	2010-04-06 18:36:22 UTC (rev 5040)
@@ -1 +0,0 @@
-10_shebangs.dpatch

Deleted: trunk/libdifflcs-ruby/debian/patches/10_shebangs.dpatch
===================================================================
--- trunk/libdifflcs-ruby/debian/patches/10_shebangs.dpatch	2010-04-05 23:36:03 UTC (rev 5039)
+++ trunk/libdifflcs-ruby/debian/patches/10_shebangs.dpatch	2010-04-06 18:36:22 UTC (rev 5040)
@@ -1,90 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_shebangs.dpatch by Sebastien Delafond <seb at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Various shebang fixes.
-
- at DPATCH@
-diff -urNad diff-lcs-1.1.2~/bin/htmldiff diff-lcs-1.1.2/bin/htmldiff
---- diff-lcs-1.1.2~/bin/htmldiff	2004-10-20 21:00:00.000000000 -0700
-+++ diff-lcs-1.1.2/bin/htmldiff	2008-05-11 10:46:02.000000000 -0700
-@@ -1,4 +1,4 @@
--#!/usr/bin/env ruby
-+#!/usr/bin/ruby1.8
- #--
- # Copyright 2004 Austin Ziegler <diff-lcs at halostatue.ca>
- #   adapted from:
-diff -urNad diff-lcs-1.1.2~/bin/ldiff diff-lcs-1.1.2/bin/ldiff
---- diff-lcs-1.1.2~/bin/ldiff	2004-10-20 21:00:00.000000000 -0700
-+++ diff-lcs-1.1.2/bin/ldiff	2008-05-11 10:46:05.000000000 -0700
-@@ -1,4 +1,4 @@
--#!/usr/bin/env ruby
-+#!/usr/bin/ruby1.8
- #--
- # Copyright 2004 Austin Ziegler <diff-lcs at halostatue.ca>
- #   adapted from:
-diff -urNad diff-lcs-1.1.2~/lib/diff/lcs/array.rb diff-lcs-1.1.2/lib/diff/lcs/array.rb
---- diff-lcs-1.1.2~/lib/diff/lcs/array.rb	2004-10-20 21:00:00.000000000 -0700
-+++ diff-lcs-1.1.2/lib/diff/lcs/array.rb	2008-05-11 10:45:26.000000000 -0700
-@@ -1,4 +1,3 @@
--#! /usr/env/bin ruby
- #--
- # Copyright 2004 Austin Ziegler <diff-lcs at halostatue.ca>
- #   adapted from:
-diff -urNad diff-lcs-1.1.2~/lib/diff/lcs/block.rb diff-lcs-1.1.2/lib/diff/lcs/block.rb
---- diff-lcs-1.1.2~/lib/diff/lcs/block.rb	2004-10-20 21:00:00.000000000 -0700
-+++ diff-lcs-1.1.2/lib/diff/lcs/block.rb	2008-05-11 10:45:29.000000000 -0700
-@@ -1,4 +1,3 @@
--#! /usr/env/bin ruby
- #--
- # Copyright 2004 Austin Ziegler <diff-lcs at halostatue.ca>
- #   adapted from:
-diff -urNad diff-lcs-1.1.2~/lib/diff/lcs/callbacks.rb diff-lcs-1.1.2/lib/diff/lcs/callbacks.rb
---- diff-lcs-1.1.2~/lib/diff/lcs/callbacks.rb	2004-10-20 21:00:00.000000000 -0700
-+++ diff-lcs-1.1.2/lib/diff/lcs/callbacks.rb	2008-05-11 10:45:32.000000000 -0700
-@@ -1,4 +1,3 @@
--#! /usr/env/bin ruby
- #--
- # Copyright 2004 Austin Ziegler <diff-lcs at halostatue.ca>
- #   adapted from:
-diff -urNad diff-lcs-1.1.2~/lib/diff/lcs/change.rb diff-lcs-1.1.2/lib/diff/lcs/change.rb
---- diff-lcs-1.1.2~/lib/diff/lcs/change.rb	2004-10-20 21:00:00.000000000 -0700
-+++ diff-lcs-1.1.2/lib/diff/lcs/change.rb	2008-05-11 10:45:34.000000000 -0700
-@@ -1,4 +1,3 @@
--#! /usr/env/bin ruby
- #--
- # Copyright 2004 Austin Ziegler <diff-lcs at halostatue.ca>
- #   adapted from:
-diff -urNad diff-lcs-1.1.2~/lib/diff/lcs/hunk.rb diff-lcs-1.1.2/lib/diff/lcs/hunk.rb
---- diff-lcs-1.1.2~/lib/diff/lcs/hunk.rb	2004-10-20 21:00:00.000000000 -0700
-+++ diff-lcs-1.1.2/lib/diff/lcs/hunk.rb	2008-05-11 10:45:35.000000000 -0700
-@@ -1,4 +1,3 @@
--#! /usr/env/bin ruby
- #--
- # Copyright 2004 Austin Ziegler <diff-lcs at halostatue.ca>
- #   adapted from:
-diff -urNad diff-lcs-1.1.2~/lib/diff/lcs/ldiff.rb diff-lcs-1.1.2/lib/diff/lcs/ldiff.rb
---- diff-lcs-1.1.2~/lib/diff/lcs/ldiff.rb	2004-10-20 21:00:00.000000000 -0700
-+++ diff-lcs-1.1.2/lib/diff/lcs/ldiff.rb	2008-05-11 10:45:44.000000000 -0700
-@@ -1,5 +1,3 @@
--#!/usr/bin/env ruby
--
- require 'optparse'
- require 'ostruct'
- require 'diff/lcs/hunk'
-diff -urNad diff-lcs-1.1.2~/lib/diff/lcs/string.rb diff-lcs-1.1.2/lib/diff/lcs/string.rb
---- diff-lcs-1.1.2~/lib/diff/lcs/string.rb	2004-10-20 21:00:00.000000000 -0700
-+++ diff-lcs-1.1.2/lib/diff/lcs/string.rb	2008-05-11 10:45:49.000000000 -0700
-@@ -1,4 +1,3 @@
--#! /usr/env/bin ruby
- #--
- # Copyright 2004 Austin Ziegler <diff-lcs at halostatue.ca>
- #   adapted from:
-diff -urNad diff-lcs-1.1.2~/lib/diff/lcs.rb diff-lcs-1.1.2/lib/diff/lcs.rb
---- diff-lcs-1.1.2~/lib/diff/lcs.rb	2004-10-20 21:00:00.000000000 -0700
-+++ diff-lcs-1.1.2/lib/diff/lcs.rb	2008-05-11 10:45:47.000000000 -0700
-@@ -1,4 +1,3 @@
--#! /usr/env/bin ruby
- #--
- # Copyright 2004 Austin Ziegler <diff-lcs at halostatue.ca>
- #   adapted from:

Added: trunk/libdifflcs-ruby/debian/patches/10_shebangs.patch
===================================================================
--- trunk/libdifflcs-ruby/debian/patches/10_shebangs.patch	                        (rev 0)
+++ trunk/libdifflcs-ruby/debian/patches/10_shebangs.patch	2010-04-06 18:36:22 UTC (rev 5040)
@@ -0,0 +1,59 @@
+Author: Sebastien Delafond <seb at debian.org>
+Description: Various shebang fixes.
+--- libdifflcs-ruby-1.1.2.orig/lib/diff/lcs/array.rb
++++ libdifflcs-ruby-1.1.2/lib/diff/lcs/array.rb
+@@ -1,4 +1,3 @@
+-#! /usr/env/bin ruby
+ #--
+ # Copyright 2004 Austin Ziegler <diff-lcs at halostatue.ca>
+ #   adapted from:
+--- libdifflcs-ruby-1.1.2.orig/lib/diff/lcs/block.rb
++++ libdifflcs-ruby-1.1.2/lib/diff/lcs/block.rb
+@@ -1,4 +1,3 @@
+-#! /usr/env/bin ruby
+ #--
+ # Copyright 2004 Austin Ziegler <diff-lcs at halostatue.ca>
+ #   adapted from:
+--- libdifflcs-ruby-1.1.2.orig/lib/diff/lcs/callbacks.rb
++++ libdifflcs-ruby-1.1.2/lib/diff/lcs/callbacks.rb
+@@ -1,4 +1,3 @@
+-#! /usr/env/bin ruby
+ #--
+ # Copyright 2004 Austin Ziegler <diff-lcs at halostatue.ca>
+ #   adapted from:
+--- libdifflcs-ruby-1.1.2.orig/lib/diff/lcs/change.rb
++++ libdifflcs-ruby-1.1.2/lib/diff/lcs/change.rb
+@@ -1,4 +1,3 @@
+-#! /usr/env/bin ruby
+ #--
+ # Copyright 2004 Austin Ziegler <diff-lcs at halostatue.ca>
+ #   adapted from:
+--- libdifflcs-ruby-1.1.2.orig/lib/diff/lcs/hunk.rb
++++ libdifflcs-ruby-1.1.2/lib/diff/lcs/hunk.rb
+@@ -1,4 +1,3 @@
+-#! /usr/env/bin ruby
+ #--
+ # Copyright 2004 Austin Ziegler <diff-lcs at halostatue.ca>
+ #   adapted from:
+--- libdifflcs-ruby-1.1.2.orig/lib/diff/lcs/ldiff.rb
++++ libdifflcs-ruby-1.1.2/lib/diff/lcs/ldiff.rb
+@@ -1,5 +1,3 @@
+-#!/usr/bin/env ruby
+-
+ require 'optparse'
+ require 'ostruct'
+ require 'diff/lcs/hunk'
+--- libdifflcs-ruby-1.1.2.orig/lib/diff/lcs/string.rb
++++ libdifflcs-ruby-1.1.2/lib/diff/lcs/string.rb
+@@ -1,4 +1,3 @@
+-#! /usr/env/bin ruby
+ #--
+ # Copyright 2004 Austin Ziegler <diff-lcs at halostatue.ca>
+ #   adapted from:
+--- libdifflcs-ruby-1.1.2.orig/lib/diff/lcs.rb
++++ libdifflcs-ruby-1.1.2/lib/diff/lcs.rb
+@@ -1,4 +1,3 @@
+-#! /usr/env/bin ruby
+ #--
+ # Copyright 2004 Austin Ziegler <diff-lcs at halostatue.ca>
+ #   adapted from:

Added: trunk/libdifflcs-ruby/debian/patches/series
===================================================================
--- trunk/libdifflcs-ruby/debian/patches/series	                        (rev 0)
+++ trunk/libdifflcs-ruby/debian/patches/series	2010-04-06 18:36:22 UTC (rev 5040)
@@ -0,0 +1 @@
+10_shebangs.patch

Modified: trunk/libdifflcs-ruby/debian/rules
===================================================================
--- trunk/libdifflcs-ruby/debian/rules	2010-04-05 23:36:03 UTC (rev 5039)
+++ trunk/libdifflcs-ruby/debian/rules	2010-04-06 18:36:22 UTC (rev 5040)
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/dpatch.mk
+#include /usr/share/cdbs/1/rules/dpatch.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/ruby-pkg-tools/1/class/ruby-setup-rb.mk
 
@@ -10,6 +10,14 @@
 	ruby1.8 tests/00test.rb
 
 binary-post-install/libdifflcs-ruby1.9.1::
-	mv debian/libdifflcs-ruby1.9.1/usr/bin/htmldiff debian/libdifflcs-ruby1.9.1/usr/bin/htmldiff1.9
-	mv debian/libdifflcs-ruby1.9.1/usr/bin/ldiff debian/libdifflcs-ruby1.9.1/usr/bin/ldiff1.9
-	ruby1.9.1 tests/00test.rb
\ No newline at end of file
+	mv debian/libdifflcs-ruby1.9.1/usr/bin/htmldiff debian/libdifflcs-ruby1.9.1/usr/bin/htmldiff1.9.1
+	mv debian/libdifflcs-ruby1.9.1/usr/bin/ldiff debian/libdifflcs-ruby1.9.1/usr/bin/ldiff1.9.1
+	ruby1.9.1 tests/00test.rb
+
+makebuilddir::
+	[ -e htmldiff.backup ] || cp bin/htmldiff htmldiff.backup
+	[ -e ldiff.backup ] || cp bin/ldiff ldiff.backup
+
+clean::
+	-mv htmldiff.backup bin/htmldiff
+	-mv ldiff.backup bin/ldiff

Added: trunk/libdifflcs-ruby/debian/source/format
===================================================================
--- trunk/libdifflcs-ruby/debian/source/format	                        (rev 0)
+++ trunk/libdifflcs-ruby/debian/source/format	2010-04-06 18:36:22 UTC (rev 5040)
@@ -0,0 +1 @@
+3.0 (quilt)

Deleted: trunk/libdifflcs-ruby/debian/source.lintian-overrides
===================================================================
--- trunk/libdifflcs-ruby/debian/source.lintian-overrides	2010-04-05 23:36:03 UTC (rev 5039)
+++ trunk/libdifflcs-ruby/debian/source.lintian-overrides	2010-04-06 18:36:22 UTC (rev 5040)
@@ -1,2 +0,0 @@
-# libsetup-ruby1.8 is needed to clean
-#libdifflcs-ruby source: build-depends-without-arch-dep libsetup-ruby1.8


