r13715 - in /trunk/libcrypt-openssl-rsa-perl/debian: changelog control patches/ patches/Makefile.PL-no-ssl-in-LIBS.patch patches/series rules

dmn at users.alioth.debian.org dmn at users.alioth.debian.org
Sun Jan 27 20:43:38 UTC 2008


Author: dmn
Date: Sun Jan 27 20:43:38 2008
New Revision: 13715

URL: http://svn.debian.org/wsvn/?sc=1&rev=13715
Log:
* debian/rules: sync with dh-make-perl's template
* add Makefile.PL-no-ssl-in-LIBS.patch and involve quilt in the build
  process

Added:
    trunk/libcrypt-openssl-rsa-perl/debian/patches/
    trunk/libcrypt-openssl-rsa-perl/debian/patches/Makefile.PL-no-ssl-in-LIBS.patch
    trunk/libcrypt-openssl-rsa-perl/debian/patches/series
Modified:
    trunk/libcrypt-openssl-rsa-perl/debian/changelog
    trunk/libcrypt-openssl-rsa-perl/debian/control
    trunk/libcrypt-openssl-rsa-perl/debian/rules

Modified: trunk/libcrypt-openssl-rsa-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libcrypt-openssl-rsa-perl/debian/changelog?rev=13715&op=diff
==============================================================================
--- trunk/libcrypt-openssl-rsa-perl/debian/changelog (original)
+++ trunk/libcrypt-openssl-rsa-perl/debian/changelog Sun Jan 27 20:43:38 2008
@@ -13,6 +13,9 @@
   * debhelper compatibility level 6
   * add ${perl:Depends} to Depends. Thanks, Niko.
   * use dist-based upstream URL in debian/copyright
+  * debian/rules: sync with dh-make-perl's template
+  * add Makefile.PL-no-ssl-in-LIBS.patch and involve quilt in the build
+    process
 
  -- Damyan Ivanov <dmn at debian.org>  Sun, 27 Jan 2008 22:12:46 +0200
 

Modified: trunk/libcrypt-openssl-rsa-perl/debian/control
URL: http://svn.debian.org/wsvn/trunk/libcrypt-openssl-rsa-perl/debian/control?rev=13715&op=diff
==============================================================================
--- trunk/libcrypt-openssl-rsa-perl/debian/control (original)
+++ trunk/libcrypt-openssl-rsa-perl/debian/control Sun Jan 27 20:43:38 2008
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Damyan Ivanov <dmn at debian.org>
-Build-Depends: debhelper (>= 6), libcrypt-openssl-random-perl, libssl-dev
+Build-Depends: debhelper (>= 6), libcrypt-openssl-random-perl, libssl-dev, quilt
 Standards-Version: 3.7.3
 Homepage: http://perl-openssl.sourceforge.net/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libcrypt-openssl-rsa-perl/

Added: trunk/libcrypt-openssl-rsa-perl/debian/patches/Makefile.PL-no-ssl-in-LIBS.patch
URL: http://svn.debian.org/wsvn/trunk/libcrypt-openssl-rsa-perl/debian/patches/Makefile.PL-no-ssl-in-LIBS.patch?rev=13715&op=file
==============================================================================
--- trunk/libcrypt-openssl-rsa-perl/debian/patches/Makefile.PL-no-ssl-in-LIBS.patch (added)
+++ trunk/libcrypt-openssl-rsa-perl/debian/patches/Makefile.PL-no-ssl-in-LIBS.patch Sun Jan 27 20:43:38 2008
@@ -1,0 +1,11 @@
+--- libcrypt-openssl-rsa-perl.orig/Makefile.PL
++++ libcrypt-openssl-rsa-perl/Makefile.PL
+@@ -11,7 +11,7 @@
+     'DISTNAME' => 'Crypt-OpenSSL-RSA',
+     'VERSION_FROM' => 'RSA.pm', # finds $VERSION
+     'OBJECT' => 'RSA.o',
+-    'LIBS'	=> ['-lssl -lcrypto'],   # e.g., '-lm'
++    'LIBS'	=> ['-lcrypto'],   # e.g., '-lm'
+     'PREREQ_PM' => { 'Crypt::OpenSSL::Random' => 0 },
+     'DEFINE'	=> '-DPERL5 -DOPENSSL_NO_KRB5',
+     # perl-5.8/gcc-3.2 needs -DPERL5, and redhat9 likes -DOPENSSL_NO_KRB5

Added: trunk/libcrypt-openssl-rsa-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/trunk/libcrypt-openssl-rsa-perl/debian/patches/series?rev=13715&op=file
==============================================================================
--- trunk/libcrypt-openssl-rsa-perl/debian/patches/series (added)
+++ trunk/libcrypt-openssl-rsa-perl/debian/patches/series Sun Jan 27 20:43:38 2008
@@ -1,0 +1,1 @@
+Makefile.PL-no-ssl-in-LIBS.patch

Modified: trunk/libcrypt-openssl-rsa-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libcrypt-openssl-rsa-perl/debian/rules?rev=13715&op=diff
==============================================================================
--- trunk/libcrypt-openssl-rsa-perl/debian/rules (original)
+++ trunk/libcrypt-openssl-rsa-perl/debian/rules Sun Jan 27 20:43:38 2008
@@ -7,65 +7,73 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/quilt/quilt.make
+
 PACKAGE=$(shell dh_listpackages)
 
 ifndef PERL
 PERL = /usr/bin/perl
 endif
 
-ifndef DESTDIR
-DESTDIR=..
+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
-TMP     =`pwd`/debian/$(PACKAGE)
+
 
 build: build-stamp
-build-stamp:
+build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 
-	$(PERL) Makefile.PL INSTALLDIRS=vendor
+	$(PERL) Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$(CFLAGS)"
 	$(MAKE)
 	$(MAKE) test
 
-	touch build-stamp
+	touch $@
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp
+	dh_clean build-stamp install-stamp
 
-	-$(MAKE) realclean
+	# Makefile needs to be touched here as unpatch modifies Makefile.PL
+	[ ! -e Makefile ] || ( touch Makefile && $(MAKE) realclean )
 
-	dh_clean
-
-install: 
+install: install-stamp
+install-stamp: build-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	dh_installdirs
 
-	$(MAKE) install PREFIX=$(TMP)/usr
+	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
+
+	[ ! -d $(TMP)/usr/share/perl5 ] || rmdir --parents --ignore-fail-on-non-empty --verbose $(TMP)/usr/share/perl5
 
 # Build architecture-dependent files here.
 binary-arch: build install
 	dh_testdir
 	dh_testroot
 	dh_installdocs README
-	dh_installman
 	dh_installchangelogs Changes
-	dh_link
 	dh_strip
 	dh_compress
 	dh_fixperms
 	dh_installdeb
-	dh_perl 
+	dh_perl
 	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
-	dh_builddeb --destdir=$(DESTDIR)
+	dh_builddeb
 
 # Build architecture-independent files here.
 binary-indep: build install
 # We have nothing to do by default.
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
+.PHONY: build clean binary-indep binary-arch binary install




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