r47507 - in /trunk/libjavascript-perl/debian: changelog control patches/ patches/series patches/use-set-operation-callback rules

[diocles-guest at users.alioth.debian.org]

Author: diocles-guest
Date: Thu Nov 19 22:47:47 2009
New Revision: 47507

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=47507
Log:
Add quilt; use JS_SetOperationCallback.

Added:
    trunk/libjavascript-perl/debian/patches/
    trunk/libjavascript-perl/debian/patches/series
    trunk/libjavascript-perl/debian/patches/use-set-operation-callback
Modified:
    trunk/libjavascript-perl/debian/changelog
    trunk/libjavascript-perl/debian/control
    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=47507&op=diff
==============================================================================
--- trunk/libjavascript-perl/debian/changelog (original)
+++ trunk/libjavascript-perl/debian/changelog Thu Nov 19 22:47:47 2009
@@ -2,6 +2,10 @@
 
   * debian/control:
     + Add self to Uploaders.
+    + Add quilt to Build-Depends.
+  * debian/rules: Use quilt patch system.
+  * debian/patches/use-set-operation-callback: New patch for changes in
+    Xulrunner API.
 
  -- Tim Retout <tim at retout.co.uk>  Thu, 19 Nov 2009 22:39:21 +0000
 

Modified: trunk/libjavascript-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjavascript-perl/debian/control?rev=47507&op=diff
==============================================================================
--- trunk/libjavascript-perl/debian/control (original)
+++ trunk/libjavascript-perl/debian/control Thu Nov 19 22:47:47 2009
@@ -1,7 +1,7 @@
 Source: libjavascript-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 7), libmozjs-dev,
+Build-Depends: debhelper (>= 7), quilt, libmozjs-dev,
  perl (>= 5.8.0-7), libtest-pod-coverage-perl, libtest-pod-perl, 
  libtest-exception-perl, libinline-perl
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>

Added: trunk/libjavascript-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjavascript-perl/debian/patches/series?rev=47507&op=file
==============================================================================
--- trunk/libjavascript-perl/debian/patches/series (added)
+++ trunk/libjavascript-perl/debian/patches/series Thu Nov 19 22:47:47 2009
@@ -1,0 +1,1 @@
+use-set-operation-callback

Added: trunk/libjavascript-perl/debian/patches/use-set-operation-callback
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjavascript-perl/debian/patches/use-set-operation-callback?rev=47507&op=file
==============================================================================
--- trunk/libjavascript-perl/debian/patches/use-set-operation-callback (added)
+++ trunk/libjavascript-perl/debian/patches/use-set-operation-callback Thu Nov 19 22:47:47 2009
@@ -1,0 +1,23 @@
+Description: Update for changes in Xulrunner API.
+Author: Tim Retout <tim at retout.co.uk>
+
+--- a/JavaScript.xs
++++ b/JavaScript.xs
+@@ -165,7 +165,7 @@
+             }
+ 
+             cx->branch_handler = NULL;
+-            JS_SetBranchCallback(PJS_GetJSContext(cx), NULL);
++            JS_SetOperationCallback(PJS_GetJSContext(cx), NULL);
+         }
+         else if (SvROK(handler) && SvTYPE(SvRV(handler)) == SVt_PVCV) {
+             if (cx->branch_handler != NULL) {
+@@ -173,7 +173,7 @@
+             }
+ 
+             cx->branch_handler = SvREFCNT_inc(handler);
+-            JS_SetBranchCallback(PJS_GetJSContext(cx), PJS_branch_handler);
++            JS_SetOperationCallback(PJS_GetJSContext(cx), PJS_branch_handler);
+         }
+ 
+ void

Modified: trunk/libjavascript-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjavascript-perl/debian/rules?rev=47507&op=diff
==============================================================================
--- trunk/libjavascript-perl/debian/rules (original)
+++ trunk/libjavascript-perl/debian/rules Thu Nov 19 22:47:47 2009
@@ -5,6 +5,7 @@
 # be used freely wherever it is useful.
 
 # use quilt to manage patches
+include /usr/share/quilt/quilt.make
 
 export PERL_MM_USE_DEFAULT=1
 PACKAGE=$(shell dh_listpackages)
@@ -25,7 +26,7 @@
 endif
 
 build: build-stamp
-build-stamp:
+build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 	JS_INC=/usr/include/nspr/:/usr/include/mozjs/ JS_THREADSAFE=1 JS_ENABLE_E4X=1\
 		JS_UTF8=0 JS_FORCE=1 $(PERL) Makefile.PL INSTALLDIRS=vendor
@@ -33,7 +34,7 @@
 	JS_INC=/usr/include/nspr/:/usr/include/mozjs/ $(MAKE) test
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	[ ! -f Makefile ] || $(MAKE) realclean