r19709 - in /trunk/libjavascript-perl/debian: changelog patches/makefile-compile.patch patches/mozjs.patch patches/series rules

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Thu May  8 19:47:48 2008
New Revision: 19709

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=19709
Log:
* Set JS_FORCE=1 in debian/rules, avoids building a test binary; drop
  patch makefile-compile.patch accordingly and remove touching Makefile in
  debian/rule's clean target.
* Refresh mozjs.patch.

Removed:
    trunk/libjavascript-perl/debian/patches/makefile-compile.patch
Modified:
    trunk/libjavascript-perl/debian/changelog
    trunk/libjavascript-perl/debian/patches/mozjs.patch
    trunk/libjavascript-perl/debian/patches/series
    trunk/libjavascript-perl/debian/rules

Modified: trunk/libjavascript-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjavascript-perl/debian/changelog?rev=19709&op=diff
==============================================================================
--- trunk/libjavascript-perl/debian/changelog (original)
+++ trunk/libjavascript-perl/debian/changelog Thu May  8 19:47:48 2008
@@ -1,8 +1,12 @@
 libjavascript-perl (1.08-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Set JS_FORCE=1 in debian/rules, avoids building a test binary; drop
+    patch makefile-compile.patch accordingly and remove touching Makefile in
+    debian/rule's clean target.
+  * Refresh mozjs.patch.
 
- -- gregor herrmann <gregoa at debian.org>  Thu, 08 May 2008 21:36:48 +0200
+ -- gregor herrmann <gregoa at debian.org>  Thu, 08 May 2008 21:45:43 +0200
 
 libjavascript-perl (1.06-2) unstable; urgency=low
 

Modified: trunk/libjavascript-perl/debian/patches/mozjs.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjavascript-perl/debian/patches/mozjs.patch?rev=19709&op=diff
==============================================================================
--- trunk/libjavascript-perl/debian/patches/mozjs.patch (original)
+++ trunk/libjavascript-perl/debian/patches/mozjs.patch Thu May  8 19:47:48 2008
@@ -3,7 +3,7 @@
 Preparation for the newer libmozjs-dev
 --- libjavascript-perl.orig/JavaScript.xs
 +++ libjavascript-perl/JavaScript.xs
-@@ -266,7 +266,7 @@
+@@ -294,7 +294,7 @@
              tmp = SvIV((SV*)SvRV(PJS_call_perl_method("content", function, NULL)));
              func = INT2PTR(JSFunction *, tmp);
  

Modified: trunk/libjavascript-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjavascript-perl/debian/patches/series?rev=19709&op=diff
==============================================================================
--- trunk/libjavascript-perl/debian/patches/series (original)
+++ trunk/libjavascript-perl/debian/patches/series Thu May  8 19:47:48 2008
@@ -1,3 +1,2 @@
 pod-errors
-makefile-compile.patch
 mozjs.patch

Modified: trunk/libjavascript-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjavascript-perl/debian/rules?rev=19709&op=diff
==============================================================================
--- trunk/libjavascript-perl/debian/rules (original)
+++ trunk/libjavascript-perl/debian/rules Thu May  8 19:47:48 2008
@@ -29,7 +29,7 @@
 build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 	JS_INC=/usr/include/nspr/:/usr/include/mozjs/ JS_THREADSAFE=1 JS_ENABLE_E4X=1\
-		JS_UTF8=0 $(PERL) Makefile.PL INSTALLDIRS=vendor
+		JS_UTF8=0 JS_FORCE=1 $(PERL) Makefile.PL INSTALLDIRS=vendor
 	$(MAKE) OPTIMIZE="$(CFLAGS) -DMOZILLA_1_8_BRANCH=1" LD_RUN_PATH=""
 	JS_INC=/usr/include/nspr/:/usr/include/mozjs/ $(MAKE) test
 	touch build-stamp
@@ -37,7 +37,7 @@
 clean: unpatch
 	dh_testdir
 	dh_testroot
-	[ ! -f Makefile ] || ( touch Makefile && $(MAKE) realclean )
+	[ ! -f Makefile ] || $(MAKE) realclean
 	$(RM) JavaScript_Env.h
 	# this is cruft from Inline::C in t/24-c-level-interrupt-handler.t
 	$(RM) -r _Inline/