Package: php-horde-core
Severity: normal
Tags: patch

Hello,

After testing  horde 5, I found  out that mobile UI  is completely wrong
because of missing  Javascript files. It's because  in debian/rules, you
remove entirely usr/share/horde/js/jquery.mobile and  then add a symlink
to jquery-mobile.  But js/jquery.mobile/ from upstream also ships jquery
itself   and   plugins   (autocomplete   and   swipebutton)   developped
specifically for Horde apparently.

I have  attached a  patch fixing  this issue. Hope  that's ok.   Also, I
reported #711149, which this patch depends upon for the following lines:

dh_link usr/share/javascript/jquery-mobile/jquery.mobile.min.js
dh_link usr/share/javascript/jquery-mobile/jquery.mobile.js

So, if you  upload after the bug  above has been fixed, you  may have to
bump Depends version for libjs-jquery-mobile depending on the fix chosen
by the maintainer.

Thanks for packaging horde!

Regards,
Arnaud Fontaine

diff -urN /tmp/php-horde-core-2.4.3/debian/changelog php-horde-core-2.4.3/debian/changelog
--- /tmp/php-horde-core-2.4.3/debian/changelog	2013-04-07 23:05:31.000000000 +0900
+++ php-horde-core-2.4.3/debian/changelog	2013-06-05 17:50:06.360731491 +0900
@@ -1,3 +1,12 @@
+php-horde-core (2.4.3-1.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Upstream js/jquery.mobile actually ships both jquery and jquery-mobile
+    along with its own plugins, thus add libjs-jquery as Depends and fix
+    links accordingly.
+
+ -- Arnaud Fontaine <ar...@debian.org>  Wed, 05 Jun 2013 16:00:00 +0900
+
 php-horde-core (2.4.3-1) unstable; urgency=low
 
   * New upstream version 2.4.3
diff -urN /tmp/php-horde-core-2.4.3/debian/control php-horde-core-2.4.3/debian/control
--- /tmp/php-horde-core-2.4.3/debian/control	2013-04-07 23:05:31.000000000 +0900
+++ php-horde-core-2.4.3/debian/control	2013-06-05 16:59:15.646537226 +0900
@@ -11,7 +11,7 @@
 
 Package: php-horde-core
 Architecture: all
-Depends: ${misc:Depends}, ${phppear:Debian-Depends}, libjs-jquery-mobile, libjs-prototype, libjs-scriptaculous
+Depends: ${misc:Depends}, ${phppear:Debian-Depends}, libjs-jquery-mobile, libjs-jquery, libjs-prototype, libjs-scriptaculous
 Recommends: ${phppear:Debian-Recommends}
 Breaks: ${phppear:Debian-Breaks}
 Description: ${phppear:summary}
diff -urN /tmp/php-horde-core-2.4.3/debian/preinst php-horde-core-2.4.3/debian/preinst
--- /tmp/php-horde-core-2.4.3/debian/preinst	1970-01-01 09:00:00.000000000 +0900
+++ php-horde-core-2.4.3/debian/preinst	2013-06-05 18:07:07.156146225 +0900
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
+
+case "$1" in
+  install|upgrade)
+    # jquery.mobile was previously a symlink to jquery-mobile (<= 2.4.3-1),
+    # but as it was missing jquery, the directory was put back. However,
+    # dpkg does not delete the symlink on upgrade...
+    if [ -L /usr/share/horde/js/jquery.mobile ]; then
+        rm /usr/share/horde/js/jquery.mobile
+    fi
+    ;;
+  *)
+    ;;
+esac
+
+exit 0
diff -urN /tmp/php-horde-core-2.4.3/debian/rules php-horde-core-2.4.3/debian/rules
--- /tmp/php-horde-core-2.4.3/debian/rules	2013-04-07 23:05:31.000000000 +0900
+++ php-horde-core-2.4.3/debian/rules	2013-06-05 16:59:15.646537226 +0900
@@ -8,8 +8,19 @@
 override_dh_link:
 	# Embedded JS libs
 	# ... from package libjs-jquery-mobile
-	rm -r $(DESTDIR)/usr/share/horde/js/jquery.mobile
-	dh_link usr/share/javascript/jquery-mobile usr/share/horde/js/jquery.mobile
+	rm -r $(DESTDIR)/usr/share/horde/js/jquery.mobile/images/
+	dh_link usr/share/javascript/jquery-mobile/images/ usr/share/horde/js/jquery.mobile/images
+	rm $(DESTDIR)/usr/share/horde/js/jquery.mobile/jquery.mobile.js
+	dh_link usr/share/javascript/jquery-mobile/jquery.mobile.js usr/share/horde/js/jquery.mobile/jquery.mobile.js
+	rm $(DESTDIR)/usr/share/horde/js/jquery.mobile/jquery.mobile.min.js
+	dh_link usr/share/javascript/jquery-mobile/jquery.mobile.min.js usr/share/horde/js/jquery.mobile/jquery.mobile.min.js
+	rm $(DESTDIR)/usr/share/horde/js/jquery.mobile/jquery.mobile.min.css
+	dh_link usr/share/javascript/jquery-mobile/jquery.mobile.min.css usr/share/horde/js/jquery.mobile/jquery.mobile.min.css
+	# ... from libjs-jquery
+	rm $(DESTDIR)/usr/share/horde/js/jquery.mobile/jquery.js
+	dh_link usr/share/javascript/jquery/jquery.js usr/share/horde/js/jquery.mobile/jquery.js
+	rm $(DESTDIR)/usr/share/horde/js/jquery.mobile/jquery.min.js
+	dh_link usr/share/javascript/jquery/jquery.min.js usr/share/horde/js/jquery.mobile/jquery.min.js
 	# ... from package libjs-prototype
 	rm $(DESTDIR)/usr/share/horde/js/prototype.js
 	dh_link usr/share/javascript/prototype/prototype.js usr/share/horde/js/prototype.js

Reply via email to