Fix kubuntu-meta FTBFS on Debian and Ubuntu

11 years ago · c3477e3284
parent 73d301446e
commit c3477e3284
63 changed files with 9 additions and 0 deletions
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/COPYING
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/COPYING
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/README
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/README
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/debootstrap-version
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/debootstrap-version
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-amd64
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-amd64
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-hppa
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-hppa
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-i386
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-i386
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-ia64
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-ia64
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-lpia
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-lpia
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-powerpc
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-powerpc
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-amd64
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-amd64
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-hppa
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-hppa
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-i386
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-i386
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-ia64
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-ia64
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-lpia
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-lpia
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-powerpc
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-powerpc
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-sparc
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-sparc
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-sparc
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-sparc
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/update
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/update
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/update.cfg
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/update.cfg
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/rules
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/rules
@ -5,6 +5,9 @@
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                               && echo xz || echo bzip2)

+pre-build::
+	mv debian/distrospecific/* . || true
+
 clean:
 	dh_testdir
 	dh_clean
--- a/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/COPYING
+++ b/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/COPYING
--- a/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/README
+++ b/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/README
--- a/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/debootstrap-version
+++ b/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/debootstrap-version
--- a/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop
+++ b/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop
--- a/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-amd64
+++ b/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-amd64
--- a/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-hppa
+++ b/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-hppa
--- a/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-i386
+++ b/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-i386
--- a/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-ia64
+++ b/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-ia64
--- a/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-lpia
+++ b/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-lpia
--- a/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-powerpc
+++ b/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-powerpc
--- a/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-amd64
+++ b/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-amd64
--- a/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-hppa
+++ b/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-hppa
--- a/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-i386
+++ b/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-i386
--- a/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-ia64
+++ b/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-ia64
--- a/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-lpia
+++ b/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-lpia
--- a/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-powerpc
+++ b/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-powerpc
--- a/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-sparc
+++ b/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-sparc
--- a/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-sparc
+++ b/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-sparc
--- a/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/update
+++ b/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/update
--- a/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/update.cfg
+++ b/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/update.cfg
--- a/ubuntu/precise/metapackages/kubuntu-meta/debian/rules
+++ b/ubuntu/precise/metapackages/kubuntu-meta/debian/rules
@ -5,6 +5,9 @@
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                               && echo xz || echo bzip2)

+pre-build::
+	mv debian/distrospecific/* . || true
+
 clean:
 	dh_testdir
 	dh_clean
--- a/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/COPYING
+++ b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/COPYING
--- a/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/README
+++ b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/README
--- a/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/debootstrap-version
+++ b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/debootstrap-version
--- a/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop
+++ b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop
--- a/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-amd64
+++ b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-amd64
--- a/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-hppa
+++ b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-hppa
--- a/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-i386
+++ b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-i386
--- a/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-ia64
+++ b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-ia64
--- a/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-lpia
+++ b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-lpia
--- a/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-powerpc
+++ b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-powerpc
--- a/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-amd64
+++ b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-amd64
--- a/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-hppa
+++ b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-hppa
--- a/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-i386
+++ b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-i386
--- a/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-ia64
+++ b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-ia64
--- a/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-lpia
+++ b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-lpia
--- a/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-powerpc
+++ b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-powerpc
--- a/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-sparc
+++ b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-sparc
--- a/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-sparc
+++ b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-sparc
--- a/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/update
+++ b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/update
--- a/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/update.cfg
+++ b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/update.cfg
--- a/ubuntu/raring/metapackages/kubuntu-meta/debian/rules
+++ b/ubuntu/raring/metapackages/kubuntu-meta/debian/rules
@ -5,6 +5,9 @@
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                               && echo xz || echo bzip2)

+pre-build::
+	mv debian/distrospecific/* . || true
+
 clean:
 	dh_testdir
 	dh_clean