diff -urN perl-5.14.2-ma/debian/changelog perl-5.14.2.original/debian/changelog
--- perl-5.14.2-ma/debian/changelog	2013-01-13 01:40:59.000000000 +0000
+++ perl-5.14.2.original/debian/changelog	2012-12-10 12:49:33.000000000 +0000
@@ -1,9 +1,3 @@
-perl (5.14.2-17~ma1) precise; urgency=low
-
-  * Add patches from Nyko Tynbi's multiarch branch
-
- -- Wookey <wookey@wookware.org>  Sun, 13 Jan 2013 01:40:05 +0000
-
 perl (5.14.2-16) unstable; urgency=medium
 
   * [SECURITY] CVE-2012-5526: CGI.pm improper cookie and p3p
diff -urN perl-5.14.2-ma/debian/check-require perl-5.14.2.original/debian/check-require
--- perl-5.14.2-ma/debian/check-require	2013-01-13 01:34:21.000000000 +0000
+++ perl-5.14.2.original/debian/check-require	2012-12-10 12:49:33.000000000 +0000
@@ -45,8 +45,7 @@
 	# usr/*/perl/*/auto/File/Glob/Glob.so and the like should be ignored
 	return () if m|/| && !/\.p[hlm]$/;
 
-	s|usr/share/perl/[^/]+/||;
-	s|usr/lib/[^/]+/perl/[^/]+/||;
+	s|usr/[^/]+/perl/[^/]+/||;
 
 	s|/|::|g if s/\.pm$//;
 	return ($_);
diff -urN perl-5.14.2-ma/debian/config.debian perl-5.14.2.original/debian/config.debian
--- perl-5.14.2-ma/debian/config.debian	2013-01-13 01:34:21.000000000 +0000
+++ perl-5.14.2.original/debian/config.debian	2012-12-10 12:49:33.000000000 +0000
@@ -87,8 +87,6 @@
     ldflags="$ldflags $(dpkg-buildflags --get LDFLAGS)"
 fi
 
-archtriplet=`dpkg-architecture -qDEB_HOST_MULTIARCH`
-
 # post-configure tweaks
 cp debian/config.over .
 
@@ -103,7 +101,7 @@
     -Darchname=$gnu_type			\
     -Dprefix=/usr				\
     -Dprivlib=/usr/share/perl/$ver		\
-    -Darchlib=/usr/lib/$archtriplet/perl/$ver		\
+    -Darchlib=/usr/lib/perl/$ver		\
     -Dvendorprefix=/usr				\
     -Dvendorlib=/usr/share/perl5		\
     -Dvendorarch=/usr/lib/perl5			\
diff -urN perl-5.14.2-ma/debian/config.over perl-5.14.2.original/debian/config.over
--- perl-5.14.2-ma/debian/config.over	2013-01-13 01:34:21.000000000 +0000
+++ perl-5.14.2.original/debian/config.over	2012-12-10 12:49:33.000000000 +0000
@@ -9,7 +9,7 @@
 # no versions under vendorlib
 vendorlib_stem=
 
-# remove -rpath (shared libperl is moved to /usr/lib/<triplet> by rules)
+# remove -rpath (shared libperl is moved to /usr/lib by rules)
 tmp=
 for t in $ccdlflags
 do
diff -urN perl-5.14.2-ma/debian/control perl-5.14.2.original/debian/control
--- perl-5.14.2-ma/debian/control	2013-01-13 01:39:53.000000000 +0000
+++ perl-5.14.2.original/debian/control	2012-12-10 12:49:33.000000000 +0000
@@ -16,16 +16,13 @@
 Essential: yes
 Priority: required
 Architecture: any
-Multi-Arch: foreign
-Pre-Depends: ${shlibs:Depends}, ${static:PreDepends}, dpkg (>= 1.14.20)
+Pre-Depends: ${shlibs:Depends}, dpkg (>= 1.14.20)
 Conflicts: safe-rm (<< 0.8),
  update-inetd (<< 4.41),
  defoma (<< 0.11.12),
  doc-base (<< 0.10.3),
  mono-gac (<< 2.10.8.1-3)
-Breaks: perl (<< 5.14.2-13),
- libcgi-fast-perl (<< 5.14.2-13),
- autoconf2.13 (<< 2.13-45),
+Breaks: autoconf2.13 (<< 2.13-45),
  libscalar-list-utils-perl (<< 1:1.23),
  libfile-spec-perl (<< 3.3300),
  libxsloader-perl (<< 0.13),
@@ -51,7 +48,6 @@
 Package: libcgi-fast-perl
 Priority: optional
 Architecture: all
-Multi-Arch: foreign
 Depends: perl (>= ${source:Version}), perl (<< ${Next-Upstream-Version}~), libfcgi-perl
 Description: CGI::Fast Perl module
  CGI::Fast is a subclass of the CGI object created by CGI.pm.  It is
@@ -65,145 +61,15 @@
 Section: doc
 Priority: optional
 Architecture: all
