[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#732422: pu: package edbrowse/3.4.8-2



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: pu

Hello,

edbrowse was removed from stable with bug #723114 due to failing
to build with Iceaweasel 17.  I propose to fix the build by using
libmozjs185-dev instead of libmozjs-dev, as the attached patch does.

Samuel

-- System Information:
Debian Release: jessie/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.12.0 (SMP w/8 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
diff -Nru edbrowse-3.4.8/debian/changelog edbrowse-3.4.8/debian/changelog
--- edbrowse-3.4.8/debian/changelog	2012-06-08 23:45:28.000000000 +0200
+++ edbrowse-3.4.8/debian/changelog	2013-12-17 22:18:16.000000000 +0100
@@ -1,3 +1,11 @@
+edbrowse (3.4.8-2+wheezy1) wheezy; urgency=low
+
+  * Revert to using SpiderMonkey 1.8.5 to fix FTBFS. (Closes: #707346)
+    - debian/control: Depend on libmozjs185-dev instead of libmozjs-dev.
+    - debian/rules: Drop path changes to libmozjs.
+
+ -- Samuel Thibault <sthibault@debian.org>  Tue, 17 Dec 2013 22:16:26 +0100
+
 edbrowse (3.4.8-2) unstable; urgency=low
 
   * control: Depend on hardening-check.
diff -Nru edbrowse-3.4.8/debian/control edbrowse-3.4.8/debian/control
--- edbrowse-3.4.8/debian/control	2012-02-25 17:33:07.000000000 +0100
+++ edbrowse-3.4.8/debian/control	2013-12-17 22:17:16.000000000 +0100
@@ -4,7 +4,7 @@
 Uploaders: Kapil Hari Paranjape <kapil@debian.org>, Mario Lang <mlang@debian.org>, Gergely Nagy <algernon@balabit.hu>, Samuel Thibault <sthibault@debian.org>
 Maintainer: Jean-Philippe MENGUAL <texou@accelibreinfo.eu>
 Build-Depends: debhelper (>= 7.0.50), libssl-dev (>= 0.9.8b), libpcre3-dev (>= 6.4),
- libcurl4-openssl-dev (>= 7.18.2), libreadline6-dev (>= 6.2-2), libmozjs-dev, hardening-wrapper
+ libcurl4-openssl-dev (>= 7.18.2), libreadline6-dev (>= 6.2-2), libmozjs185-dev, hardening-wrapper
 Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/edbrowse/
 Homepage: http://the-brannons.com/
 Standards-Version: 3.9.3
diff -Nru edbrowse-3.4.8/debian/rules edbrowse-3.4.8/debian/rules
--- edbrowse-3.4.8/debian/rules	2011-11-06 23:49:02.000000000 +0100
+++ edbrowse-3.4.8/debian/rules	2013-12-17 22:18:09.000000000 +0100
@@ -6,7 +6,7 @@
 	dh $@
 
 override_dh_auto_build:
-	dh_auto_build -- CFLAGS="$(CFLAGS) -I/usr/include/mozjs -DXP_UNIX" LIBS="-lpcre -lssl -lmozjs -lcurl -lcrypto" JSLIB="-lmozjs" STATICLIBS="-lodbc -lpcre -lm -lmozjs -lcurl -lssl -lc -lcrypto -lpthread -lm -ldl -lrt" LFLAGS=""
+	dh_auto_build -- CPPFLAGS='$(CPPFLAGS) $$(JS_CPPFLAGS)'
 	sed -e's;^\.\.\(.\);.\1;' -e's;^ \.;.;' < doc/man-edbrowse-debian.1 > debian/edbrowse.1
 
 override_dh_auto_clean:

Reply to: