[libgtk2-perl] 01/02: prepare for multiarch perl

Damyan Ivanov dmn at moszumanska.debian.org
Thu May 15 14:57:03 UTC 2014


This is an automated email from the git hooks/post-receive script.

dmn pushed a commit to branch master
in repository libgtk2-perl.

commit 88e0482c234c480e4d86fe44e933f7d38b8bfa43
Author: Damyan Ivanov <dmn at debian.org>
Date:   Thu May 15 14:52:05 2014 +0000

    prepare for multiarch perl
    
    debian/*.install are generated at dh_auto_install time, replacing
    ${archlib} with $Config{vendorarch}
---
 debian/clean                       | 2 ++
 debian/libgtk2-perl-doc.install    | 9 ---------
 debian/libgtk2-perl-doc.install.in | 9 +++++++++
 debian/libgtk2-perl.install        | 5 -----
 debian/libgtk2-perl.install.in     | 5 +++++
 debian/rules                       | 7 +++++++
 6 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..1f41ecc
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,2 @@
+debian/libgtk2-perl.install
+debian/libgtk2-perl-doc.install
diff --git a/debian/libgtk2-perl-doc.install b/debian/libgtk2-perl-doc.install
deleted file mode 100644
index cd44fac..0000000
--- a/debian/libgtk2-perl-doc.install
+++ /dev/null
@@ -1,9 +0,0 @@
-usr/lib/perl5/Gtk2/*.pod
-usr/lib/perl5/Gtk2/Buildable/*.pod
-usr/lib/perl5/Gtk2/Gdk/*.pod
-usr/lib/perl5/Gtk2/Gdk/Cairo/*.pod
-usr/lib/perl5/Gtk2/Gdk/Event/*.pod
-usr/lib/perl5/Gtk2/Gdk/Pango/*.pod
-usr/lib/perl5/Gtk2/Pango/*.pod
-usr/lib/perl5/Gtk2/Pango/Cairo/*.pod
-usr/share/man/*
diff --git a/debian/libgtk2-perl-doc.install.in b/debian/libgtk2-perl-doc.install.in
new file mode 100644
index 0000000..f8bc9f7
--- /dev/null
+++ b/debian/libgtk2-perl-doc.install.in
@@ -0,0 +1,9 @@
+${archlib}/Gtk2/*.pod
+${archlib}/Gtk2/Buildable/*.pod
+${archlib}/Gtk2/Gdk/*.pod
+${archlib}/Gtk2/Gdk/Cairo/*.pod
+${archlib}/Gtk2/Gdk/Event/*.pod
+${archlib}/Gtk2/Gdk/Pango/*.pod
+${archlib}/Gtk2/Pango/*.pod
+${archlib}/Gtk2/Pango/Cairo/*.pod
+usr/share/man/*
diff --git a/debian/libgtk2-perl.install b/debian/libgtk2-perl.install
deleted file mode 100644
index 855ace3..0000000
--- a/debian/libgtk2-perl.install
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/lib/perl5/auto/Gtk2/*
-usr/lib/perl5/Gtk2/Install/*
-usr/lib/perl5/Gtk2/*.pm
-usr/lib/perl5/Gtk2.pm
-usr/lib/perl5/Gtk2/Gdk/Keysyms.pm
diff --git a/debian/libgtk2-perl.install.in b/debian/libgtk2-perl.install.in
new file mode 100644
index 0000000..6b357d2
--- /dev/null
+++ b/debian/libgtk2-perl.install.in
@@ -0,0 +1,5 @@
+${archlib}/auto/Gtk2/*
+${archlib}/Gtk2/Install/*
+${archlib}/Gtk2/*.pm
+${archlib}/Gtk2.pm
+${archlib}/Gtk2/Gdk/Keysyms.pm
diff --git a/debian/rules b/debian/rules
index 1d90407..c3aa55a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,9 +2,16 @@
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
+ARCHLIB := $(shell perl -MConfig -e 'print $$Config{vendorarch}')
+
 %:
 	dh $@
 
+override_dh_auto_install:
+	sed -e 's,$${archlib},$(ARCHLIB),g' debian/libgtk2-perl.install.in > debian/libgtk2-perl.install
+	sed -e 's,$${archlib},$(ARCHLIB),g' debian/libgtk2-perl-doc.install.in > debian/libgtk2-perl-doc.install
+	dh_auto_install
+
 override_dh_auto_test:
 	xvfb-run -a dh_auto_test
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libgtk2-perl.git



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