-Multi-Arch: foreign
 Depends: perl (>= ${Upstream-Version}-1)
 Suggests: man-browser, groff
 Description: Perl documentation
  Perl manual pages, POD documentation and the `perldoc' program.  If you are
  writing Perl programs, you almost certainly need this.
 
-Package: perl-debug
-Section: debug
-Priority: extra
-Architecture: any
-Depends: perl (= ${binary:Version}), ${shlibs:Depends}
-Description: debug-enabled Perl interpreter
- debugperl provides a debug-enabled version of Perl which can produce
- extensive information about the interpreter as it compiles and executes
- a program (see the -D switch in perlrun(1)).
- .
- Note that this package is primarily of use in debugging *Perl* rather
- than perl programs, which may be traced/debugged using the standard
- perl binary using the -d switch (see perldebug(1)).
-
-Package: libperl5.14
-Section: libs
-Priority: optional
-Architecture: any
-Multi-Arch: same
-Depends: ${shlibs:Depends}
-Description: shared Perl library
- This package is required by programs which embed a Perl interpreter to
- ensure that the correct version of `perl-base' is installed.  It
- additionally contains the shared Perl library on architectures where the
- perl binary is linked to libperl.a (currently only i386, for performance
- reasons).  In other cases the actual library is in the `perl-base' package.
-
-Package: libperl-dev
-Section: libdevel
-Priority: optional
-Architecture: any
-Multi-Arch: same
-Depends: perl (= ${binary:Version}), libperl5.14 (= ${binary:Version}),
- libc6-dev | libc-dev
-Description: Perl library: development files
- Files for developing applications which embed a Perl interpreter.
-
-Package: perl
-Priority: standard
-Architecture: any
-Multi-Arch: same
-Depends: perl-base (= ${binary:Version}), perl-modules (>= ${source:Version}), ${shlibs:Depends}
-Conflicts: libjson-pp-perl (<< 2.27200-2)
-Breaks: perl-doc (<< ${Upstream-Version}-1),
- libdigest-md5-perl (<< 2.51),
- libmime-base64-perl (<< 3.13),
- libtime-hires-perl (<< 1.9721.01),
- libstorable-perl (<< 2.27),
- libdigest-sha-perl (<< 5.61),
- libsys-syslog-perl (<< 0.27),
- libcompress-zlib-perl (<< 2.033),
- libcompress-raw-zlib-perl (<< 2.033),
- libcompress-raw-bzip2-perl (<< 2.033),
- libio-compress-zlib-perl (<< 2.033),
- libio-compress-bzip2-perl (<< 2.033),
- libio-compress-base-perl (<< 2.033),
- libio-compress-perl (<< 2.033),
- libthreads-perl (<< 1.83),
- libthreads-shared-perl (<< 1.37),
- libtime-piece-perl (<< 1.20.01),
- libencode-perl (<< 2.42.01),
- libdevel-dprof-perl (<< 20110228.00),
- mrtg (<< 2.16.3-3.1),
- libhtml-template-compiled-perl (<< 0.95-1),
- libperl-apireference-perl (<< 0.09-1),
- dh-make-perl (<< 0.73-1),
- libregexp-optimizer-perl (<< 0.15-3),
- libxml-parser-lite-tree-perl (<< 0.14-1),
- libyaml-perl (<< 0.73-1),
- libload-perl (<< 0.20-1),
- libsoap-lite-perl (<< 0.712-4),
- libnet-jifty-perl (<< 0.14-1),
- ftpmirror (<< 1.96+dfsg-13)
-Replaces: perl-base (<< 5.10.1-12),
- perl-doc (<< 5.8.0-1),
- perl-modules (<< 5.8.1-1),
- libarchive-tar-perl (<= 1.38-2),
- libdigest-md5-perl,
- libmime-base64-perl,
- libtime-hires-perl,
- libstorable-perl,
- libdigest-sha-perl,
- libtime-piece-perl,
- libsys-syslog-perl,
- libcompress-zlib-perl,
- libcompress-raw-zlib-perl,
- libcompress-raw-bzip2-perl,
- libio-compress-zlib-perl,
- libio-compress-bzip2-perl,
- libio-compress-base-perl,
- libio-compress-perl,
- libthreads-perl,
- libthreads-shared-perl,
- libmodule-corelist-perl (<< 2.14-2),
- libencode-perl,
- libdevel-dprof-perl
-Provides: data-dumper, perl5,
- libdigest-md5-perl,
- libmime-base64-perl,
- libtime-hires-perl,
- libstorable-perl,
- libdigest-sha-perl,
- libsys-syslog-perl,
- libcompress-zlib-perl,
- libcompress-raw-zlib-perl,
- libcompress-raw-bzip2-perl,
- libio-compress-zlib-perl,
- libio-compress-bzip2-perl,
- libio-compress-base-perl,
- libio-compress-perl,
- libthreads-perl,
- libthreads-shared-perl,
- libtime-piece-perl,
- libencode-perl,
- libdevel-dprof-perl
-Recommends: netbase, libdevel-dprof-perl
-Suggests: perl-doc, libterm-readline-gnu-perl | libterm-readline-perl-perl,
- make
-Description: Larry Wall's Practical Extraction and Report Language
- An interpreted scripting language, known among some as "Unix's Swiss
- Army Chainsaw".
- .
- Perl is optimised for scanning arbitrary text files and system
- administration.  It has built-in extended regular expression matching
- and replacement, a data-flow mechanism to improve security with
- setuid scripts and is extensible via modules that can interface to C
- libraries.
-
 Package: perl-modules
 Priority: standard
 Architecture: all
-Multi-Arch: foreign
 Depends: perl (>= ${Upstream-Version}-1),
  libswitch-perl,
  libclass-isa-perl
@@ -261,8 +127,7 @@
  libhttp-tiny-perl (<< 0.012),
  libfile-path-perl (<< 2.08.01),
  libshell-perl (<< 0.72.01)
-Replaces: perl (<= 5.14.2-12),
- libpod-parser-perl,
+Replaces: libpod-parser-perl,
  libansicolor-perl,
  libfile-temp-perl,
  libnet-perl,
@@ -370,3 +235,129 @@
  considered an internal implementation detail of the `perl' package.
  Other packages should not depend on `perl-modules' directly, they
  should use `perl' (which depends on `perl-modules') instead.
