[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/4.0.8debian-1.6-41-g917e329

[David Prévot]

The following commit has been merged in the master branch:
commit 26a70e1715cfa7772ae23e84b3c6e47e95315870
Author: David Prévot <taffit at debian.org>
Date:   Sun Mar 24 10:53:42 2013 -0400

    Adapt path to mediawi’s classes

diff --git a/debian/changelog b/debian/changelog
index facdf15..59a70bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ owncloud (5.0.0+dfsg-1) UNRELEASED; urgency=low
     - Refresh existing patches
     - Drop unneeded patches
     - 04_add_onfontresize.diff: Add missing jquery.onfontresize source
+    - fix_mediawiki.diff: Adapt path to mediawi’s classes
   * debian/owncloud.links: Link to Zend Framework instead of embedding a
     partial copy
   * debian/owncloud.install: Update 3dparty list
diff --git a/debian/patches/fix_mediawiki.diff b/debian/patches/fix_mediawiki.diff
new file mode 100644
index 0000000..3b170e3
--- /dev/null
+++ b/debian/patches/fix_mediawiki.diff
@@ -0,0 +1,25 @@
+Description: Adapt mediawiki path
+ The Debian package depends on the needed classes instead of embedding them.
+Author: David Prévot <taffit at debian.org>
+Forwarded: not-needed
+Last-Update: 2013-03-24
+--- a/lib/minimizer/css.php
++++ b/lib/minimizer/css.php
+@@ -1,6 +1,6 @@
+ <?php
+ 
+-require_once 'mediawiki/CSSMin.php';
++require_once '/usr/share/mediawiki/includes/libs/CSSMin.php';
+ 
+ class OC_Minimizer_CSS extends OC_Minimizer
+ {
+--- a/lib/minimizer/js.php
++++ b/lib/minimizer/js.php
+@@ -1,6 +1,6 @@
+ <?php
+ 
+-require_once 'mediawiki/JavaScriptMinifier.php';
++require_once '/usr/share/mediawiki/includes/libs/JavaScriptMinifier.php';
+ 
+ class OC_Minimizer_JS extends OC_Minimizer
+ {
diff --git a/debian/patches/series b/debian/patches/series
index f6d8fb9..151350b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 04_add_onfontresize.diff
 05_no_app_store.diff
 fix_tar_require.diff
+fix_mediawiki.diff

-- 
owncloud.git