[DRE-commits] [rails] 16/16: remove mona_lisa.jpg_is_PD-Art_and_has_been_removed.patch
Antonio Terceiro
terceiro at moszumanska.debian.org
Sun Aug 3 03:53:19 UTC 2014
This is an automated email from the git hooks/post-receive script.
terceiro pushed a commit to branch master
in repository rails.
commit 29cf1e76882bf44f92c6dc1cc51f654253b19060
Author: Antonio Terceiro <terceiro at debian.org>
Date: Sun Aug 3 00:49:44 2014 -0300
remove mona_lisa.jpg_is_PD-Art_and_has_been_removed.patch
---
debian/changelog | 2 +
debian/copyright | 1 +
...a_lisa.jpg_is_PD-Art_and_has_been_removed.patch | 100 ---------------------
debian/patches/series | 1 -
debian/rails.lintian-overrides | 1 +
5 files changed, 4 insertions(+), 101 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ca24c16..7f3cf21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,8 @@ rails (2:4.1.4-4) unstable; urgency=medium
* debian/tests/control: fix test dependencies to rails and *not* rails-3.2;
add needs-recommends instead of explicitly listing the recommended
packages
+ * debian/patches/mona_lisa.jpg_is_PD-Art_and_has_been_removed.patch: removed
+ as it does not make sense anymore (mona_lisa.jpg is just there).
-- Antonio Terceiro <terceiro at debian.org> Sun, 03 Aug 2014 00:24:26 -0300
diff --git a/debian/copyright b/debian/copyright
index 77d2444..710750c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -26,6 +26,7 @@ License: Expat or CC-BY-3.0
Files: actionpack/test/fixtures/multipart/mona_lisa.jpg
Copyright: Musée du Louvre
License: Public Domain
+ This work is in the public domain
Files: debian/*
Copyright: Copyright 2011 Ondřej Surý <ondrej at debian.org>
diff --git a/debian/patches/mona_lisa.jpg_is_PD-Art_and_has_been_removed.patch b/debian/patches/mona_lisa.jpg_is_PD-Art_and_has_been_removed.patch
deleted file mode 100644
index fc69be5..0000000
--- a/debian/patches/mona_lisa.jpg_is_PD-Art_and_has_been_removed.patch
+++ /dev/null
@@ -1,100 +0,0 @@
---- rails.orig/actionpack/test/controller/test_case_test.rb
-+++ rails/actionpack/test/controller/test_case_test.rb
-@@ -805,80 +805,6 @@ XML
- READ_BINARY = 'rb:binary'
- READ_PLAIN = 'r:binary'
-
-- def test_test_uploaded_file
-- filename = 'mona_lisa.jpg'
-- path = "#{FILES_DIR}/#{filename}"
-- content_type = 'image/png'
-- expected = File.read(path)
-- expected.force_encoding(Encoding::BINARY)
--
-- file = Rack::Test::UploadedFile.new(path, content_type)
-- assert_equal filename, file.original_filename
-- assert_equal content_type, file.content_type
-- assert_equal file.path, file.local_path
-- assert_equal expected, file.read
--
-- new_content_type = "new content_type"
-- file.content_type = new_content_type
-- assert_equal new_content_type, file.content_type
--
-- end
--
-- def test_fixture_path_is_accessed_from_self_instead_of_active_support_test_case
-- TestCaseTest.stubs(:fixture_path).returns(FILES_DIR)
--
-- uploaded_file = fixture_file_upload('/mona_lisa.jpg', 'image/png')
-- assert_equal File.open("#{FILES_DIR}/mona_lisa.jpg", READ_PLAIN).read, uploaded_file.read
-- end
--
-- def test_test_uploaded_file_with_binary
-- filename = 'mona_lisa.jpg'
-- path = "#{FILES_DIR}/#{filename}"
-- content_type = 'image/png'
--
-- binary_uploaded_file = Rack::Test::UploadedFile.new(path, content_type, :binary)
-- assert_equal File.open(path, READ_BINARY).read, binary_uploaded_file.read
--
-- plain_uploaded_file = Rack::Test::UploadedFile.new(path, content_type)
-- assert_equal File.open(path, READ_PLAIN).read, plain_uploaded_file.read
-- end
--
-- def test_fixture_file_upload_with_binary
-- filename = 'mona_lisa.jpg'
-- path = "#{FILES_DIR}/#{filename}"
-- content_type = 'image/jpg'
--
-- binary_file_upload = fixture_file_upload(path, content_type, :binary)
-- assert_equal File.open(path, READ_BINARY).read, binary_file_upload.read
--
-- plain_file_upload = fixture_file_upload(path, content_type)
-- assert_equal File.open(path, READ_PLAIN).read, plain_file_upload.read
-- end
--
-- def test_fixture_file_upload
-- post :test_file_upload, :file => fixture_file_upload(FILES_DIR + "/mona_lisa.jpg", "image/jpg")
-- assert_equal '159528', @response.body
-- end
--
-- def test_fixture_file_upload_relative_to_fixture_path
-- TestCaseTest.stubs(:fixture_path).returns(FILES_DIR)
-- uploaded_file = fixture_file_upload("mona_lisa.jpg", "image/jpg")
-- assert_equal File.open("#{FILES_DIR}/mona_lisa.jpg", READ_PLAIN).read, uploaded_file.read
-- end
--
-- def test_fixture_file_upload_ignores_nil_fixture_path
-- TestCaseTest.stubs(:fixture_path).returns(nil)
-- uploaded_file = fixture_file_upload("#{FILES_DIR}/mona_lisa.jpg", "image/jpg")
-- assert_equal File.open("#{FILES_DIR}/mona_lisa.jpg", READ_PLAIN).read, uploaded_file.read
-- end
--
-- def test_action_dispatch_uploaded_file_upload
-- filename = 'mona_lisa.jpg'
-- path = "#{FILES_DIR}/#{filename}"
-- post :test_file_upload, :file => ActionDispatch::Http::UploadedFile.new(:filename => path, :type => "image/jpg", :tempfile => File.open(path))
-- assert_equal '159528', @response.body
-- end
--
- def test_test_uploaded_file_exception_when_file_doesnt_exist
- assert_raise(RuntimeError) { Rack::Test::UploadedFile.new('non_existent_file') }
- end
---- rails.orig/actionpack/test/dispatch/request/multipart_params_parsing_test.rb
-+++ rails/actionpack/test/dispatch/request/multipart_params_parsing_test.rb
-@@ -126,14 +126,6 @@ class MultipartParamsParsingTest < Actio
- assert_equal "", params['files'].read
- end
-
-- test "uploads and reads binary file" do
-- with_test_routing do
-- fixture = FIXTURE_PATH + "/mona_lisa.jpg"
-- params = { :uploaded_data => fixture_file_upload(fixture, "image/jpg") }
-- post '/read', params
-- end
-- end
--
- test "uploads and reads file" do
- with_test_routing do
- post '/read', :uploaded_data => fixture_file_upload(FIXTURE_PATH + "/hello.txt", "text/plain")
diff --git a/debian/patches/series b/debian/patches/series
index bb07559..d2bcd8a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-mona_lisa.jpg_is_PD-Art_and_has_been_removed.patch
be-carefull-with-that-bundler.patch
diff --git a/debian/rails.lintian-overrides b/debian/rails.lintian-overrides
new file mode 100644
index 0000000..3354825
--- /dev/null
+++ b/debian/rails.lintian-overrides
@@ -0,0 +1 @@
+rails: virtual-package-depends-without-real-package-depends
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/rails.git
More information about the Pkg-ruby-extras-commits
mailing list