+
+Package: perl-debug
+Section: debug
+Priority: extra
+Architecture: any
+Depends: perl (= ${binary:Version}), ${shlibs:Depends}
+Description: debug-enabled Perl interpreter
+ debugperl provides a debug-enabled version of Perl which can produce
+ extensive information about the interpreter as it compiles and executes
+ a program (see the -D switch in perlrun(1)).
+ .
+ Note that this package is primarily of use in debugging *Perl* rather
+ than perl programs, which may be traced/debugged using the standard
+ perl binary using the -d switch (see perldebug(1)).
+
+Package: libperl5.14
+Section: libs
+Priority: optional
+Architecture: any
+Depends: ${shlibs:Depends}, perl-base (= ${binary:Version})
+Replaces: perl-base (<= 5.8.7-4)
+Description: shared Perl library
+ This package is required by programs which embed a Perl interpreter to
+ ensure that the correct version of `perl-base' is installed.  It
+ additionally contains the shared Perl library on architectures where the
+ perl binary is linked to libperl.a (currently only i386, for performance
+ reasons).  In other cases the actual library is in the `perl-base' package.
+
+Package: libperl-dev
+Section: libdevel
+Priority: optional
+Architecture: any
+Depends: perl (= ${binary:Version}), libperl5.14 (= ${binary:Version}),
+ libc6-dev | libc-dev
+Description: Perl library: development files
+ Files for developing applications which embed a Perl interpreter.
+
+Package: perl
+Priority: standard
+Architecture: any
+Depends: perl-base (= ${binary:Version}), perl-modules (>= ${source:Version}), ${shlibs:Depends}
+Conflicts: libjson-pp-perl (<< 2.27200-2)
+Breaks: perl-doc (<< ${Upstream-Version}-1),
+ libdigest-md5-perl (<< 2.51),
+ libmime-base64-perl (<< 3.13),
+ libtime-hires-perl (<< 1.9721.01),
+ libstorable-perl (<< 2.27),
+ libdigest-sha-perl (<< 5.61),
+ libsys-syslog-perl (<< 0.27),
+ libcompress-zlib-perl (<< 2.033),
+ libcompress-raw-zlib-perl (<< 2.033),
+ libcompress-raw-bzip2-perl (<< 2.033),
+ libio-compress-zlib-perl (<< 2.033),
+ libio-compress-bzip2-perl (<< 2.033),
+ libio-compress-base-perl (<< 2.033),
+ libio-compress-perl (<< 2.033),
+ libthreads-perl (<< 1.83),
+ libthreads-shared-perl (<< 1.37),
+ libtime-piece-perl (<< 1.20.01),
+ libencode-perl (<< 2.42.01),
+ libdevel-dprof-perl (<< 20110228.00),
+ mrtg (<< 2.16.3-3.1),
+ libhtml-template-compiled-perl (<< 0.95-1),
+ libperl-apireference-perl (<< 0.09-1),
+ dh-make-perl (<< 0.73-1),
+ libregexp-optimizer-perl (<< 0.15-3),
+ libxml-parser-lite-tree-perl (<< 0.14-1),
+ libyaml-perl (<< 0.73-1),
+ libload-perl (<< 0.20-1),
+ libsoap-lite-perl (<< 0.712-4),
+ libnet-jifty-perl (<< 0.14-1),
+ ftpmirror (<< 1.96+dfsg-13)
+Replaces: perl-base (<< 5.10.1-12),
+ perl-doc (<< 5.8.0-1),
+ perl-modules (<< 5.8.1-1),
+ libarchive-tar-perl (<= 1.38-2),
+ libdigest-md5-perl,
+ libmime-base64-perl,
+ libtime-hires-perl,
+ libstorable-perl,
+ libdigest-sha-perl,
+ libtime-piece-perl,
+ libsys-syslog-perl,
+ libcompress-zlib-perl,
+ libcompress-raw-zlib-perl,
+ libcompress-raw-bzip2-perl,
+ libio-compress-zlib-perl,
+ libio-compress-bzip2-perl,
+ libio-compress-base-perl,
+ libio-compress-perl,
+ libthreads-perl,
+ libthreads-shared-perl,
+ libmodule-corelist-perl (<< 2.14-2),
+ libencode-perl,
+ libdevel-dprof-perl
+Provides: data-dumper, perl5,
+ libdigest-md5-perl,
+ libmime-base64-perl,
+ libtime-hires-perl,
+ libstorable-perl,
+ libdigest-sha-perl,
+ libsys-syslog-perl,
+ libcompress-zlib-perl,
+ libcompress-raw-zlib-perl,
+ libcompress-raw-bzip2-perl,
+ libio-compress-zlib-perl,
+ libio-compress-bzip2-perl,
+ libio-compress-base-perl,
+ libio-compress-perl,
+ libthreads-perl,
+ libthreads-shared-perl,
+ libtime-piece-perl,
+ libencode-perl,
+ libdevel-dprof-perl
+Recommends: netbase, libdevel-dprof-perl
+Suggests: perl-doc, libterm-readline-gnu-perl | libterm-readline-perl-perl,
+ make
+Description: Larry Wall's Practical Extraction and Report Language
+ An interpreted scripting language, known among some as "Unix's Swiss
+ Army Chainsaw".
+ .
+ Perl is optimised for scanning arbitrary text files and system
+ administration.  It has built-in extended regular expression matching
+ and replacement, a data-flow mechanism to improve security with
+ setuid scripts and is extensible via modules that can interface to C
+ libraries.
diff -urN perl-5.14.2-ma/debian/control~ perl-5.14.2.original/debian/control~
diff -urN perl-5.14.2-ma/debian/control.orig perl-5.14.2.original/debian/control.orig
diff -urN perl-5.14.2-ma/debian/control.rej perl-5.14.2.original/debian/control.rej
diff -urN perl-5.14.2-ma/debian/libperl5.14.files perl-5.14.2.original/debian/libperl5.14.files
--- perl-5.14.2-ma/debian/libperl5.14.files	2013-01-13 01:34:21.000000000 +0000
+++ perl-5.14.2.original/debian/libperl5.14.files	1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-# note: debian/rules will the arch-specific perl-base contents
-# in usr/lib/<triplet>/perl to libperl5.X.
-usr/lib/*/libperl.so.*
diff -urN perl-5.14.2-ma/debian/libperl5.14.files.static perl-5.14.2.original/debian/libperl5.14.files.static
--- perl-5.14.2-ma/debian/libperl5.14.files.static	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.14.2.original/debian/libperl5.14.files.static	2012-12-10 12:49:33.000000000 +0000
@@ -0,0 +1 @@
+usr/lib/libperl.so.*
diff -urN perl-5.14.2-ma/debian/libperl-dev.files perl-5.14.2.original/debian/libperl-dev.files
--- perl-5.14.2-ma/debian/libperl-dev.files	2013-01-13 01:34:21.000000000 +0000
+++ perl-5.14.2.original/debian/libperl-dev.files	2012-12-10 12:49:33.000000000 +0000
@@ -1,2 +1,2 @@
-usr/lib/*/libperl.a
-usr/lib/*/libperl.so
+usr/lib/libperl.a
+usr/lib/libperl.so
diff -urN perl-5.14.2-ma/debian/perl-base.files perl-5.14.2.original/debian/perl-base.files
--- perl-5.14.2-ma/debian/perl-base.files	2013-01-13 01:34:21.000000000 +0000
+++ perl-5.14.2.original/debian/perl-base.files	2012-12-10 12:49:34.000000000 +0000
@@ -1,76 +1,74 @@
 usr/bin/perl
+usr/*/perl/*/Config.pm
+usr/*/perl/*/Config_heavy.pl
+usr/*/perl/*/Config_git.pl
+usr/*/perl/*/Cwd.pm
+usr/*/perl/*/DynaLoader.pm
+usr/*/perl/*/Errno.pm
+usr/*/perl/*/Fcntl.pm
+usr/*/perl/*/File/Glob.pm
+usr/*/perl/*/Hash/Util.pm
+usr/*/perl/*/IO.pm
+usr/*/perl/*/IO/File.pm
+usr/*/perl/*/IO/Handle.pm
+usr/*/perl/*/IO/Pipe.pm
+usr/*/perl/*/IO/Seekable.pm
+usr/*/perl/*/IO/Select.pm
+usr/*/perl/*/IO/Socket
+usr/*/perl/*/IO/Socket.pm
+usr/*/perl/*/List/Util.pm
+usr/*/perl/*/POSIX.pm
+usr/*/perl/*/Scalar/Util.pm
+usr/*/perl/*/Socket.pm
+usr/*/perl/*/XSLoader.pm
+usr/*/perl/*/auto/Cwd
+usr/*/perl/*/auto/Fcntl
+usr/*/perl/*/auto/File/Glob
+usr/lib/perl/*/auto/Hash/Util/Util.so
+usr/lib/perl/*/auto/re/re.so
+usr/lib/perl/*/auto/attributes/attributes.so
+usr/lib/perl/*/auto/IO
+usr/lib/perl/*/auto/List/Util
+usr/lib/perl/*/auto/POSIX/POSIX.so
+usr/lib/perl/*/auto/POSIX/autosplit.ix
+usr/lib/perl/*/auto/POSIX/load_imports.al
+usr/*/perl/*/auto/Socket
+usr/*/perl/*/lib.pm
+usr/*/perl/*/re.pm
 usr/*/man/man1/perl.1
