[DRE-commits] r3395 - in packages-wip/libpacket-ruby/trunk/debian: . patches

[Ryan Niebur]

Author: ryan52-guest
Date: 2009-04-17 04:22:16 +0000 (Fri, 17 Apr 2009)
New Revision: 3395

Added:
   packages-wip/libpacket-ruby/trunk/debian/README.source
   packages-wip/libpacket-ruby/trunk/debian/patches/
   packages-wip/libpacket-ruby/trunk/debian/patches/move-packet_worker_runner
   packages-wip/libpacket-ruby/trunk/debian/patches/series
Removed:
   packages-wip/libpacket-ruby/trunk/debian/libpacket-ruby.links
Modified:
   packages-wip/libpacket-ruby/trunk/debian/control
   packages-wip/libpacket-ruby/trunk/debian/rules
Log:
move packet_worker_runner from /usr/bin/ to DEB_RUBY_LIBDIR/packet/, it's only used internally by packet afaict

Added: packages-wip/libpacket-ruby/trunk/debian/README.source
===================================================================
--- packages-wip/libpacket-ruby/trunk/debian/README.source	                        (rev 0)
+++ packages-wip/libpacket-ruby/trunk/debian/README.source	2009-04-17 04:22:16 UTC (rev 3395)
@@ -0,0 +1,5 @@
+This package uses quilt to manage all modifications to the upstream
+source.  Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+See /usr/share/doc/quilt/README.source for a detailed explanation.

Modified: packages-wip/libpacket-ruby/trunk/debian/control
===================================================================
--- packages-wip/libpacket-ruby/trunk/debian/control	2009-04-16 04:23:21 UTC (rev 3394)
+++ packages-wip/libpacket-ruby/trunk/debian/control	2009-04-17 04:22:16 UTC (rev 3395)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Ryan Niebur <ryanryan52 at gmail.com>
 Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Build-Depends: cdbs, debhelper (>= 5)
+Build-Depends: cdbs, debhelper (>= 5), quilt, patchutils
 Build-Depends-Indep: ruby-pkg-tools (>= 0.8), ruby1.8, ruby1.9
 Standards-Version: 3.8.1
 Homepage: http://rubyforge.org/projects/packet/

Deleted: packages-wip/libpacket-ruby/trunk/debian/libpacket-ruby.links
===================================================================
--- packages-wip/libpacket-ruby/trunk/debian/libpacket-ruby.links	2009-04-16 04:23:21 UTC (rev 3394)
+++ packages-wip/libpacket-ruby/trunk/debian/libpacket-ruby.links	2009-04-17 04:22:16 UTC (rev 3395)
@@ -1 +0,0 @@
-/usr/bin/packet_worker_runner1.8 /usr/bin/packet_worker_runner

Added: packages-wip/libpacket-ruby/trunk/debian/patches/move-packet_worker_runner
===================================================================
--- packages-wip/libpacket-ruby/trunk/debian/patches/move-packet_worker_runner	                        (rev 0)
+++ packages-wip/libpacket-ruby/trunk/debian/patches/move-packet_worker_runner	2009-04-17 04:22:16 UTC (rev 3395)
@@ -0,0 +1,13 @@
+it's moved to DEB_RUBY_LIBDIR/packet/
+
+--- a/lib/packet/packet_master.rb
++++ b/lib/packet/packet_master.rb
+@@ -158,7 +158,7 @@
+     end
+ 
+     def form_cmd_line *args
+-      min_string = "packet_worker_runner #{args[0]}:#{args[1]}:#{args[2]}:#{args[3]}"
++      min_string = "#{File.dirname(__FILE__)}/packet_worker_runner #{args[0]}:#{args[1]}:#{args[2]}:#{args[3]}"
+       min_string << ":#{WORKER_ROOT}" if defined? WORKER_ROOT
+       min_string << ":#{WORKER_LOAD_ENV}" if defined? WORKER_LOAD_ENV
+       min_string

Added: packages-wip/libpacket-ruby/trunk/debian/patches/series
===================================================================
--- packages-wip/libpacket-ruby/trunk/debian/patches/series	                        (rev 0)
+++ packages-wip/libpacket-ruby/trunk/debian/patches/series	2009-04-17 04:22:16 UTC (rev 3395)
@@ -0,0 +1 @@
+move-packet_worker_runner

Modified: packages-wip/libpacket-ruby/trunk/debian/rules
===================================================================
--- packages-wip/libpacket-ruby/trunk/debian/rules	2009-04-16 04:23:21 UTC (rev 3394)
+++ packages-wip/libpacket-ruby/trunk/debian/rules	2009-04-17 04:22:16 UTC (rev 3395)
@@ -4,9 +4,12 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/ruby-pkg-tools/1/class/ruby-setup-rb.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 $(patsubst %,install/%,$(DEB_PACKAGES)) :: install/% :
-	# move it to a packet_worker_runner1.x
-	[ ! -f debian/$(cdbs_curpkg)/usr/bin/packet_worker_runner ] || mv debian/$(cdbs_curpkg)/usr/bin/packet_worker_runner debian/$(cdbs_curpkg)/usr/bin/packet_worker_runner$(cdbs_ruby_ver)
 	# fix the shebang
-	[ ! -f debian/$(cdbs_curpkg)/usr/bin/packet_worker_runner$(cdbs_ruby_ver) ] || sed -i "1 s,.*,#\!/usr/bin/ruby$(cdbs_ruby_ver)," debian/$(cdbs_curpkg)/usr/bin/packet_worker_runner$(cdbs_ruby_ver)
+	[ ! -f debian/$(cdbs_curpkg)/usr/bin/packet_worker_runner ] || sed -i "1 s,.*,#\!/usr/bin/ruby$(cdbs_ruby_ver)," debian/$(cdbs_curpkg)/usr/bin/packet_worker_runner
+	# don't put it in /usr/bin/
+	[ ! -f debian/$(cdbs_curpkg)/usr/bin/packet_worker_runner ] || mv debian/$(cdbs_curpkg)/usr/bin/packet_worker_runner debian/$(cdbs_curpkg)/$(DEB_RUBY_LIBDIR)/packet/
+	# remove the empty /usr/bin/
+	[ -z "$(shell find debian/$(cdbs_curpkg)/usr/bin/ -type f)" ] || rmdir debian/$(cdbs_curpkg)/usr/bin/