[DRE-commits] [SCM] rails-4.0.git branch, master, updated. debian/4.0.0_rc1-1-18-gbcd6e5c

[Ondřej Surý]

The following commit has been merged in the master branch:
commit 5c00ce050853ffd8bbb111a1dda0087c8190420d
Author: Ondřej Surý <ondrej at sury.org>
Date:   Fri Jul 19 15:03:38 2013 +0200

    Replace docbook icons with icons from docbook-xsl

diff --git a/debian/control b/debian/control
index 02e22d8..29bb3f6 100644
--- a/debian/control
+++ b/debian/control
@@ -148,7 +148,8 @@ Depends: ${shlibs:Depends},
 	 ruby-railties-4.0 (= ${source:Version}),
 	 bundler (>= 1.3.0),
 	 ruby-sprockets-rails (>= 2.0.0~rc4),
-	 libjs-jquery
+	 libjs-jquery,
+	 docbook-xsl
 Provides: ruby-rails
 Conflicts: ruby-rails
 Breaks: ruby-rails-2.3, ruby-rails-3.2, ruby-activeresource-3.2
diff --git a/debian/dfsg-repack.sh b/debian/dfsg-repack.sh
new file mode 100755
index 0000000..38ebbe8
--- /dev/null
+++ b/debian/dfsg-repack.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+set -e
+
+if [ ! -f "$3" ] && [ ! -f "$1" ]; then
+    echo "This script must be run via uscan or by manually specifying the tarball" >&2
+    exit 1
+fi
+
+tarball=
+
+[ -f "$3" ] && tarball="$3"
+[ -z "$tarball" -a -f "$1" ] && tarball="$1"
+
+fname="$(basename "$tarball")"
+tarball="$(readlink -f "$tarball")"
+
+tdir="$(mktemp -d)"
+trap '[ ! -d "$tdir" ] || rm -r "$tdir"' EXIT
+
+xzcat "$tarball" | \
+    tar --wildcards \
+        --delete '*/guides/assets/images/icons/*' \
+        --delete '*/guides/assets/images/icons' \
+    > "$tdir/${fname/.xz}"
+xz "$tdir/${fname/.xz}"
+
+mv "$tdir/$fname" "${tarball/.tar.xz}+dfsg.tar.xz"
diff --git a/debian/ruby-rails-4.0.links b/debian/ruby-rails-4.0.links
index 11e3387..b52b4db 100644
--- a/debian/ruby-rails-4.0.links
+++ b/debian/ruby-rails-4.0.links
@@ -1 +1,2 @@
 /usr/share/javascript/jquery/jquery.min.js /usr/share/doc/ruby-rails-4.0/examples/guides/assets/javascripts/jquery.min.js
+/usr/share/xml/docbook/stylesheet/docbook-xsl/images/ /usr/share/doc/ruby-rails-4.0/examples/guides/assets/images/icons

-- 
rails-4.0.git