-# note: the architecture specific ones in usr/lib/<triplet>/perl
-# will be moved to libperl5.X by debian/rules
-usr/**/perl/*/Config.pm
-usr/**/perl/*/Config_heavy.pl
-usr/**/perl/*/Config_git.pl
-usr/**/perl/*/Cwd.pm
-usr/**/perl/*/DynaLoader.pm
-usr/**/perl/*/Errno.pm
-usr/**/perl/*/Fcntl.pm
-usr/**/perl/*/File/Glob.pm
-usr/**/perl/*/Hash/Util.pm
-usr/**/perl/*/IO.pm
-usr/**/perl/*/IO/File.pm
-usr/**/perl/*/IO/Handle.pm
-usr/**/perl/*/IO/Pipe.pm
-usr/**/perl/*/IO/Seekable.pm
-usr/**/perl/*/IO/Select.pm
-usr/**/perl/*/IO/Socket
-usr/**/perl/*/IO/Socket.pm
-usr/**/perl/*/List/Util.pm
-usr/**/perl/*/POSIX.pm
-usr/**/perl/*/Scalar/Util.pm
-usr/**/perl/*/Socket.pm
-usr/**/perl/*/XSLoader.pm
-usr/**/perl/*/auto/Cwd
-usr/**/perl/*/auto/Fcntl
-usr/**/perl/*/auto/File/Glob
-usr/lib/*/perl/*/auto/Hash/Util/Util.so
-usr/lib/*/perl/*/auto/re/re.so
-usr/lib/*/perl/*/auto/attributes/attributes.so
-usr/lib/*/perl/*/auto/IO
-usr/lib/*/perl/*/auto/List/Util
-usr/lib/*/perl/*/auto/POSIX/POSIX.so
-usr/lib/*/perl/*/auto/POSIX/autosplit.ix
-usr/lib/*/perl/*/auto/POSIX/load_imports.al
-usr/**/perl/*/auto/Socket
-usr/**/perl/*/lib.pm
-usr/**/perl/*/re.pm
-usr/**/perl/*/AutoLoader.pm
-usr/**/perl/*/Carp.pm
-usr/**/perl/*/Carp/Heavy.pm
-usr/**/perl/*/Exporter.pm
-usr/**/perl/*/Exporter/Heavy.pm
-usr/**/perl/*/File/Spec.pm
-usr/**/perl/*/File/Spec/Unix.pm
-usr/**/perl/*/FileHandle.pm
-usr/**/perl/*/Getopt/Long.pm
-usr/**/perl/*/IPC/Open2.pm
-usr/**/perl/*/IPC/Open3.pm
-usr/**/perl/*/SelectSaver.pm
-usr/**/perl/*/Symbol.pm
-usr/**/perl/*/Text/ParseWords.pm
-usr/**/perl/*/Text/Tabs.pm
-usr/**/perl/*/Text/Wrap.pm
-usr/**/perl/*/Tie/Hash.pm
-usr/**/perl/*/attributes.pm
-usr/**/perl/*/base.pm
-usr/**/perl/*/bytes.pm
-usr/**/perl/*/bytes_heavy.pl
-usr/**/perl/*/constant.pm
-usr/**/perl/*/fields.pm
-usr/**/perl/*/integer.pm
-usr/**/perl/*/locale.pm
-usr/**/perl/*/overload.pm
-usr/**/perl/*/strict.pm
-usr/**/perl/*/utf8.pm
-usr/**/perl/*/utf8_heavy.pl
-usr/**/perl/*/unicore/Heavy.pl
-usr/**/perl/*/unicore/To
-usr/**/perl/*/unicore/lib
-usr/**/perl/*/vars.pm
-usr/**/perl/*/warnings.pm
-usr/**/perl/*/warnings/register.pm
-usr/**/perl/*/feature.pm
+usr/*/perl/*/AutoLoader.pm
+usr/*/perl/*/Carp.pm
+usr/*/perl/*/Carp/Heavy.pm
+usr/*/perl/*/Exporter.pm
+usr/*/perl/*/Exporter/Heavy.pm
+usr/*/perl/*/File/Spec.pm
+usr/*/perl/*/File/Spec/Unix.pm
+usr/*/perl/*/FileHandle.pm
+usr/*/perl/*/Getopt/Long.pm
+usr/*/perl/*/IPC/Open2.pm
+usr/*/perl/*/IPC/Open3.pm
+usr/*/perl/*/SelectSaver.pm
+usr/*/perl/*/Symbol.pm
+usr/*/perl/*/Text/ParseWords.pm
+usr/*/perl/*/Text/Tabs.pm
+usr/*/perl/*/Text/Wrap.pm
+usr/*/perl/*/Tie/Hash.pm
+usr/*/perl/*/attributes.pm
+usr/*/perl/*/base.pm
+usr/*/perl/*/bytes.pm
+usr/*/perl/*/bytes_heavy.pl
+usr/*/perl/*/constant.pm
+usr/*/perl/*/fields.pm
+usr/*/perl/*/integer.pm
+usr/*/perl/*/locale.pm
+usr/*/perl/*/overload.pm
+usr/*/perl/*/strict.pm
+usr/*/perl/*/utf8.pm
+usr/*/perl/*/utf8_heavy.pl
+usr/*/perl/*/unicore/Heavy.pl
+usr/*/perl/*/unicore/To
+usr/*/perl/*/unicore/lib
+usr/*/perl/*/vars.pm
+usr/*/perl/*/warnings.pm
+usr/*/perl/*/warnings/register.pm
+usr/*/perl/*/feature.pm
diff -urN perl-5.14.2-ma/debian/perl-base.files.shared perl-5.14.2.original/debian/perl-base.files.shared
--- perl-5.14.2-ma/debian/perl-base.files.shared	1970-01-01 01:00:00.000000000 +0100
+++ perl-5.14.2.original/debian/perl-base.files.shared	2012-12-10 12:49:34.000000000 +0000
@@ -0,0 +1 @@
+usr/lib/libperl.so.*
diff -urN perl-5.14.2-ma/debian/perl.files perl-5.14.2.original/debian/perl.files
--- perl-5.14.2-ma/debian/perl.files	2013-01-13 01:34:21.000000000 +0000
+++ perl-5.14.2.original/debian/perl.files	2012-12-10 12:49:34.000000000 +0000
@@ -1,4 +1,2 @@
-# note that this fallback relies on the order of debian/control:
-# this package needs to come after any other packages with more
-# specific recipes for the directories
-usr/lib/*/perl
+usr/bin
+usr/lib/perl
diff -urN perl-5.14.2-ma/debian/perl-modules.files perl-5.14.2.original/debian/perl-modules.files
--- perl-5.14.2-ma/debian/perl-modules.files	2013-01-13 01:34:21.000000000 +0000
+++ perl-5.14.2.original/debian/perl-modules.files	2012-12-10 12:49:34.000000000 +0000
@@ -1,5 +1 @@
-# note that this fallback relies on the order of debian/control:
-# this package needs to come after any other packages with more
-# specific recipes for the directories
-usr/bin
 usr/share/perl
