r20906 - in /trunk/libimage-librsvg-perl: LibRSVG.xs debian/changelog debian/control debian/docs debian/examples debian/patches/ debian/patches/init_rsvg.patch debian/patches/series debian/rules

gregoa at users.alioth.debian.org gregoa at users.alioth.debian.org
Tue Jun 10 18:15:54 UTC 2008


Author: gregoa
Date: Tue Jun 10 18:15:54 2008
New Revision: 20906

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=20906
Log:
* Set Standards-Version to 3.7.3 (no changes).
* Split out the patch from 0.07-4 into a separate patch; add quilt
  framework.
* Remove debian/{docs,examples}, let debian/rules install the files.
* Refresh debian/rules, no functional changes.

Added:
    trunk/libimage-librsvg-perl/debian/patches/
    trunk/libimage-librsvg-perl/debian/patches/init_rsvg.patch
    trunk/libimage-librsvg-perl/debian/patches/series
Removed:
    trunk/libimage-librsvg-perl/debian/docs
    trunk/libimage-librsvg-perl/debian/examples
Modified:
    trunk/libimage-librsvg-perl/LibRSVG.xs
    trunk/libimage-librsvg-perl/debian/changelog
    trunk/libimage-librsvg-perl/debian/control
    trunk/libimage-librsvg-perl/debian/rules

Modified: trunk/libimage-librsvg-perl/LibRSVG.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libimage-librsvg-perl/LibRSVG.xs?rev=20906&op=diff
==============================================================================
--- trunk/libimage-librsvg-perl/LibRSVG.xs (original)
+++ trunk/libimage-librsvg-perl/LibRSVG.xs Tue Jun 10 18:15:54 2008
@@ -383,7 +383,6 @@
     CODE:
         Newz(0, RETVAL, 1, SVGLibRSVG);
         RETVAL->pixbuf = NULL;
-        rsvg_init();
     OUTPUT:
         RETVAL
 

Modified: trunk/libimage-librsvg-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libimage-librsvg-perl/debian/changelog?rev=20906&op=diff
==============================================================================
--- trunk/libimage-librsvg-perl/debian/changelog (original)
+++ trunk/libimage-librsvg-perl/debian/changelog Tue Jun 10 18:15:54 2008
@@ -7,6 +7,11 @@
     - don't install empty /usr/share/perl5 directory
     - remove unneeded dh_link call
   * debian/rules: delete /usr/share/perl5 only if it exists.
+  * Set Standards-Version to 3.7.3 (no changes).
+  * Split out the patch from 0.07-4 into a separate patch; add quilt
+    framework.
+  * Remove debian/{docs,examples}, let debian/rules install the files.
+  * Refresh debian/rules, no functional changes.
 
  -- gregor herrmann <gregor+debian at comodo.priv.at>  Tue, 09 Oct 2007 22:29:47 +0200
 

Modified: trunk/libimage-librsvg-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libimage-librsvg-perl/debian/control?rev=20906&op=diff
==============================================================================
--- trunk/libimage-librsvg-perl/debian/control (original)
+++ trunk/libimage-librsvg-perl/debian/control Tue Jun 10 18:15:54 2008
@@ -3,8 +3,9 @@
 Priority: optional
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Antonio S. de A. Terceiro <asaterceiro at inf.ufrgs.br>, Niko Tyni <ntyni at iki.fi>, Krzysztof Krzyzaniak (eloy) <eloy at debian.org>
-Build-Depends: debhelper (>= 5), perl (>= 5.6.0-16), librsvg2-dev
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 5), perl (>= 5.6.0-16), librsvg2-dev,
+ quilt (>= 0.40)
+Standards-Version: 3.7.3
 Homepage: http://search.cpan.org/dist/Image-LibRSVG/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libimage-librsvg-perl/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/libimage-librsvg-perl/

Added: trunk/libimage-librsvg-perl/debian/patches/init_rsvg.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libimage-librsvg-perl/debian/patches/init_rsvg.patch?rev=20906&op=file
==============================================================================
--- trunk/libimage-librsvg-perl/debian/patches/init_rsvg.patch (added)
+++ trunk/libimage-librsvg-perl/debian/patches/init_rsvg.patch Tue Jun 10 18:15:54 2008
@@ -1,0 +1,14 @@
+Author: Niko Tyno
+Description: Initializing RSVG at the XS constructor
+Bug: #430805
+
+--- libimage-librsvg-perl.orig/LibRSVG.xs
++++ libimage-librsvg-perl/LibRSVG.xs
+@@ -383,6 +383,7 @@
+     CODE:
+         Newz(0, RETVAL, 1, SVGLibRSVG);
+         RETVAL->pixbuf = NULL;
++        rsvg_init();
+     OUTPUT:
+         RETVAL
+ 

