[Debian-islamic-commits] [SCM] Packaging for Zekr branch, master, updated. 0375b58d6f10885602ad59d802a33fca83db5775
أحمد المحمودي (Ahmed El-Mahmoudy)
aelmahmoudy at users.sourceforge.net
Tue Dec 1 11:29:54 UTC 2009
The following commit has been merged in the master branch:
commit 923a9f9b4bd9200bb52deb2bd1a3887e4f246ae2
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
Date: Tue Dec 1 11:15:53 2009 +0200
Merge with Derakhshani's work:
* New upstream release
* Remove debian/config, debian/templates, debian/po
* New patch for build.xml
* Added patch 03_KeyboardShortcut_oldswt.patch to make Zekr compatible
with SWT 3.5
* Removed flash player related code from postinst, prerm and zekr.sh
since upstream does not use flash anymore.
* debian/rules:
* Delete patch 10_player_js as it is no more relevant
* Delete patches 02_arabic_xml, disable_update since they are applied
upstream.
* debian/control:
+ Update SWT dependancy to 3.5
+ Remove wget from Depends
+ Remove flashplugin from Recommends
+ Added sound related java packages to Depends & Build-Depends.
+ Removed *debconf* from Build-Depends
* Removed debian/velocity.properties since it is included upstream.
* debian/zekr.sh: Added sound related java packages to CLASSPATH
diff --git a/debian/changelog b/debian/changelog
index 77e166f..39e09f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+zekr (0.7.5~beta2+dfsg-0ubuntu0~ppa1) karmic; urgency=low
+
+ * Initial release.
+
+ -- Mohammad Derakhshani <mohammad at zekr.org> Sat, 28 Nov 2009 2:29:00 -0500
+
zekr (0.7.1-3~ppa15) karmic; urgency=low
* Activated disable_update.diff which was added in the previous upload.
diff --git a/debian/config b/debian/config
deleted file mode 100644
index e6d61c7..0000000
--- a/debian/config
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh
-# Config prior to download/install of JW FLV Player
-#
-# Based on config for msttcore fonts which is (C) 2001 Eric Sharkey.
-# You may freely distribute this file under the terms of the GNU General
-# Public License, version 2 or later
-
-set -e
-
-# Source debconf library.
-. /usr/share/debconf/confmodule
-
-if [ ! -f /usr/share/zekr/res/audio/player.swf ] ; then
- db_input low zekr/dldir || true
- if [ -n "$http_proxy" ] ; then
- db_set zekr/http_proxy $http_proxy
- fi
- db_input medium zekr/http_proxy || true
-
- db_go
- db_get zekr/dldir
- while [ -n "$RET" ] && [ `echo $RET | tr [:upper:] [:lower:] ` != "none" ] ; do
- BADDIR=""
- if [ ! -f $RET/mediaplayer.swf ] ; then
- BADDIR=1
- break;
- fi
- if [ -n "$BADDIR" ] ; then
- db_fset zekr/baddldir seen false
- db_fset zekr/dldir seen false
- db_input critical zekr/baddldir || true
- db_input critical zekr/dldir || true
- db_go
- db_get zekr/dldir
- else
- break
- fi
- done
- if [ -z "$RET" ]; then
- db_input low zekr/savedir || true
- db_go
- db_get zekr/savedir
- fi
-
- db_get zekr/dldir
-
- if [ -z "$RET" ]; then
- db_input low zekr/dlurl || true
- db_go || true
- fi
-fi
-
diff --git a/debian/control b/debian/control
index d136f09..65a5cfd 100644
--- a/debian/control
+++ b/debian/control
@@ -8,18 +8,21 @@ Build-Depends-Indep: ant, default-jdk-builddep,
libcommons-logging-java, libcommons-lang-java,
libcommons-io-java, liblog4j1.2-java (>= 1.2.8),
liblucene2-java (>= 2.3.0), velocity (>= 1.4),
- libswt-gtk-3.4-java, libcommons-codec-java, javahelper, po-debconf, debconf | debconf-2.0
+ libswt-gtk-3.5-java, libcommons-codec-java,
+ libjlayer-java, libcommons-codec-java, libbasicplayer-java, libtritonus-java,
+ libjorbis-java, libjspeex-java, libmp3spi-java, libvorbisspi-java,
+ javahelper
Build-Depends: debhelper (>= 7.3.3~), quilt (>= 0.46-7~)
Standards-Version: 3.8.3
Homepage: http://www.zekr.org
Package: zekr
Architecture: all
-Depends: ${misc:Depends}, ${java:Depends}, libswt-cairo-gtk-3.4-jni,
- libswt-mozilla-gtk-3.4-jni, zenity, wget, libjs-jquery,
+Depends: ${misc:Depends}, ${java:Depends}, libswt-cairo-gtk-3.5-jni,
+ libswt-mozilla-gtk-3.5-jni, zenity, libjs-jquery,
ttf-sil-scheherazade | ttf-kacst (>= 1.6.2+mry-1) | ttf-farsiweb,
xulrunner-1.9 (>= 1.9~b3) | firefox | libxul0d | iceape-browser | seamonkey-browser
-Recommends: flashplugin-nonfree, ttf-freefont | ttf-dejavu
+Recommends: ttf-freefont | ttf-dejavu
Suggests: zekr-quran-translation, zekr-quran-recitation, ttf-me-quran
Provides:
zekr-quran-recitation-online-minshawi,
diff --git a/debian/install b/debian/install
index cd72a7f..989243a 100644
--- a/debian/install
+++ b/debian/install
@@ -4,4 +4,3 @@ debian/icons/* usr/share/pixmaps/
debian/zekr.desktop usr/share/applications/
debian/zekrrc etc/zekr/
debian/java_home etc/zekr/
-debian/velocity.properties usr/share/zekr/res/config/lib/
diff --git a/debian/patches/01_build_xml.diff b/debian/patches/01_build_xml.diff
deleted file mode 100644
index c78ee11..0000000
--- a/debian/patches/01_build_xml.diff
+++ /dev/null
@@ -1,73 +0,0 @@
-01_build_xml.dpatch by <mohammad at zekr.org>
-Fixing the path to the Ubuntu/Debian library jar files.
-
-أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
-* remove $src_dir in clean target.
-* Added Class-Path & Main-Class attributes to manifest
-
---- zekr-0.7.1.orig/build.xml
-+++ zekr-0.7.1/build.xml
-@@ -13,7 +13,7 @@
-
- <!-- Directory setup -->
- <property name="srcdir" value="src" />
-- <property name="libdir" value="lib" />
-+ <property name="libdir" value="/usr/share/java" />
- <property name="docsdir" value="docs" />
- <property name="javadocsdir" value="${docsdir}/javadocs" />
-
-@@ -34,17 +34,17 @@
-
- <!-- JAR file dependencies -->
- <property name="swt.jar" value="${libdir}/swt.jar" />
-- <property name="velocity.jar" value="${libdir}/velocity-1.4.jar" />
-- <property name="log4j.jar" value="${libdir}/log4j-1.2.8.jar" />
-- <property name="lucene-core.jar" value="${libdir}/lucene-core-2.3.2.jar" />
-- <property name="lucene-highlighter.jar" value="${libdir}/lucene-highlighter-2.3.2.jar" />
-- <property name="lucene-snowball.jar" value="${libdir}/lucene-snowball-2.3.2.jar" />
-- <property name="commons-logging.jar" value="${libdir}/commons-logging-1.0.4.jar" />
-- <property name="commons-lang.jar" value="${libdir}/commons-lang-2.4.jar" />
-- <property name="commons-io.jar" value="${libdir}/commons-io-1.4.jar" />
-- <property name="commons-collections.jar" value="${libdir}/commons-collections-3.2.1.jar" />
-- <property name="commons-codec.jar" value="${libdir}/commons-codec-1.3.jar" />
-- <property name="commons-configuration.jar" value="${libdir}/commons-configuration-1.5.jar" />
-+ <property name="velocity.jar" value="${libdir}/velocity.jar" />
-+ <property name="log4j.jar" value="${libdir}/log4j-1.2.jar" />
-+ <property name="lucene-core.jar" value="${libdir}/lucene-core.jar" />
-+ <property name="lucene-highlighter.jar" value="${libdir}/lucene-highlighter.jar" />
-+ <property name="lucene-snowball.jar" value="${libdir}/lucene-snowball.jar" />
-+ <property name="commons-logging.jar" value="${libdir}/commons-logging.jar" />
-+ <property name="commons-lang.jar" value="${libdir}/commons-lang.jar" />
-+ <property name="commons-io.jar" value="${libdir}/commons-io.jar" />
-+ <property name="commons-collections.jar" value="${libdir}/commons-collections3.jar" />
-+ <property name="commons-codec.jar" value="${libdir}/commons-codec.jar" />
-+ <property name="commons-configuration.jar" value="${libdir}/commons-configuration.jar" />
-
- <path id="buildlibs">
- <pathelement location="${log4j.jar}" />
-@@ -76,7 +76,16 @@
- </target>
-
- <target name="dist" depends="compile">
-- <jar jarfile="${distdir}" basedir="${build_classdir}" />
-+ <pathconvert property="class_path" pathsep=" ">
-+ <path refid="buildlibs" />
-+ </pathconvert>
-+
-+ <jar jarfile="${distdir}" basedir="${build_classdir}">
-+ <manifest>
-+ <attribute name="Main-Class" value="${main_class}" />
-+ <attribute name="Class-Path" value="${class_path}" />
-+ </manifest>
-+ </jar>
- </target>
-
- <target name="javadoc" depends="compile">
-@@ -96,6 +105,7 @@
- </target>
-
- <target name="clean">
-+ <delete dir="${src_dir}" />
- <delete dir="${builddir}" />
- <delete file="${distdir}" />
- </target>
diff --git a/debian/patches/02_arabic_xml.diff b/debian/patches/02_arabic_xml.diff
deleted file mode 100644
index 923aab3..0000000
--- a/debian/patches/02_arabic_xml.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-Added an arabic translation.
---- zekr-0.7.1.old/res/lang/arabic.xml 2008-09-05 21:27:00.000000000 +0200
-+++ zekr-0.7.1/res/lang/arabic.xml 2008-09-07 11:41:25.000000000 +0200
-@@ -125,7 +125,7 @@
- <text id="MENU_PREV_SAJDA" value="السجدة السابقة" />
- <text id="MENU_NEXT_PAGE" value="الصفحة التالية" />
- <text id="MENU_PREV_PAGE" value="الصفحة السابقة" />
-- <text id="BOOKMARK_THIS_AYA" value="Bookmark This Aya" />
-+ <text id="BOOKMARK_THIS_AYA" value="أضف الآية للإشارات المرجعية" />
- <text id="ROOT" value="جذر" />
- <text id="PAGING_MODE" value="نظام الصفحة" />
- <text id="FULL_SCREEN" value="شاشة كاملة" />
diff --git a/debian/patches/02_build_xml.patch b/debian/patches/02_build_xml.patch
new file mode 100644
index 0000000..09a6b9d
--- /dev/null
+++ b/debian/patches/02_build_xml.patch
@@ -0,0 +1,98 @@
+Author: Mohammad Derakhshani <mohammad at zekr.org>
+ * build.xml changed to use ubuntu's library files for compiling
+Index: zekr-0.7.5~beta2+dfsg/build.xml
+===================================================================
+--- zekr-0.7.5~beta2+dfsg.orig/build.xml 2009-11-29 00:15:29.205830029 -0500
++++ zekr-0.7.5~beta2+dfsg/build.xml 2009-11-29 00:15:33.405686531 -0500
+@@ -11,7 +11,7 @@
+
+ <!-- Directory setup -->
+ <property name="srcdir" value="src" />
+- <property name="libdir" value="lib" />
++ <property name="libdir" value="/usr/share/java" />
+ <property name="docsdir" value="docs" />
+ <property name="javadocsdir" value="${docsdir}/javadocs" />
+
+@@ -20,8 +20,7 @@
+
+ <property name="distdir" value="dist/${distfilename}.jar" />
+
+- <property name="src_dist.jar" value="dist/zekr-src.jar" />
+- <property name="src_dir" value="${builddir}/src" />
++ <property name="src_dir" value="src" />
+
+ <!-- Excevution tags -->
+ <property name="debug" value="off" />
+@@ -31,26 +30,26 @@
+ <property name="dist_javadocs" value="${builddir}/${javadocsdir}" />
+
+ <!-- JAR file dependencies -->
+- <property name="swt.jar" value="${libdir}/swt.jar" />
+- <property name="velocity.jar" value="${libdir}/velocity-1.6.2.jar" />
+- <property name="log4j.jar" value="${libdir}/log4j-1.2.8.jar" />
+- <property name="lucene-core.jar" value="${libdir}/lucene-core-2.3.2.jar" />
+- <property name="lucene-highlighter.jar" value="${libdir}/lucene-highlighter-2.3.2.jar" />
+- <property name="lucene-snowball.jar" value="${libdir}/lucene-snowball-2.3.2.jar" />
+- <property name="commons-logging.jar" value="${libdir}/commons-logging-1.0.4.jar" />
+- <property name="commons-lang.jar" value="${libdir}/commons-lang-2.4.jar" />
+- <property name="commons-io.jar" value="${libdir}/commons-io-1.4.jar" />
+- <property name="commons-collections.jar" value="${libdir}/commons-collections-3.2.1.jar" />
+- <property name="commons-codec.jar" value="${libdir}/commons-codec-1.3.jar" />
+- <property name="commons-configuration.jar" value="${libdir}/commons-configuration-1.5.jar" />
+-
+- <property name="jlayer.jar" value="${libdir}/jlayer-1.0.1.jar" />
+- <property name="basicplayer.jar" value="${libdir}/basicplayer-3.0.jar" />
+- <property name="tritonus-share.jar" value="${libdir}/tritonus-share-0.3.6.jar" />
+- <property name="jorbis.jar" value="${libdir}/jorbis-0.0.17.jar" />
+- <property name="jspeex.jar" value="${libdir}/jspeex-0.9.7.jar" />
+- <property name="mp3spi.jar" value="${libdir}/mp3spi-1.9.4.jar" />
+- <property name="voirbisspi.jar" value="${libdir}/vorbisspi-1.0.3.jar" />
++ <property name="swt.jar" value="/usr/lib/java/swt-gtk-3.5.jar" />
++ <property name="velocity.jar" value="${libdir}/velocity.jar" />
++ <property name="log4j.jar" value="${libdir}/log4j-1.2.jar" />
++ <property name="lucene-core.jar" value="${libdir}/lucene-core.jar" />
++ <property name="lucene-highlighter.jar" value="${libdir}/lucene-highlighter.jar" />
++ <property name="lucene-snowball.jar" value="${libdir}/lucene-snowball.jar" />
++ <property name="commons-logging.jar" value="${libdir}/commons-logging.jar" />
++ <property name="commons-lang.jar" value="${libdir}/commons-lang.jar" />
++ <property name="commons-io.jar" value="${libdir}/commons-io.jar" />
++ <property name="commons-collections.jar" value="${libdir}/commons-collections3.jar" />
++ <property name="commons-codec.jar" value="${libdir}/commons-codec.jar" />
++ <property name="commons-configuration.jar" value="${libdir}/commons-configuration.jar" />
++
++ <property name="jlayer.jar" value="${libdir}/jl.jar" />
++ <property name="basicplayer.jar" value="${libdir}/basicplayer.jar" />
++ <property name="tritonus-share.jar" value="${libdir}/tritonus_share.jar" />
++ <property name="jorbis.jar" value="${libdir}/jorbis.jar" />
++ <property name="jspeex.jar" value="${libdir}/jspeex.jar" />
++ <property name="mp3spi.jar" value="${libdir}/mp3spi.jar" />
++ <property name="voirbisspi.jar" value="${libdir}/vorbisspi.jar" />
+
+ <path id="buildlibs">
+ <pathelement location="${log4j.jar}" />
+@@ -77,8 +76,7 @@
+
+ <target name="compile">
+ <mkdir dir="${build_classdir}" />
+- <unjar src="${src_dist.jar}" dest="${src_dir}">
+- </unjar>
++ <mkdir dir="dist" />
+ <javac srcdir="${src_dir}" encoding="UTF-8" source="1.5" target="1.5"
+ destdir="${build_classdir}" includes="${packagedir}/**" debug="true"
+ verbose="${verbose}">
+@@ -93,6 +91,7 @@
+
+ <target name="dist" depends="compile">
+ <jar jarfile="${distdir}" basedir="${build_classdir}" />
++ <delete dir="${builddir}" />
+ </target>
+
+ <target name="javadoc" depends="compile">
+@@ -117,6 +116,7 @@
+ <target name="clean">
+ <delete dir="${builddir}" />
+ <delete file="${distdir}" />
++ <delete dir="dist" />
+ </target>
+
+ </project>
diff --git a/debian/patches/03_KeyboardShortcut_oldswt.patch b/debian/patches/03_KeyboardShortcut_oldswt.patch
new file mode 100644
index 0000000..fb7b5e6
--- /dev/null
+++ b/debian/patches/03_KeyboardShortcut_oldswt.patch
@@ -0,0 +1,15 @@
+Author: Mohammad Derakhshani <mohammad at zekr.org>
+ * src/net/sf/zekr/common/config/KeyboardShortcut.java changed to be compatible with swt older than 3.6
+Index: zekr-0.7.5~beta2+dfsg/src/net/sf/zekr/common/config/KeyboardShortcut.java
+===================================================================
+--- zekr-0.7.5~beta2+dfsg.orig/src/net/sf/zekr/common/config/KeyboardShortcut.java 2009-11-29 00:18:00.753826906 -0500
++++ zekr-0.7.5~beta2+dfsg/src/net/sf/zekr/common/config/KeyboardShortcut.java 2009-11-29 00:18:08.109879827 -0500
+@@ -163,7 +163,7 @@
+ break;
+ }
+ accelStr = accelStr + s;
+- } else if (accKey >= SWT.F1 && accKey <= SWT.F20) { // try function keys
++ } else if (accKey >= SWT.F1 && accKey <= SWT.F15) { // try function keys
+ int f = accKey - SWT.F1 + 1;
+ accelStr = combKey + "F" + f;
+ } else {
diff --git a/debian/patches/03_mozilla_five_home.diff b/debian/patches/03_mozilla_five_home.diff
index 180f398..f5cc917 100644
--- a/debian/patches/03_mozilla_five_home.diff
+++ b/debian/patches/03_mozilla_five_home.diff
@@ -1,11 +1,11 @@
Set 'options.browser.useMozilla = true' in res/config/config.properties
-Index: zekr-0.7.1/res/config/config.properties
+Index: zekr-0.7.5~beta2+dfsg/res/config/config.properties
===================================================================
---- zekr-0.7.1.orig/res/config/config.properties 2009-01-17 15:16:30.000000000 -0500
-+++ zekr-0.7.1/res/config/config.properties 2009-01-17 15:16:40.000000000 -0500
-@@ -72,7 +72,7 @@
+--- zekr-0.7.5~beta2+dfsg.orig/res/config/config.properties 2009-11-28 23:03:50.145752213 -0500
++++ zekr-0.7.5~beta2+dfsg/res/config/config.properties 2009-11-29 09:45:12.246666055 -0500
+@@ -96,7 +96,7 @@
options.general.resizeableTaskPane = false
- options.search.maxResult = 50
+ options.search.maxResult = 40
options.search.maxResult.maxSpinner = 9999
-options.browser.useMozilla = false
+options.browser.useMozilla = true
diff --git a/debian/patches/10_player_js.diff b/debian/patches/10_player_js.diff
deleted file mode 100644
index 3f2e85c..0000000
--- a/debian/patches/10_player_js.diff
+++ /dev/null
@@ -1,41 +0,0 @@
-Index: zekr-0.7.1/res/ui/js/player.js
-===================================================================
---- zekr-0.7.1.orig/res/ui/js/player.js 2008-09-09 15:51:20.000000000 -0400
-+++ zekr-0.7.1/res/ui/js/player.js 2008-09-09 15:51:49.000000000 -0400
-@@ -64,14 +64,14 @@
- this.contAya = continuous;
- }
-
-- this.setVolume = function(v) { sendEvent('volume', v); this.volume = v; }
-- this.stop = function() { sendEvent('stop'); this.playing = false; }
-+ this.setVolume = function(v) { sendEvent('volume', v, this.playerId); this.volume = v; }
-+ this.stop = function() { sendEvent('stop', '', this.playerId); this.playing = false; }
- this.playPause = function() {
- sendEvent('playpause', '', this.playerId);
- this.playing = !this.playing;
- }
-- this.next = function() { sendEvent('next'); this.playing = true; }
-- this.prev = function() { sendEvent('prev'); this.playing = true; }
-+ this.next = function() { sendEvent('next', '', this.playerId); this.playing = true; }
-+ this.prev = function() { sendEvent('prev', '', this.playerId); this.playing = true; }
- this.goto = function(index) {
- this.index = index;
- sendEvent('playitem', this.index, this.playerId);
-@@ -87,7 +87,7 @@
- if (playlist != "") {
- var playlistItems = $('#hiddenPlaylistItemArray').val();
- player.setup(playlist, $('#hiddenVolume').val(), eval(playlistItems), 0, contAya, 'quranPlayer');
-- buffer.setup(playlist, $('#hiddenVolume').val(), eval(playlistItems), 0, contAya, 'bufferPlayer', '0', '0', 'bufferBar');
-+ buffer.setup(playlist, '0', eval(playlistItems), 0, false, 'bufferPlayer', '0', '0', 'bufferBar');
- setTimeout(function() { // make sure that flash object is created (bug fix for IE)
- ayaFocusHooks = [];
- ayaFocusHooks.push(function(o) {
-@@ -127,7 +127,7 @@
- if (player.index + 1 < ayaCount) {
- buffer.goto(player.index + 1);
- buffer.playPause();
-- buffer.playPause();
-+ if (buffer.playing) buffer.playPause();
- }
- }
- } if (tp == "time") {
diff --git a/debian/patches/disable_update.diff b/debian/patches/disable_update.diff
deleted file mode 100644
index c328ced..0000000
--- a/debian/patches/disable_update.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-Disable auto-update checking.
---- a/res/config/config.properties
-+++ b/res/config/config.properties
-@@ -97,7 +97,7 @@
- index.quran.version =
-
- # Update manager
--update.enable = true
-+update.enable = false
- # how many days between checking for updates. 0 to check never
- update.checkInterval = 7
- update.lastCheck = 2008-03-01
diff --git a/debian/patches/series b/debian/patches/series
index 6cbb1ca..f2382ac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
+02_build_xml.patch
+03_KeyboardShortcut_oldswt.patch
03_mozilla_five_home.diff
-02_arabic_xml.diff
-10_player_js.diff
-01_build_xml.diff
-disable_update.diff
diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in
deleted file mode 100644
index cef83a3..0000000
--- a/debian/po/POTFILES.in
+++ /dev/null
@@ -1 +0,0 @@
-[type: gettext/rfc822deb] templates
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
deleted file mode 100644
index 4bedc88..0000000
--- a/debian/po/templates.pot
+++ /dev/null
@@ -1,114 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: zekr at packages.debian.org\n"
-"POT-Creation-Date: 2009-01-24 14:53-0500\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: string
-#. Description
-#: ../templates:1001
-msgid "Directory holding JW FLV Player (if already downloaded):"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../templates:1001
-msgid ""
-"If you have already downloaded JW FLV Player from the web, type the name of "
-"the directory which contains it. The file is named mediaplayer.swf."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../templates:1001
-msgid ""
-"If you haven't yet downloaded this file, leave this blank and the file will "
-"be downloaded for you. Approximately 32 kB will need to be downloaded."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../templates:1001
-msgid ""
-"If you are not connected to the internet or do not wish to download this "
-"file now, enter \"none\" to abort."
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "JW FLV Player not found"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"The directory you entered either did not exist, or did not contain the JW "
-"FLV Player. Please re-enter the directory containing the JW FLV Player or "
-"enter \"none\" to abort."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../templates:3001
-msgid "Path to archive downloaded file (optional):"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../templates:3001
-msgid ""
-"If you would like to keep a permanent archive of JW FLV Player, enter the "
-"directory where you'd like it stored. If you leave this blank, the file will "
-"be deleted after installation."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../templates:4001
-msgid "URL to download from:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../templates:4001
-msgid ""
-"This package already contains a built-in URL, which should be sufficient for "
-"most people. However, if you'd like to use a different (possibly local) "
-"mirror instead, please enter the full URL to the mediaplayer.swf here. If "
-"not, just leave the field blank."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../templates:5001
-msgid "HTTP proxy to use:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../templates:5001
-msgid ""
-"If you need to use a proxy server, please enter it here (example: "
-"http://192.168.0.1:8080). This will cause the SWF file to be downloaded "
-"using your proxy."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../templates:5001
-msgid "Leave this option blank if you don't use a proxy server."
-msgstr ""
diff --git a/debian/postinst b/debian/postinst
index 6e9e021..44a9b4d 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -22,95 +22,6 @@ set -e
case "$1" in
configure)
-
- db_get zekr/dldir
- LOCALCOPY=$RET
-
- db_get zekr/savedir
- SAVEDIR=$RET
-
- db_get zekr/dlurl
- URLOVERRIDE=$RET
-
- db_get zekr/http_proxy
- http_proxy=$RET
-
- #!/bin/sh
- # Download and install the JW FLV player
- #
- # The following code is based on msttcorefont's postinst which is (C)
- # 2000,2001 Eric Sharkey.
- # You may freely distribute this file under the terms of the GNU General
- # Public License, version 2 or later.
-
- URL="http://developer.longtailvideo.com/trac/export/133/tags/mediaplayer-3.12/mediaplayer.swf"
-
-
- if [ "`echo $LOCALCOPY | tr '[:upper:]' '[:lower:]'`" = "none" ] ; then
- exit 0
- fi
-
- export http_proxy
-
- EXITCODE=0
-
- if [ "$URLOVERRIDE" ] ; then
- URL="$URLOVERRIDE"
- fi
-
- if [ -z "$QUIET_MODE" ] ; then
- cat <<EOF
-
-You are free to download JW FLV player and use it for your own use,
-but you may not redistribute it in modified form, including changes
-to the file name or packaging format.
-
-EOF
- fi
-
- SCRATCHDIR=`mktemp -t -d zekr.XXXXXX`
- chmod 0755 $SCRATCHDIR
- cd $SCRATCHDIR
-
- if [ -n "$QUIET_MODE" ] ; then
- QUIET_ARG="--quiet"
- else
- QUIET_ARG=""
- fi
-
- if [ -z "$LOCALCOPY" ] ; then
- wget --continue --tries=1 --dns-timeout=10 --connect-timeout=5 --read-timeout=300 $QUIET_ARG --directory-prefix . --no-directories --no-background $URL || EXITCODE=1
- else
- cp $LOCALCOPY/mediaplayer.swf .
- fi
-
- if [ -n "$SAVEDIR" ] ; then
- mkdir -p "$SAVEDIR"
- fi
-
- if echo "7860c4ac3d1813363e4d2db06585f170 mediaplayer.swf" | md5sum -c > /dev/null 2>&1 ; then
- if [ -n "$SAVEDIR" ] ; then
- cp mediaplayer.swf "$SAVEDIR"
- fi
-
- mv mediaplayer.swf /usr/share/zekr/res/audio/player.swf
- else
- echo "Bad checksum !"
- EXITCODE=1
- fi
-
-
- cd /
- rm -rf $SCRATCHDIR
-
- if [ -z "$QUIETMODE" ] ; then
- if [ $EXITCODE = 0 ] ; then
- echo "JW FLV player downloaded and installed."
- else
- echo "JW FLV player needs to be installed."
- fi
- fi
-
#indexing Quran text
zekr -index all
#indexing installed Quran translations
diff --git a/debian/prerm b/debian/prerm
index 7e38458..7d47fd1 100644
--- a/debian/prerm
+++ b/debian/prerm
@@ -19,7 +19,6 @@ set -e
case "$1" in
remove|upgrade|deconfigure)
- rm -f /usr/share/zekr/res/audio/player.swf
zekr -clean index-all
rm -rf /usr/share/zekr/res/index/
# rmdir /usr/share/zekr/res/index/
diff --git a/debian/rules b/debian/rules
index 3e828a8..27b5aea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,21 +18,26 @@ override_jh_depends:
jh_depends -jdefault
DEB_SOURCE_PACKAGE := $(shell dpkg-parsechangelog | grep '^Source:' | cut -d' ' -f2)
-DEB_UPSTREAM_VERSION := $(shell dpkg-parsechangelog | grep '^Version:' | cut -d' ' -f2 | cut -d- -f1)
-DIRNAME=${DEB_SOURCE_PACKAGE}-${DEB_UPSTREAM_VERSION}
-TARNAME=${DEB_SOURCE_PACKAGE}_${DEB_UPSTREAM_VERSION}.orig.tar.gz
+DEB_UPSTREAM_VERSION := $(shell dpkg-parsechangelog | grep '^Version:' | cut -d' ' -f2 | cut -d- -f1 | cut -d+ -f1)
+DEB_DFSG_VERSION := $(shell dpkg-parsechangelog | grep '^Version:' | cut -d' ' -f2 | cut -d- -f1)
+DIRNAME=${DEB_SOURCE_PACKAGE}-${DEB_DFSG_VERSION}
+TARNAME=${DEB_SOURCE_PACKAGE}_${DEB_DFSG_VERSION}.orig.tar.gz
SFTARNAME=zekr-`echo "${DEB_UPSTREAM_VERSION}" | sed 's/\~//'`-linux.tar.gz
get-orig-source:
wget http://kent.dl.sourceforge.net/sourceforge/zekr/${SFTARNAME}
tar -xzf ${SFTARNAME}
find zekr/* -type f -print0 | xargs -0 chmod -f 644
+ find zekr/* -type d -print0 | xargs -0 chmod -f 755
chmod 755 zekr/zekr.sh
rm zekr/dist/zekr.jar zekr/res/*.ttf zekr/res/text/trans/yusufali.trans.zip -f
rm zekr/lib -rf
rm -f res/audio/player.swf
- wget http://zekr.org/download/trans/transliteration-en.trans.zip --directory-prefix=zekr/res/text/trans
sed -i 's/trans.default *= *yusufali/trans.default = transliteration-en/i' zekr/res/config/config.properties
+ mkdir zekr/src
+ unzip zekr/dist/zekr-src.jar -d zekr/src/
+ rm zekr/dist/zekr-src.jar
+ rmdir zekr/dist
mv zekr ${DIRNAME}
tar -czf ${TARNAME} ${DIRNAME}
rm ${DIRNAME} ${SFTARNAME} -rf
diff --git a/debian/templates b/debian/templates
deleted file mode 100644
index a7d3043..0000000
--- a/debian/templates
+++ /dev/null
@@ -1,43 +0,0 @@
-Template: zekr/dldir
-Type: string
-_Description: Directory holding JW FLV Player (if already downloaded):
- If you have already downloaded JW FLV Player from the web, type the name of
- the directory which contains it. The file is named mediaplayer.swf.
- .
- If you haven't yet downloaded this file, leave this blank and the file will be
- downloaded for you. Approximately 32 kB will need to be downloaded.
- .
- If you are not connected to the internet or do not wish to download this file
- now, enter "none" to abort.
-
-Template: zekr/baddldir
-Type: error
-_Description: JW FLV Player not found
- The directory you entered either did not exist, or did not contain the JW FLV
- Player. Please re-enter the directory containing the JW FLV Player or enter
- "none" to abort.
-
-Template: zekr/savedir
-Type: string
-_Description: Path to archive downloaded file (optional):
- If you would like to keep a permanent archive of JW FLV Player, enter the
- directory where you'd like it stored. If you leave this blank, the file will
- be deleted after installation.
-
-Template: zekr/dlurl
-Type: string
-_Description: URL to download from:
- This package already contains a built-in URL, which should be sufficient for
- most people. However, if you'd like to use a different (possibly local) mirror
- instead, please enter the full URL to the mediaplayer.swf here. If not, just
- leave the field blank.
-
-Template: zekr/http_proxy
-Type: string
-_Description: HTTP proxy to use:
- If you need to use a proxy server, please enter it here (example:
- http://192.168.0.1:8080). This will cause the SWF file to be downloaded using
- your proxy.
- .
- Leave this option blank if you don't use a proxy server.
-
diff --git a/debian/zekr.sh b/debian/zekr.sh
index be17731..d94f069 100644
--- a/debian/zekr.sh
+++ b/debian/zekr.sh
@@ -38,18 +38,6 @@ arg=$*
####
if [ ! "${ZEKR_WARNINGS}" = "disable" ]; then
- FLASH=1
- if [ ! -e /usr/lib/flashplugin-nonfree/libflashplayer.so -a \
- ! -e /usr/lib/adobe-flashplugin/libflashplayer.so -a \
- ! -e /usr/lib/flashplugin-installer/libflashplayer.so ]; then
- FLASH=0
- zenity --warning \
- --title="flashplugin-nonfree is not installed." \
- --text="Quran recitation cannot be used.\nInstall flashplugin-nonfree to enable Quran recitation."
-# if [ "$FLASH" -eq 0 ]; then
-# firefox -new-window "www.zekr.org/flash"
-# fi
- fi
MEQRN=1
if [ ! -e /usr/share/fonts/truetype/ttf-me_quran/me_quran_volt_newmet.ttf ]; then
MEQRN=0
@@ -61,7 +49,7 @@ arg=$*
# fi
fi
- if [ "$FLASH" -eq 0 -o "$MEQRN" -eq 0 ]; then
+ if [ "$MEQRN" -eq 0 ]; then
zenity --question \
@@ -160,9 +148,9 @@ fi
run () {
MAIN_CLASS=net.sf.zekr.ZekrMain
-JRE_OPT=-Djava.library.path=/usr/lib/jni
-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-lang.jar:/usr/share/java/commons-io.jar:/usr/share/java/commons-logging.jar:/usr/share/java/velocity.jar:/usr/share/java/lucene-highlighter.jar:/usr/share/java/lucene-core.jar:dist/zekr.jar:/usr/share/java/commons-codec.jar:/usr/share/java/lucene-snowball.jar
-VM_ARGS="-Xms10m -Xmx80m"
+JRE_OPT=-Djava.library.path=/usr/lib/jni/
+CLASS_PATH=/usr/share/java/log4j-1.2.jar:/usr/share/java/swt.jar:/usr/share/java/commons-collections3.jar:/usr/share/java/commons-codec.jar:/usr/share/java/commons-configuration.jar:/usr/share/java/commons-lang.jar:/usr/share/java/commons-io.jar:/usr/share/java/commons-logging.jar:/usr/share/java/velocity.jar:/usr/share/java/lucene-highlighter.jar:/usr/share/java/lucene-core.jar:/usr/share/java/commons-codec.jar:/usr/share/java/lucene-snowball.jar:/usr/share/java/jl.jar:/usr/share/java/basicplayer.jar:/usr/share/java/tritonus_share.jar:/usr/share/java/jorbis.jar:/usr/share/java/jspeex.jar:/usr/share/java/mp3spi.jar:/usr/share/java/vorbisspi.jar:dist/zekr.jar:
+VM_ARGS="-Dorg.eclipse.swt.browser.XULRunnerPath=/usr/lib/xulrunner-1.9.1.5 -Xms10m -Xmx80m"
"$ZEKR_JAVA_CMD" $VM_ARGS -cp "$CLASS_PATH" $JRE_OPT $MAIN_CLASS $APP_ARGS $*
}
--
Packaging for Zekr
More information about the Debian-islamic-commits
mailing list