diff -urN perl-5.14.2-ma/debian/rules perl-5.14.2.original/debian/rules
--- perl-5.14.2-ma/debian/rules	2013-01-13 01:34:21.000000000 +0000
+++ perl-5.14.2.original/debian/rules	2012-12-10 12:49:34.000000000 +0000
@@ -11,7 +11,6 @@
 #
 # <http://lists.alioth.debian.org/pipermail/perl-maintainers/2012-January/002870.html>
 
-# we use bash-specific functionality, at least "shopt -s globstar"
 export SHELL = /bin/bash
 
 fullversion := $(shell /bin/bash debian/config.debian --full-version)
@@ -20,13 +19,12 @@
 installtype := $(shell /bin/bash debian/config.debian --install-type)
 test_target := $(shell /bin/bash debian/config.debian --test-target)
 strip	    := $(shell /bin/bash debian/config.debian --strip)
-archtriplet := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 srcdir      := $(shell pwd)
 packages    := $(shell sed -n 's/^Package: *\(.*\)/\1/p' debian/control)
 tmp	    = debian/tmp
 bin         = $(tmp)/usr/bin
 man         = $(tmp)/usr/share/man
-lib         = $(tmp)/usr/lib/$(archtriplet)/perl/$(version)
+lib         = $(tmp)/usr/lib/perl/$(version)
 share       = $(tmp)/usr/share/perl/$(version)
 build	    = debian/build
 debug       = $(build)/perl-debug/usr/lib/debug
