[DRE-commits] [SCM] Packaging for ruby-json branch, master, updated. upstream/1.5.1-13-ga82d97e

[Lucas Nussbaum]

The following commit has been merged in the master branch:
commit a82d97eff30d5c46ceea43a5340e94c84aacbd2e
Author: Lucas Nussbaum <lucas at lucas-nussbaum.net>
Date:   Sat Apr 9 11:41:48 2011 +0200

    Fix build system so that it also works with arch-only builds. Closes: #621772, #621766
    
    * Fix build system so that it also works with arch-only builds.
      Closes: #621772, #621766
    * Fix Vcs-Browser.

diff --git a/debian/changelog b/debian/changelog
index 53758cd..638d235 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ruby-json (1.5.1-2) unstable; urgency=low
+
+  * Fix build system so that it also works with arch-only builds.
+    Closes: #621772, #621766
+  * Fix Vcs-Browser.
+
+ -- Lucas Nussbaum <lucas at lucas-nussbaum.net>  Sat, 09 Apr 2011 11:40:30 +0200
+
 ruby-json (1.5.1-1) unstable; urgency=low
 
   * New upstream release. Closes: #617721
diff --git a/debian/control b/debian/control
index dc4de79..6531ab1 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.1)
 Standards-Version: 3.9.1
 Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-json.git
-Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-json;a=summary
+Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-json.git;a=summary
 Homepage: http://flori.github.com/json
 XS-Ruby-Versions: all
 
diff --git a/debian/edit-json.dirs b/debian/edit-json.dirs
index b210ef5..f5cf2ca 100644
--- a/debian/edit-json.dirs
+++ b/debian/edit-json.dirs
@@ -1,3 +1,2 @@
-usr/bin
 usr/lib/ruby/1.8/json
 usr/share/edit-json
diff --git a/debian/edit-json.install b/debian/edit-json.install
index cc7e72b..9e22175 100644
--- a/debian/edit-json.install
+++ b/debian/edit-json.install
@@ -1,4 +1,2 @@
-bin/edit_json.rb     usr/bin
-bin/prettify_json.rb usr/bin
 lib/json/editor.rb   usr/lib/ruby/1.8/json
 lib/json/*.xpm       usr/share/edit-json
diff --git a/debian/rules b/debian/rules
index afe0d7d..0ed853d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,6 +21,8 @@ override_dh_auto_install:
 
 override_dh_install:
 	dh_install
+	# cannot be done in edit-json.dirs in case we are doing a binary-arch build
+	mkdir -p debian/edit-json/usr/bin
 	mv debian/ruby-json/usr/bin/* debian/edit-json/usr/bin/
 	rm -rf debian/ruby-json/usr/bin
 	rm debian/ruby-json/usr/lib/ruby/vendor_ruby/json/editor.rb

-- 
Packaging for ruby-json