[DRE-commits] [diaspora] 11/11: asset check patch is applied upstream

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository diaspora.

commit 8cb6ad15cdaf07570dd330922a0b300c4f598558
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Wed May 6 13:12:24 2015 +0530

    asset check patch is applied upstream
---
 debian/patches/042-fix-asset-check.patch | 13 -------------
 debian/patches/series                    |  1 -
 2 files changed, 14 deletions(-)

diff --git a/debian/patches/042-fix-asset-check.patch b/debian/patches/042-fix-asset-check.patch
deleted file mode 100644
index 9c550bf..0000000
--- a/debian/patches/042-fix-asset-check.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: diaspora/script/server
-===================================================================
---- diaspora.orig/script/server
-+++ diaspora/script/server
-@@ -120,7 +120,7 @@ then
- fi
- 
- # Check if assets are precompiled
--if [ "$RAILS_ENV" = "production" -a -z "$(find public/assets -maxdepth 1 -name 'default-*.css' -print -quit)" ]
-+if [ "$RAILS_ENV" = "production" -a -z "$(find public/assets -maxdepth 1 -name 'home-*.css' -print -quit)" ]
- then
-   fatal "You're running in production mode without having assets
- precompiled. Now and after each update before you restart the
diff --git a/debian/patches/series b/debian/patches/series
index cc8a1e9..ffd4857 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,4 +12,3 @@
 031-embedded-gems.patch
 040-disable-raise_in_transactional_callbacks.patch
 041-require-foreigner.patch
-042-fix-asset-check.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/diaspora.git