[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 b9277a060a34021e18d22affd4c9d07230a15009
Author: Ondřej Surý <ondrej at sury.org>
Date:   Fri Jul 19 15:19:14 2013 +0200

    Just remove whole guides.rubyonrails.org content from source tarball

diff --git a/debian/changelog b/debian/changelog
index 98cf1e1..eb1d863 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+rails-4.0 (4.0.0-1~1.gbp988ca5) UNRELEASED; urgency=low
+
+  ** SNAPSHOT build @988ca53ef7e37ad282a43b8da237a0efe9cbdb27 **
+
+  [ Antonio Terceiro ]
+  * Migrate to use dh_ruby multi-binary support
+
+  [ Ondřej Surý ]
+  * New upstream version 4.0.0
+
+ -- Antonio Terceiro <terceiro at debian.org>  Fri, 19 Jul 2013 13:58:35 +0200
+
 rails-4.0 (4.0.0~rc1-1) experimental; urgency=low
 
   * Initial release of Rails 4.0
diff --git a/debian/control b/debian/control
index 29bb3f6..5604572 100644
--- a/debian/control
+++ b/debian/control
@@ -147,9 +147,7 @@ Depends: ${shlibs:Depends},
 	 ruby-actionmailer-4.0 (= ${source:Version}),
 	 ruby-railties-4.0 (= ${source:Version}),
 	 bundler (>= 1.3.0),
-	 ruby-sprockets-rails (>= 2.0.0~rc4),
-	 libjs-jquery,
-	 docbook-xsl
+	 ruby-sprockets-rails (>= 2.0.0~rc4)
 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
index 9dfce9e..ded39c9 100755
--- a/debian/dfsg-repack.sh
+++ b/debian/dfsg-repack.sh
@@ -20,8 +20,7 @@ trap '[ ! -d "$tdir" ] || rm -r "$tdir"' EXIT
 
 xzcat "$tarball" | \
     tar --wildcards \
-        --delete '*/guides/assets/images/icons/*' \
-        --delete '*/guides/assets/images/icons' \
+        --delete '*/guides/*' \
         --delete '*/actionpack/test/fixtures/multipart/mona_lisa.jpg' \
     > "$tdir/${fname/.xz}"
 xz "$tdir/${fname/.xz}"
diff --git a/debian/ruby-rails-4.0.examples b/debian/ruby-rails-4.0.examples
deleted file mode 100644
index ba0de35..0000000
--- a/debian/ruby-rails-4.0.examples
+++ /dev/null
@@ -1 +0,0 @@
-guides/
diff --git a/debian/ruby-rails-4.0.links b/debian/ruby-rails-4.0.links
deleted file mode 100644
index b52b4db..0000000
--- a/debian/ruby-rails-4.0.links
+++ /dev/null
@@ -1,2 +0,0 @@
-/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
diff --git a/debian/rules b/debian/rules
index 7651b17..d01dccb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,10 +19,3 @@ UPSTREAM_PACKAGES=actionmailer activerecord activemodel activesupport railties a
 overrride_dh_auto_build:
 	racc -o actionpack/lib/action_dispatch/journey/parser.rb \
 		actionpack/lib/action_dispatch/journey/parser.y
-
-override_dh_installexamples:
-	dh_installexamples -Xjquery.min.js -X.gitignore
-	chmod -x \
-	  $(CURDIR)/debian/ruby-rails-4.0/usr/share/doc/ruby-rails-4.0/examples/guides/assets/stylesheets/responsive-tables.css \
-	  $(CURDIR)/debian/ruby-rails-4.0/usr/share/doc/ruby-rails-4.0/examples/guides/assets/stylesheets/syntaxhighlighter/shThemeMDUltra.css \
-	  $(CURDIR)/debian/ruby-rails-4.0/usr/share/doc/ruby-rails-4.0/examples/guides/assets/javascripts/responsive-tables.js

-- 
rails-4.0.git