Hello Mohammad Derakhshani, maintainer of zekr,
I'm working on improving package quality, and I found an old
release-critical bug filed against zekr: Bug #489501 is from six months
ago. <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=489501>
I'm CC:ing the bug, as well as Mako (my usual sponsor; I'm not a Debian
Developer), as well as my account manager, Steffen.
zekr depends on libxul0d, which has been removed in unstable. I spent a
lot of time looking through zekr and have prepared an updated package
which upgrades zekr to use SWT 3.4 and therefore not need the exhausting
search for MOZILLA_FIVE_HOME that you had, therefore not needing the
libxul0d dependency. It builds properly in a sid pbuilder and runs when
built. (It seems that with SWT 3.2 the libxul0d dependency is needed,
hence the upgrade to SWT 3.4.)
http://mentors.debian.net/debian/pool/main/z/zekr/zekr_0.5.1.dfsg-1.1.dsc
is the dsc link. I intend to ask Mako to upload this as a Non-Maintainer
Update (NMU) if you do not reply within a few days. I intend to stick to
the conventions at
http://www.debian.org/doc/developers-reference/pkgs.html#nmu for this NMU.
I did jump ahead a little and already prepare the NMU, but don't be
offended by that; if you like my changes and have time to do the update
yourself, please just re-use them yourself and upload it yourself.
If you do not have time to upload this update, then just say it is okay
and we will uploaded it as an NMU. If you do not have even time for that,
then it will be uploaded as an NMU anyway. You have about two weeks, as
per the usual process.
My .dsc source package is available at
http://mentors.debian.net/debian/pool/main/z/zekr/zekr_0.5.1.dfsg-1.1.dsc
.
The debdiff between the source packages is attached as interdiff.patch.
-- Asheesh.
--
Q: How many lawyers does it take to change a light bulb?
A: One. Only it's his light bulb when he's done.
diff -u zekr-0.5.1.dfsg/debian/patches/00_build_xml.dpatch zekr-0.5.1.dfsg/debian/patches/00_build_xml.dpatch
--- zekr-0.5.1.dfsg/debian/patches/00_build_xml.dpatch
+++ zekr-0.5.1.dfsg/debian/patches/00_build_xml.dpatch
@@ -6,14 +6,14 @@
@DPATCH@
diff -urNad zekr-0.5.1.dfsg~/build.xml zekr-0.5.1.dfsg/build.xml
---- zekr-0.5.1.dfsg~/build.xml 2007-03-10 09:05:28.000000000 -0500
-+++ zekr-0.5.1.dfsg/build.xml 2007-07-30 02:46:05.000000000 -0400
+--- zekr-0.5.1.dfsg~/build.xml 2008-12-10 20:02:16.000000000 -0800
++++ zekr-0.5.1.dfsg/build.xml 2008-12-10 20:02:29.000000000 -0800
@@ -13,7 +13,8 @@
<!-- Directory setup -->
<property name="srcdir" value="src" />
- <property name="libdir" value="lib" />
-+ <property name="swtlibdir" value="/usr/lib/java" />
++ <property name="swtlibdir" value="/usr/share/java" />
+ <property name="javalibdir" value="/usr/share/java" />
<property name="docsdir" value="docs" />
<property name="javadocsdir" value="${docsdir}/javadocs" />
diff -u zekr-0.5.1.dfsg/debian/patches/01_linux_run_sh.dpatch zekr-0.5.1.dfsg/debian/patches/01_linux_run_sh.dpatch
--- zekr-0.5.1.dfsg/debian/patches/01_linux_run_sh.dpatch
+++ zekr-0.5.1.dfsg/debian/patches/01_linux_run_sh.dpatch
@@ -6,16 +6,37 @@
@DPATCH@
diff -urNad zekr-0.5.1.dfsg~/linux-run.sh zekr-0.5.1.dfsg/linux-run.sh
---- zekr-0.5.1.dfsg~/linux-run.sh 2007-03-10 10:12:42.000000000 -0500
-+++ zekr-0.5.1.dfsg/linux-run.sh 2007-07-30 02:41:34.000000000 -0400
-@@ -18,11 +18,11 @@
+--- zekr-0.5.1.dfsg~/linux-run.sh 2008-12-10 20:20:36.000000000 -0800
++++ zekr-0.5.1.dfsg/linux-run.sh 2008-12-10 20:24:27.000000000 -0800
+@@ -5,24 +5,27 @@
+ # See http://siahe.com/zekr/faq.html#linux for more details.
+
+ # You can uncomment this field if you know where your Mozilla-GTK2 is installed.
++# SWT 3.4 no longer requires setting MOZILLA_FIVE_HOME
++# A more invasive package update would remove the MOZILLA_FIVE_HOME handling
++# entirely.
+ #export MOZILLA_FIVE_HOME=/usr/lib/firefox
+
+-if [ -z "$MOZILLA_FIVE_HOME" ]; then
+- echo "MOZILLA_FIVE_HOME environment variable is not set. Please set it to a Mozilla GTK2 1.4+ installation directory. See http://siahe.com/zekr/faq.html#linux for more info."
+- exit 1
+-fi
++#if [ -z "$MOZILLA_FIVE_HOME" ]; then
++# echo "MOZILLA_FIVE_HOME environment variable is not set. Please set it to a Mozilla GTK2 1.4+ installation directory. See http://siahe.com/zekr/faq.html#linux for more info."
++# exit 1
++#fi
+
+ JAVA_CMD=java
+-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$MOZILLA_FIVE_HOME
++#export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$MOZILLA_FIVE_HOME
+
ORIG_DIR_NAME=`cd`
DIR_NAME=`dirname $0`
MAIN_CLASS=net.sf.zekr.ZekrMain
-JRE_OPT=-Djava.library.path=lib
-CLASS_PATH=lib/log4j-1.2.8.jar:lib/swt-linux.jar:lib/apache-commons.jar:lib/velocity-1.4.jar:dist/zekr.jar
+JRE_OPT=-Djava.library.path=/usr/lib/jni
-+CLASS_PATH=/usr/share/java/log4j-1.2.jar:/usr/lib/java/swt.jar:/usr/share/java/commons-collections3.jar:/usr/share/java/commons-configuration.jar:/usr/share/java/commons-io.jar:/usr/share/java/commons-lang.jar:/usr/share/java/commons-logging.jar:/usr/share/java/velocity.jar:dist/zekr.jar
++CLASS_PATH=/usr/share/java/log4j-1.2.jar:/usr/share/java/swt.jar:/usr/share/java/commons-collections3.jar:/usr/share/java/commons-configuration.jar:/usr/share/java/commons-io.jar:/usr/share/java/commons-lang.jar:/usr/share/java/commons-logging.jar:/usr/share/java/velocity.jar:dist/zekr.jar
VM_ARGS="-Xms10m -Xmx70m"
cd $DIR_NAME
diff -u zekr-0.5.1.dfsg/debian/changelog zekr-0.5.1.dfsg/debian/changelog
--- zekr-0.5.1.dfsg/debian/changelog
+++ zekr-0.5.1.dfsg/debian/changelog
@@ -1,3 +1,20 @@
+zekr (0.5.1.dfsg-1.1) intrepid; urgency=low
+
+ * Non-maintainer upload.
+ * debian/control: Update build-dependencies to require SWT 3.4, not 3.2
+ * debian/control: Update dependencies to use SWT 3.4 and the appropriate
+ Mozilla bindings, rather than SWT 3.2
+ * patches/00_build_xml.dpatch: SWT is now in /usr/share/java/swt.jar
+ * patches/01_linux_run_sh.dpatch: SWT is now in /usr/share/java/swt.jar
+ * zekr.sh: Comment out shell script section about finding MOZILLA_FIVE_HOME,
+ since the SWT 3.4 Mozilla bindings do not need that set at all.
+ * patches/01_linux_run_sh.dpatch: Similarly, comment out the extension
+ of LD_LIBRARY_PATH to include MOZILLA_FIVE_HOME.
+ * debian/control: SWT 3.4 Mozilla bindings do not require libxul0d.
+ Ergo we stop depending on it. (Closes: #489501)
+
+ -- Asheesh Laroia <[EMAIL PROTECTED]> Wed, 10 Dec 2008 19:33:52 -0800
+
zekr (0.5.1.dfsg-1) unstable; urgency=low
* Initial release. (Closes: #436189)
diff -u zekr-0.5.1.dfsg/debian/control zekr-0.5.1.dfsg/debian/control
--- zekr-0.5.1.dfsg/debian/control
+++ zekr-0.5.1.dfsg/debian/control
@@ -6,16 +6,15 @@
libcommons-lang-java (>= 2.3), libcommons-logging-java (>= 1.0.4),
libcommons-collections3-java (>= 3.1), libcommons-configuration-java (>= 1.2),
libcommons-io-java (>= 1.1), velocity (>= 1.4), liblog4j1.2-java (>= 1.2.8),
- libswt3.2-gtk-java (>= 3.2)
+ libswt-gtk-3.4-java, libswt-mozilla-gtk-3.4-jni
Build-Depends: debhelper (>= 5.0), cdbs, dpatch
Standards-Version: 3.7.2
Package: zekr
Architecture: all
-Depends: libxul0d,
- zenity,
- java-gcj-compat | java2-runtime,
- libswt3.2-gtk-java (>= 3.2), libswt3.2-gtk-jni (>= 3.2),
+Depends: zenity,
+ libswt-gtk-3.4-java, libswt-gtk-3.4-jni,
+ libswt-mozilla-gtk-3.4-jni,
libcommons-lang-java (>= 2.3), libcommons-logging-java (>= 1.0.4),
libcommons-collections3-java (>= 3.1), libcommons-configuration-java (>= 1.2),
libcommons-io-java (>= 1.1), velocity (>= 1.4), liblog4j1.2-java (>= 1.2.8),
diff -u zekr-0.5.1.dfsg/debian/zekr.sh zekr-0.5.1.dfsg/debian/zekr.sh
--- zekr-0.5.1.dfsg/debian/zekr.sh
+++ zekr-0.5.1.dfsg/debian/zekr.sh
@@ -5,24 +5,26 @@
purpose="Zekr provides an open platform for simply browsing and researching on the Holy Quran."
run () {
-# Set path for the Mozilla SWT binding
-MOZILLA_FIVE_HOME=${MOZILLA_FIVE_HOME%*/}
-if false && [ -n "$MOZILLA_FIVE_HOME" -a -e $MOZILLA_FIVE_HOME/libgtkembedmoz.so ]; then
+# SWT 3.4 does not need a path set for MOZILLA_FIVE_HOME
+# So in this NMU, we comment out this handling.
+# A real package update will remove this logic entirely.
+#MOZILLA_FIVE_HOME=${MOZILLA_FIVE_HOME%*/}
+#if false && [ -n "$MOZILLA_FIVE_HOME" -a -e $MOZILLA_FIVE_HOME/libgtkembedmoz.so ]; then
:
-elif [ -e /usr/lib/firefox/libgtkembedmoz.so ]; then
- export MOZILLA_FIVE_HOME=/usr/lib/firefox
-elif [ -e /usr/lib/xulrunner/libgtkembedmoz.so ]; then
- export MOZILLA_FIVE_HOME=/usr/lib/xulrunner
-elif [ -e /usr/lib/mozilla-firefox/libgtkembedmoz.so ]; then
- export MOZILLA_FIVE_HOME=/usr/lib/mozilla-firefox
-elif [ -e /usr/lib/mozilla/libgtkembedmoz.so ]; then
- export MOZILLA_FIVE_HOME=/usr/lib/mozilla
-else
- zenity --warning \
- --title="Integrated browser support not working" \
- --text="This Zekr build doesn't have support for the integrated browser."
- [ $? -eq 0 ] || exit 1
-fi
+#elif [ -e /usr/lib/firefox/libgtkembedmoz.so ]; then
+# export MOZILLA_FIVE_HOME=/usr/lib/firefox
+#elif [ -e /usr/lib/xulrunner/libgtkembedmoz.so ]; then
+# export MOZILLA_FIVE_HOME=/usr/lib/xulrunner
+#elif [ -e /usr/lib/mozilla-firefox/libgtkembedmoz.so ]; then
+# export MOZILLA_FIVE_HOME=/usr/lib/mozilla-firefox
+#elif [ -e /usr/lib/mozilla/libgtkembedmoz.so ]; then
+# export MOZILLA_FIVE_HOME=/usr/lib/mozilla
+#else
+# zenity --warning \
+# --title="Integrated browser support not working" \
+# --text="This Zekr build doesn't have support for the integrated browser."
+# [ $? -eq 0 ] || exit 1
+#fi
DIR_NAME=`dirname $0`
cd $DIR_NAME
cd ../share/zekr/