Added: trunk/libimage-librsvg-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libimage-librsvg-perl/debian/patches/series?rev=20906&op=file
==============================================================================
--- trunk/libimage-librsvg-perl/debian/patches/series (added)
+++ trunk/libimage-librsvg-perl/debian/patches/series Tue Jun 10 18:15:54 2008
@@ -1,0 +1,1 @@
+init_rsvg.patch

Modified: trunk/libimage-librsvg-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libimage-librsvg-perl/debian/rules?rev=20906&op=diff
==============================================================================
--- trunk/libimage-librsvg-perl/debian/rules (original)
+++ trunk/libimage-librsvg-perl/debian/rules Tue Jun 10 18:15:54 2008
@@ -1,80 +1,76 @@
 #!/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.
 
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# If set to a true value then MakeMaker's prompt function will
+# always return the default without waiting for user input.
+export PERL_MM_USE_DEFAULT=1
+
+include /usr/share/quilt/quilt.make
+
+PERL   ?= /usr/bin/perl
+PACKAGE = $(shell dh_listpackages)
+TMP     = $(CURDIR)/debian/$(PACKAGE)
+
+# Allow disabling build optimisation by setting noopt in
+# $DEB_BUILD_OPTIONS
 CFLAGS = -Wall -g
-
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
+        CFLAGS += -O0
 else
-	CFLAGS += -O2
+        CFLAGS += -O2
 endif
 
-configure: configure-stamp
-configure-stamp:
+build: build-stamp
+build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
-	# Add here commands to configure the package.
+	$(PERL) Makefile.PL INSTALLDIRS=vendor LIBS='-lrsvg-2'
+	$(MAKE) OPTIMIZE="$(CFLAGS)" LD_RUN_PATH=""
+	$(MAKE) test
+	touch $@
 
-	touch configure-stamp
-	perl Makefile.PL INSTALLDIRS=vendor LIBS='-lrsvg-2'
-
-
-build: build-stamp
-	$(MAKE) OPTIMIZE="$(CFLAGS)"
-
-build-stamp: configure-stamp 
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE) OPTIMIZE="$(CFLAGS)"
-
-        # test the package
-	$(MAKE) test
-
-	touch build-stamp
-
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp configure-stamp
+	dh_clean build-stamp install-stamp examples/test.png
+	[ ! -f Makefile ] || $(MAKE) realclean
 
-	# Add here commands to clean up after the build process.
-	[ ! -f Makefile ] || $(MAKE) realclean
-	rm -f examples/test.png
-
-	dh_clean 
-
-install: build
+install: install-stamp
+install-stamp: build-stamp
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	# Add here commands to install the package into debian/libimage-rsvg-perl.
-	$(MAKE) install PREFIX=$(CURDIR)/debian/libimage-librsvg-perl/usr
-	
-	[ ! -d $(CURDIR)/debian/libimage-librsvg-perl/usr/share/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(CURDIR)/debian/libimage-librsvg-perl/usr/share/perl5
-
+	dh_clean -k
+	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
+	[ ! -d $(TMP)/usr/share/perl5 ] || \
+		rmdir --ignore-fail-on-non-empty --parents --verbose \
+		$(TMP)/usr/share/perl5
+	touch $@
 
 # Build architecture-independent files here.
 binary-indep: build install
-# We have nothing to do by default.
+# We have nothing to do here for an architecture-dependent package
 
 # Build architecture-dependent files here.
 binary-arch: build install
 	dh_testdir
 	dh_testroot
+	dh_installexamples examples/*
+	dh_installdocs README examples.pl
 	dh_installchangelogs Changes
-	dh_installdocs
-	dh_installexamples
-	dh_installman
+	dh_shlibdeps
 	dh_strip
+	dh_perl
 	dh_compress --exclude=.svg --exclude=examples.pl
 	dh_fixperms
-	dh_perl
 	dh_installdeb
-	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install




More information about the Pkg-perl-cvs-commits mailing list