[Debian-islamic-commits] [SCM] Packaging for Zekr branch, master, updated. 450dd1729a4159f22fa583bd2c0d0ed5cdef768e

[أحمد المحمودي (Ahmed El-Mahmoudy)]

The following commit has been merged in the master branch:
commit 450dd1729a4159f22fa583bd2c0d0ed5cdef768e
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
Date:   Tue Dec 22 14:33:21 2009 +0200

    * Refresh build_manifest.diff
    * Just add sura-header.png to res/images/ instead of doing the
      debian/install workaround

diff --git a/debian/changelog b/debian/changelog
index 8fca8ef..d8b5338 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-zekr (0.7.5~beta2+dfsg-1~1.gbpc57c8f) UNRELEASED; urgency=low
+zekr (0.7.5~beta2+dfsg-1~3.gbp16ee3d) UNRELEASED; urgency=low
 
-  ** SNAPSHOT build @c57c8f8cc0e26e65c1da7f1b791bcf7e141a084e **
+  ** SNAPSHOT build @16ee3d427ede2530eb222b380fc784df00070372 **
 
   [ Mohammad Derakhshani ]
   * New upstream release. (Closes: #561730) (LP: #267412)
@@ -21,8 +21,19 @@ zekr (0.7.5~beta2+dfsg-1~1.gbpc57c8f) UNRELEASED; urgency=low
   * Added build_manifest.diff patch to add Class-Path & Main-Class
     attributes to manifest
   * Added debian/install, debian/docs
-
- -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>  Tue, 01 Dec 2009 11:31:18 +0200
+  * Add jogg.jar to class path
+  * debian/control: Added Vcs-* headers
+  * According to debian/copyright, zekr should be in non-free
+  * debian/zekr.sh:
+    + It is enough to just have /usr/share/java in CLASSPATH
+    + Set xulrunner path to /usr/lib/xulrunner-$(xulrunner --gre-version)
+      to make it adaptive to xulrunner upgrades.
+  * debian/rules:
+    + Delete res/images/sura-header.png from orig tarball since its license is
+      unknown.
+  * Add a free (under same license of the package) sura-header.png
+
+ -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>  Tue, 22 Dec 2009 13:32:22 +0200
 
 zekr (0.7.1-3~ppa11) jaunty; urgency=low
 
diff --git a/debian/install b/debian/install
index c60b195..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/sura-header.png usr/share/zekr/res/images/
diff --git a/debian/patches/build_manifest.diff b/debian/patches/build_manifest.diff
index 25f4105..19b065f 100644
--- a/debian/patches/build_manifest.diff
+++ b/debian/patches/build_manifest.diff
@@ -3,7 +3,7 @@ Forwarded: yes
 Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
 --- a/build.xml
 +++ b/build.xml
-@@ -90,7 +90,15 @@
+@@ -89,7 +89,15 @@
  	</target>
  
  	<target name="dist" depends="compile">
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
index 103cc2a..566bb7e 100644
--- a/debian/source/include-binaries
+++ b/debian/source/include-binaries
@@ -1 +1 @@
-sura-header.png
+res/image/sura-header.png
diff --git a/debian/sura-header.png b/res/image/sura-header.png
similarity index 100%
rename from debian/sura-header.png
rename to res/image/sura-header.png

-- 
Packaging for Zekr