@@ -50,13 +48,6 @@
 subst_upstream = -VUpstream-Version=$(package_upstream_version)
 subst_perlapi  = -Vperlapi:Provides="`./perl.static debian/mkprovides`"
 subst_next_upstream = -VNext-Upstream-Version=$(nextversion)
-# perl-base with a static perl won't get the libperl pre-dependency via shlibs
-ifeq ($(installtype),static)
-subst_static = -Vstatic:PreDepends="libperl$(version) (>= $(package_upstream_version))"
-else
-subst_static = -Vstatic:PreDepends=
-endif
-
 
 # for cpan/Compress-Raw-Zlib
 export BUILD_ZLIB=False
@@ -120,8 +111,8 @@
 	test -f $(patches)	# maintainer sanity check
 	[ ! -f Makefile ] || $(MAKE) distclean
 	rm -rf config.over perl.static perl.debug libperl-static libperl.so* \
-	    $(patchlevel) build-stamp install-stamp t/auto \
-	    debian/libperl$(version).shlibs \
+	    $(patchlevel) build-stamp install-stamp t/auto debian/shlibs.local \
+	    debian/perl-base.shlibs debian/libperl$(version).shlibs \
 	    debian/substvars debian/files debian/list.tmp $(tmp) $(build)
 	# <https://rt.cpan.org/Public/Bug/Display.html?id=68214>
 	rm -f cpan/DB_File/DB_File.pm.bak cpan/DB_File/t/db-btree.t.bak \
@@ -191,20 +182,15 @@
 	# remove versioned binary, relink after moving files
 	rm -f $(bin)/perl$(fullversion)
 
