Fix kubuntu-meta FTBFS on Debian and Ubuntu

21 files changed, 3 insertions, 0 deletions

diff --git a/ubuntu/raring/metapackages/kubuntu-meta/COPYING b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/COPYING
index d511905c1..d511905c1 100644
--- a/ubuntu/raring/metapackages/kubuntu-meta/COPYING
+++ b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/COPYING
diff --git a/ubuntu/raring/metapackages/kubuntu-meta/README b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/README
index 357d51105..357d51105 100644
--- a/ubuntu/raring/metapackages/kubuntu-meta/README
+++ b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/README
diff --git a/ubuntu/raring/metapackages/kubuntu-meta/debootstrap-version b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/debootstrap-version
index b0f3d96f8..b0f3d96f8 100644
--- a/ubuntu/raring/metapackages/kubuntu-meta/debootstrap-version
+++ b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/debootstrap-version
diff --git a/ubuntu/raring/metapackages/kubuntu-meta/desktop b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop
index b1016a157..b1016a157 100644
--- a/ubuntu/raring/metapackages/kubuntu-meta/desktop
+++ b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop
diff --git a/ubuntu/raring/metapackages/kubuntu-meta/desktop-amd64 b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-amd64
index 3e5fba0d9..3e5fba0d9 100644
--- a/ubuntu/raring/metapackages/kubuntu-meta/desktop-amd64
+++ b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-amd64
diff --git a/ubuntu/raring/metapackages/kubuntu-meta/desktop-hppa b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-hppa
index 030d93618..030d93618 100644
--- a/ubuntu/raring/metapackages/kubuntu-meta/desktop-hppa
+++ b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-hppa
diff --git a/ubuntu/raring/metapackages/kubuntu-meta/desktop-i386 b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-i386
index 52cd6a70e..52cd6a70e 100644
--- a/ubuntu/raring/metapackages/kubuntu-meta/desktop-i386
+++ b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-i386
diff --git a/ubuntu/raring/metapackages/kubuntu-meta/desktop-ia64 b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-ia64
index f24d7e4cf..f24d7e4cf 100644
--- a/ubuntu/raring/metapackages/kubuntu-meta/desktop-ia64
+++ b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-ia64
diff --git a/ubuntu/raring/metapackages/kubuntu-meta/desktop-lpia b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-lpia
index 7c8954570..7c8954570 100644
--- a/ubuntu/raring/metapackages/kubuntu-meta/desktop-lpia
+++ b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-lpia
diff --git a/ubuntu/raring/metapackages/kubuntu-meta/desktop-powerpc b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-powerpc
index 1314826f1..1314826f1 100644
--- a/ubuntu/raring/metapackages/kubuntu-meta/desktop-powerpc
+++ b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-powerpc
diff --git a/ubuntu/raring/metapackages/kubuntu-meta/desktop-recommends-amd64 b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-amd64
index f3a5065e6..f3a5065e6 100644
--- a/ubuntu/raring/metapackages/kubuntu-meta/desktop-recommends-amd64
+++ b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-amd64
diff --git a/ubuntu/raring/metapackages/kubuntu-meta/desktop-recommends-hppa b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-hppa
index a3e27e409..a3e27e409 100644
--- a/ubuntu/raring/metapackages/kubuntu-meta/desktop-recommends-hppa
+++ b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-hppa
diff --git a/ubuntu/raring/metapackages/kubuntu-meta/desktop-recommends-i386 b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-i386
index 781eda9cc..781eda9cc 100644
--- a/ubuntu/raring/metapackages/kubuntu-meta/desktop-recommends-i386
+++ b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-i386
diff --git a/ubuntu/raring/metapackages/kubuntu-meta/desktop-recommends-ia64 b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-ia64
index 7d6e29a60..7d6e29a60 100644
--- a/ubuntu/raring/metapackages/kubuntu-meta/desktop-recommends-ia64
+++ b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-ia64
diff --git a/ubuntu/raring/metapackages/kubuntu-meta/desktop-recommends-lpia b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-lpia
index f6eec30d2..f6eec30d2 100644
--- a/ubuntu/raring/metapackages/kubuntu-meta/desktop-recommends-lpia
+++ b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-lpia
diff --git a/ubuntu/raring/metapackages/kubuntu-meta/desktop-recommends-powerpc b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-powerpc
index 14de9515e..14de9515e 100644
--- a/ubuntu/raring/metapackages/kubuntu-meta/desktop-recommends-powerpc
+++ b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-powerpc
diff --git a/ubuntu/raring/metapackages/kubuntu-meta/desktop-recommends-sparc b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-sparc
index 6d67f9eac..6d67f9eac 100644
--- a/ubuntu/raring/metapackages/kubuntu-meta/desktop-recommends-sparc
+++ b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-sparc
diff --git a/ubuntu/raring/metapackages/kubuntu-meta/desktop-sparc b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-sparc
index 030d93618..030d93618 100644
--- a/ubuntu/raring/metapackages/kubuntu-meta/desktop-sparc
+++ b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/desktop-sparc
diff --git a/ubuntu/raring/metapackages/kubuntu-meta/update b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/update
index 01998e1bc..01998e1bc 100755
--- a/ubuntu/raring/metapackages/kubuntu-meta/update
+++ b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/update
diff --git a/ubuntu/raring/metapackages/kubuntu-meta/update.cfg b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/update.cfg
index ee2975a4f..ee2975a4f 100644
--- a/ubuntu/raring/metapackages/kubuntu-meta/update.cfg
+++ b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/update.cfg
diff --git a/ubuntu/raring/metapackages/kubuntu-meta/debian/rules b/ubuntu/raring/metapackages/kubuntu-meta/debian/rules
index 2b69924b8..ceee2fb18 100755
--- 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