unblock b2evolution_2.4.2-4

[Xavier Luthi <xavier@caroxav.be>]

Hi,

Can you please unblock b2evolution_2.4.2-4? It contain a fix for a
grave bug preventing the installation of the package (#508424), as
well as some trivial fix for warnings reported by lintian.

The debdiff is attached.

Thanks,
 Xavier

diff -u b2evolution-2.4.2/debian/changelog b2evolution-2.4.2/debian/changelog
--- b2evolution-2.4.2/debian/changelog
+++ b2evolution-2.4.2/debian/changelog
@@ -1,3 +1,14 @@
+b2evolution (2.4.2-4) unstable; urgency=high
+
+  * Fix many lintian warnings:
+    + debian/watch file added
+    + debian/control: b2evolution depends on ${misc:Depends}
+    + remove embedded code by depending on libjs-jquery packages
+  * debian/config: remove debconf lookup for 
+    base-config/get-hostname (Closes: #508424)
+
+ -- Xavier Luthi <xavier@caroxav.be>  Thu, 11 Dec 2008 10:24:53 +0100
+
 b2evolution (2.4.2-3) unstable; urgency=low
 
   * Swedish translation of debconf template added (Closes: #501239).
diff -u b2evolution-2.4.2/debian/rules b2evolution-2.4.2/debian/rules
--- b2evolution-2.4.2/debian/rules
+++ b2evolution-2.4.2/debian/rules
@@ -21,7 +21,7 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	dh_install -XCVS -Xmedia
+	dh_install -XCVS -Xmedia -Xjquery.js -Xjquery.min.js
 
 #commands to create the media directory and its index file
 	install -m 755 -o www-data -g www-data -d $(GVARDIR)/media
diff -u b2evolution-2.4.2/debian/control b2evolution-2.4.2/debian/control
--- b2evolution-2.4.2/debian/control
+++ b2evolution-2.4.2/debian/control
@@ -9,7 +9,7 @@
 
 Package: b2evolution
 Architecture: all
-Depends: ${debconf-depends}, apache | apache2 | apache-ssl | apache-perl | httpd, php4 | php5, php4-mysql | php5-mysql, makepasswd
+Depends: ${debconf-depends}, ${misc:Depends}, apache | apache2 | apache-ssl | apache-perl | httpd, php4 | php5, php4-mysql | php5-mysql, makepasswd, libjs-jquery (>= 1.2.6)
 Recommends: virtual-mysql-server
 Description: multilingual, multiuser, multi-blog engine
  b2evolution is a classy news and weblog tool featuring:
diff -u b2evolution-2.4.2/debian/config b2evolution-2.4.2/debian/config
--- b2evolution-2.4.2/debian/config
+++ b2evolution-2.4.2/debian/config
@@ -33,11 +33,9 @@
     if [ "$RET" = "false" ]; then
 	
         #get hostname used in default value
-	db_get base-config/get-hostname || true
-	if [ -z "$RET" ]; then
+	B2EVO_HOSTNAME=$(hostname --fqdn 2>/dev/null)
+	if [ -z "$B2EVO_HOSTNAME" ]; then
 	    B2EVO_HOSTNAME="www.example.com"
-	else
-	    B2EVO_HOSTNAME=$RET
 	fi
     
 	db_set b2evolution/host  "http://$B2EVO_HOSTNAME/b2evolution"; || true
diff -u b2evolution-2.4.2/debian/links b2evolution-2.4.2/debian/links
--- b2evolution-2.4.2/debian/links
+++ b2evolution-2.4.2/debian/links
@@ -3,0 +4,2 @@
+usr/share/javascript/jquery/jquery.js usr/share/b2evolution/rsc/js/jquery.js
+usr/share/javascript/jquery/jquery.min.js usr/share/b2evolution/rsc/js/jquery.min.js
only in patch2:
unchanged:
--- b2evolution-2.4.2.orig/debian/watch
+++ b2evolution-2.4.2/debian/watch
@@ -0,0 +1,5 @@
+#version of the watch file
+version=3
+# watch control file
+http://sf.net/evocms/b2evolution-(.*)-stable-.+\.zip
+

Attachment: signature.asc
Description: Digital signature