-	# FIXME: remove a2p for now
-	rm -f $(bin)/a2p
-	rm -f $(man)/man1/a2p.1
-	rm -f $(share)/pod/a2p.pod
-
 	# relocate perl libraries and create links
-	cp libperl-static $(tmp)/usr/lib/$(archtriplet)/libperl.a
-	mv $(lib)/CORE/libperl.so.$(fullversion) $(tmp)/usr/lib/$(archtriplet)
+	cp libperl-static $(tmp)/usr/lib/libperl.a
+	mv $(lib)/CORE/libperl.so.$(fullversion) $(tmp)/usr/lib
 
-	ln -s libperl.so.$(fullversion) $(tmp)/usr/lib/$(archtriplet)/libperl.so.$(version)
-	ln -s libperl.so.$(version) $(tmp)/usr/lib/$(archtriplet)/libperl.so
+	ln -s libperl.so.$(fullversion) $(tmp)/usr/lib/libperl.so.$(version)
+	ln -s libperl.so.$(version) $(tmp)/usr/lib/libperl.so
 
 	# move to full version (symlinks created in perl-base below)
-	mv $(lib) $(tmp)/usr/lib/$(archtriplet)/perl/$(fullversion)
+	mv $(lib) $(tmp)/usr/lib/perl/$(fullversion)
 	mv $(share) $(tmp)/usr/share/perl/$(fullversion)
 
 ifeq ($(installtype),static)
@@ -215,7 +201,6 @@
 	cp perl.debug $(bin)/debugperl
 
 	# split packages
-	# Note: this relies on the order of debian/control
 	for p in $(packages); \
 	do \
 	    mkdir -p $(build)/$$p; \
@@ -224,8 +209,7 @@
 		do \
 		    list=../$$p.files$$sfx; \
 		    test -s $$list || continue; \
-		    shopt -s globstar; \
-		    find `grep -v '^#' $$list` ! -type d; \
+		    find `cat $$list` ! -type d; \
 		done) >debian/list.tmp; \
 	    (cd $(tmp); cpio -vdumpl ../build/$$p) <debian/list.tmp 2>&1 | \
 		grep -v ' linked to '; \
@@ -239,46 +223,38 @@
 	./perl.static debian/splitdoc $(build)/perl-base
 
 	# create symlinks to match @INC
-	ln -s $(fullversion) $(build)/perl-base/usr/lib/$(archtriplet)/perl/$(version)
+	ln -s $(fullversion) $(build)/perl-base/usr/lib/perl/$(version)
 	ln -s $(fullversion) $(build)/perl-base/usr/share/perl/$(version)
 
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 ifeq (,$(findstring x-perl-notest,$(DEB_BUILD_OPTIONS)))
-	# Verify that perl-base + libperl$(version) stays self contained
+	# Verify that perl-base stays self contained
+	# plain "use IO " and "use re" are deprecated and/or useless
 
-	( shopt -s globstar; cd $(build)/perl-base; \
-	  find `grep -v '^#' $(srcdir)/debian/perl-base.files` ! -type d ) | \
-	  ./perl.static $(srcdir)/debian/check-require $(build)/perl-base
+	./perl.static $(srcdir)/debian/check-require $(build)/perl-base \
+	  < debian/perl-base.files
 endif
 endif
 
-	# move arch-specific libraries in perl-base to libperl
-	mv $(build)/perl-base/usr/lib/$(archtriplet)/perl \
-	   $(build)/libperl$(version)/usr/lib/$(archtriplet)
-	
-	rmdir $(build)/perl-base/usr/lib/$(archtriplet) $(build)/perl-base/usr/lib
-
-	# move section 1 manual pages back for installed programs
-	for p in perl perl-modules; do \
-	  mkdir -p $(build)/$$p/usr/share/man/man1; \
-	  find $(build)/$$p/usr/bin -type f -printf "%f\n" | \
+	# move section 1 manual pages back to perl for installed programs
+	mkdir -p $(build)/perl/usr/share/man/man1
+	find $(build)/perl/usr/bin -type f -printf "%f\n" | \
 	    while read prog; \
 	    do \
 		m=$(build)/perl-doc/usr/share/man/man1/$$prog.1; \
 		if test -f $$m; \
 		then \
-		    mv $$m $(build)/$$p/usr/share/man/man1; \
+		    mv $$m $(build)/perl/usr/share/man/man1; \
 		else \
 		    echo "warning: no manual page for $$prog" >&2; \
 		fi; \
-	    done; \
-	done
+	    done
 
 	# remove some linked man pages (symlinked later and cause
 	# problems as-is when compressing)
-	rm -f $(build)/perl-modules/usr/share/man/man1/pstruct.1 \
-	    $(build)/perl-modules/usr/share/man/man1/perlthanks.1 \
-	    $(build)/perl-modules/usr/share/man/man1/psed.1
+	rm -f $(build)/perl/usr/share/man/man1/pstruct.1 \
+	    $(build)/perl/usr/share/man/man1/perlthanks.1 \
+	    $(build)/perl/usr/share/man/man1/psed.1
 
 	# the diagnostics module needs perldiag.pod
 	mkdir $(build)/perl-modules/usr/share/perl/$(fullversion)/pod
