r47761 - in /trunk/libjavascript-perl/debian: changelog control rules

Thu Nov 26 00:17:24 UTC 2009

Author: diocles-guest
Date: Thu Nov 26 00:17:18 2009
New Revision: 47761

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=47761
Log:
Use dh7 rules file with quilt and overrides.

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=47761&op=diff
==============================================================================

--- trunk/libjavascript-perl/debian/changelog (original)
+++ trunk/libjavascript-perl/debian/changelog Thu Nov 26 00:17:18 2009
@@ -2,9 +2,12 @@
 
   * debian/control:
     + Add self to Uploaders.
-    + Add quilt to Build-Depends.
+    + Add quilt (>= 0.46-7) and debhelper (>= 7.0.50~) to Build-Depends.
     + Remove version from perl Build-Depends.
-  * debian/rules: Use quilt patch system.
+  * debian/rules:
+    + Rewrite to use dh, plus overrides where needed.
+    + Use quilt patch system.
+    + No longer install README or TODO.
   * debian/patches/remove-branch-handler: Remove branch handling that has
     been broken by changes in xulrunner API. (Closes: #551251)
 

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

Modified: trunk/libjavascript-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjavascript-perl/debian/rules?rev=47761&op=diff
==============================================================================
--- trunk/libjavascript-perl/debian/rules (original)
+++ trunk/libjavascript-perl/debian/rules Thu Nov 26 00:17:18 2009
@@ -1,85 +1,24 @@
 #!/usr/bin/make -f
-# This debian/rules file is provided as a template for normal perl
-# packages. It was created by Marc Brockschmidt <marc at dch-faq.de> for
-# the Debian Perl Group (http://pkg-perl.alioth.debian.org/) but may
-# be used freely wherever it is useful.
 
-# use quilt to manage patches
-include /usr/share/quilt/quilt.make
+PACKAGE = $(shell dh_listpackages)
+TMP     = $(CURDIR)/debian/$(PACKAGE)
 
-export PERL_MM_USE_DEFAULT=1
-PACKAGE=$(shell dh_listpackages)
+%:
+	JS_INC=/usr/include/nspr/:/usr/include/mozjs/ \
+	JS_THREADSAFE=1 JS_ENABLE_E4X=1 JS_UTF8=0 JS_FORCE=1 \
+	dh --with quilt $@
 
-ifndef PERL
-PERL = /usr/bin/perl
-endif
-
-TMP     =$(CURDIR)/debian/$(PACKAGE)
-
-# Allow disabling build optimation by setting noopt in
-# $DEB_BUILD_OPTIONS
-CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-        CFLAGS += -O0
-else
-        CFLAGS += -O2
-endif
-
-build: 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
-	$(MAKE) OPTIMIZE="$(CFLAGS) -DMOZILLA_1_8_BRANCH=1" LD_RUN_PATH=""
-	JS_INC=/usr/include/nspr/:/usr/include/mozjs/ $(MAKE) test
-	touch build-stamp
-
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	[ ! -f Makefile ] || $(MAKE) realclean
+override_dh_clean:
 	$(RM) JavaScript_Env.h
 	# this is cruft from Inline::C in t/24-c-level-interrupt-handler.t
 	$(RM) -r _Inline/
-	dh_clean build-stamp install-stamp
+	dh_clean
 
-install: install-stamp
-install-stamp: build-stamp
-	dh_testdir
-	dh_testroot
-	dh_prep
-	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
+override_dh_auto_build:
+	JS_INC=/usr/include/nspr/:/usr/include/mozjs/ \
+	dh_auto_build -- OPTIMIZE="$(CFLAGS) -DMOZILLA_1_8_BRANCH=1" \
+			 LD_RUN_PATH=""
 
-	# As this is a architecture dependent package, we are not supposed to install
-	# stuff to /usr/share/perl5. MakeMaker creates the dirs, we delete them from 
-	# the deb:
-	[ ! -d $(TMP)/usr/share/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(TMP)/usr/share/perl5
-
-	# remove the execute bit
+override_dh_fixperms:
+	dh_fixperms
 	chmod 644 $(TMP)/usr/lib/perl5/auto/JavaScript/typemap
-
-	touch install-stamp
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs README TODO
-	dh_installchangelogs Changes
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-	dh_perl
-	dh_shlibdeps -v
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install