@@ -286,7 +262,6 @@
 	    $(build)/perl-modules/usr/share/perl/$(fullversion)/pod
 
 	# copy dummy perldoc to perl package
-	[ -d $(build)/perl/usr/bin ] || mkdir -p $(build)/perl/usr/bin
 	cp debian/perl.perldoc $(build)/perl/usr/bin/perldoc
 	chmod 755 $(build)/perl/usr/bin/perldoc
 
@@ -294,7 +269,7 @@
 	cp debian/rename $(build)/perl/usr/bin/prename
 	chmod 755 $(build)/perl/usr/bin/prename
 
-	./perl.static -Ilib $(build)/perl-modules/usr/bin/pod2man --official \
+	./perl.static -Ilib $(build)/perl/usr/bin/pod2man --official \
 	    debian/rename >$(build)/perl/usr/share/man/man1/prename.1
 
 	# install docs
@@ -337,10 +312,10 @@
 	cp debian/libnet.cfg $(build)/perl-modules/etc/perl/Net
 
 	# compress
-	find $(build)/*/usr/share/man -type f -print | xargs -r gzip -n9
+	find $(build)/*/usr/share/man -type f -print | xargs -r gzip -9
 	find $(build)/*/usr/share/doc -type f \
 	    \( -name changelog\* -o \( -size +4k ! -name copyright \) \) \
-	    -print | xargs -r gzip -n9
+	    -print | xargs -r gzip -9
 
 ifeq ($(strip),yes)
 	# strip
@@ -394,9 +369,9 @@
 
 	ln -s perl.1.gz $(build)/perl-debug/usr/share/man/man1/debugperl.1.gz
 	ln -s perl.1.gz $(build)/perl-base/usr/share/man/man1/perl$(fullversion).1.gz
-	ln -s c2ph.1.gz $(build)/perl-modules/usr/share/man/man1/pstruct.1.gz
-	ln -s s2p.1.gz $(build)/perl-modules/usr/share/man/man1/psed.1.gz
-	ln -s perlbug.1.gz $(build)/perl-modules/usr/share/man/man1/perlthanks.1.gz
+	ln -s c2ph.1.gz $(build)/perl/usr/share/man/man1/pstruct.1.gz
+	ln -s s2p.1.gz $(build)/perl/usr/share/man/man1/psed.1.gz
+	ln -s perlbug.1.gz $(build)/perl/usr/share/man/man1/perlthanks.1.gz
 
 	ln -s changelog.gz $(build)/perl/usr/share/doc/perl/Changes.gz
 	ln -s ../perl/changelog.gz \
@@ -433,9 +408,17 @@
 binary-arch: build-stamp install-stamp
 	$(checkdir)
 	$(checkroot)
-	# this needs to be (>= $(package_upstream_version)) from 5.16 onwards
-	echo 'libperl $(version) libperl$(version) (>= 5.14.2-13)' \
+ifeq ($(installtype),static)
+	echo 'libperl $(version) libperl$(version) (= $${source:Version})' \
+	    >debian/shlibs.local
+
+	echo 'libperl $(version) libperl$(version) (>= $(package_upstream_version))' \
 	    >debian/libperl$(version).shlibs
+else
+	echo 'libperl $(version)' >debian/shlibs.local
+	echo 'libperl $(version) libperl$(version) (>= $(package_upstream_version))' \
+	    >debian/perl-base.shlibs
+endif
 
 	for p in `./perl.static -l -00ne 'print $$1 if /^Architecture:\s+any/m \
 	    and /^Package:\s+(.*)/m' debian/control`; \
@@ -459,9 +442,10 @@
 	    find $(build)/$$p/usr -type f \
 		\( -perm +111 -o -name \*.so\* \) -print | \
 		fgrep -v /usr/lib/debug/ | \
-		xargs -r dpkg-shlibdeps -S$(srcdir)/$(build)/libperl$(version) 2>&1 | \
+		xargs -r dpkg-shlibdeps -S$(srcdir)/$(build)/libperl$(version) \
+		                        -S$(srcdir)/$(build)/perl-base 2>&1 | \
 		fgrep -v 'File format not recognized'; # scripts \
-	    dpkg-gencontrol -p$$p -isp -P$(build)/$$p $(subst_perlapi) $(subst_upstream) $(subst_static); \
+	    dpkg-gencontrol -p$$p -isp -P$(build)/$$p $(subst_perlapi) $(subst_upstream); \
 	    dpkg --build $(build)/$$p ..; \
 	done
 
diff -urN perl-5.14.2-ma/debian/rules~ perl-5.14.2.original/debian/rules~
diff -urN perl-5.14.2-ma/debian/splitdoc perl-5.14.2.original/debian/splitdoc
--- perl-5.14.2-ma/debian/splitdoc	2013-01-13 01:34:21.000000000 +0000
+++ perl-5.14.2.original/debian/splitdoc	2012-12-10 12:49:34.000000000 +0000
@@ -35,7 +35,7 @@
 	    {
 		s/\.pm$/.pod/;
 		s/perl-base/perl-doc/;
-		s!/usr/lib/([^/]*/)?perl!/usr/share/perl!;
+		s!/usr/lib/!/usr/share/!;
 		($dir) = m!(.*)/!;
 	    }