From c3477e3284a1be80eb36069151ddee3dde371981 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 11 Jan 2014 15:55:46 -0600 Subject: [PATCH] Fix kubuntu-meta FTBFS on Debian and Ubuntu --- .../kubuntu-meta/{ => debian/distrospecific}/COPYING | 0 .../kubuntu-meta/{ => debian/distrospecific}/README | 0 .../{ => debian/distrospecific}/debootstrap-version | 0 .../kubuntu-meta/{ => debian/distrospecific}/desktop | 0 .../kubuntu-meta/{ => debian/distrospecific}/desktop-amd64 | 0 .../kubuntu-meta/{ => debian/distrospecific}/desktop-hppa | 0 .../kubuntu-meta/{ => debian/distrospecific}/desktop-i386 | 0 .../kubuntu-meta/{ => debian/distrospecific}/desktop-ia64 | 0 .../kubuntu-meta/{ => debian/distrospecific}/desktop-lpia | 0 .../kubuntu-meta/{ => debian/distrospecific}/desktop-powerpc | 0 .../{ => debian/distrospecific}/desktop-recommends-amd64 | 0 .../{ => debian/distrospecific}/desktop-recommends-hppa | 0 .../{ => debian/distrospecific}/desktop-recommends-i386 | 0 .../{ => debian/distrospecific}/desktop-recommends-ia64 | 0 .../{ => debian/distrospecific}/desktop-recommends-lpia | 0 .../{ => debian/distrospecific}/desktop-recommends-powerpc | 0 .../{ => debian/distrospecific}/desktop-recommends-sparc | 0 .../kubuntu-meta/{ => debian/distrospecific}/desktop-sparc | 0 .../kubuntu-meta/{ => debian/distrospecific}/update | 0 .../kubuntu-meta/{ => debian/distrospecific}/update.cfg | 0 ubuntu/maverick/metapackages/kubuntu-meta/debian/rules | 3 +++ .../kubuntu-meta/{ => debian/distrospecific}/COPYING | 0 .../kubuntu-meta/{ => debian/distrospecific}/README | 0 .../{ => debian/distrospecific}/debootstrap-version | 0 .../kubuntu-meta/{ => debian/distrospecific}/desktop | 0 .../kubuntu-meta/{ => debian/distrospecific}/desktop-amd64 | 0 .../kubuntu-meta/{ => debian/distrospecific}/desktop-hppa | 0 .../kubuntu-meta/{ => debian/distrospecific}/desktop-i386 | 0 .../kubuntu-meta/{ => debian/distrospecific}/desktop-ia64 | 0 .../kubuntu-meta/{ => debian/distrospecific}/desktop-lpia | 0 .../kubuntu-meta/{ => debian/distrospecific}/desktop-powerpc | 0 .../{ => debian/distrospecific}/desktop-recommends-amd64 | 0 .../{ => debian/distrospecific}/desktop-recommends-hppa | 0 .../{ => debian/distrospecific}/desktop-recommends-i386 | 0 .../{ => debian/distrospecific}/desktop-recommends-ia64 | 0 .../{ => debian/distrospecific}/desktop-recommends-lpia | 0 .../{ => debian/distrospecific}/desktop-recommends-powerpc | 0 .../{ => debian/distrospecific}/desktop-recommends-sparc | 0 .../kubuntu-meta/{ => debian/distrospecific}/desktop-sparc | 0 .../kubuntu-meta/{ => debian/distrospecific}/update | 0 .../kubuntu-meta/{ => debian/distrospecific}/update.cfg | 0 ubuntu/precise/metapackages/kubuntu-meta/debian/rules | 3 +++ .../kubuntu-meta/{ => debian/distrospecific}/COPYING | 0 .../kubuntu-meta/{ => debian/distrospecific}/README | 0 .../{ => debian/distrospecific}/debootstrap-version | 0 .../kubuntu-meta/{ => debian/distrospecific}/desktop | 0 .../kubuntu-meta/{ => debian/distrospecific}/desktop-amd64 | 0 .../kubuntu-meta/{ => debian/distrospecific}/desktop-hppa | 0 .../kubuntu-meta/{ => debian/distrospecific}/desktop-i386 | 0 .../kubuntu-meta/{ => debian/distrospecific}/desktop-ia64 | 0 .../kubuntu-meta/{ => debian/distrospecific}/desktop-lpia | 0 .../kubuntu-meta/{ => debian/distrospecific}/desktop-powerpc | 0 .../{ => debian/distrospecific}/desktop-recommends-amd64 | 0 .../{ => debian/distrospecific}/desktop-recommends-hppa | 0 .../{ => debian/distrospecific}/desktop-recommends-i386 | 0 .../{ => debian/distrospecific}/desktop-recommends-ia64 | 0 .../{ => debian/distrospecific}/desktop-recommends-lpia | 0 .../{ => debian/distrospecific}/desktop-recommends-powerpc | 0 .../{ => debian/distrospecific}/desktop-recommends-sparc | 0 .../kubuntu-meta/{ => debian/distrospecific}/desktop-sparc | 0 .../kubuntu-meta/{ => debian/distrospecific}/update | 0 .../kubuntu-meta/{ => debian/distrospecific}/update.cfg | 0 ubuntu/raring/metapackages/kubuntu-meta/debian/rules | 3 +++ 63 files changed, 9 insertions(+) rename ubuntu/maverick/metapackages/kubuntu-meta/{ => debian/distrospecific}/COPYING (100%) rename ubuntu/maverick/metapackages/kubuntu-meta/{ => debian/distrospecific}/README (100%) rename ubuntu/maverick/metapackages/kubuntu-meta/{ => debian/distrospecific}/debootstrap-version (100%) rename ubuntu/maverick/metapackages/kubuntu-meta/{ => debian/distrospecific}/desktop (100%) rename ubuntu/maverick/metapackages/kubuntu-meta/{ => debian/distrospecific}/desktop-amd64 (100%) rename ubuntu/maverick/metapackages/kubuntu-meta/{ => debian/distrospecific}/desktop-hppa (100%) rename ubuntu/maverick/metapackages/kubuntu-meta/{ => debian/distrospecific}/desktop-i386 (100%) rename ubuntu/maverick/metapackages/kubuntu-meta/{ => debian/distrospecific}/desktop-ia64 (100%) rename ubuntu/maverick/metapackages/kubuntu-meta/{ => debian/distrospecific}/desktop-lpia (100%) rename ubuntu/maverick/metapackages/kubuntu-meta/{ => debian/distrospecific}/desktop-powerpc (100%) rename ubuntu/maverick/metapackages/kubuntu-meta/{ => debian/distrospecific}/desktop-recommends-amd64 (100%) rename ubuntu/maverick/metapackages/kubuntu-meta/{ => debian/distrospecific}/desktop-recommends-hppa (100%) rename ubuntu/maverick/metapackages/kubuntu-meta/{ => debian/distrospecific}/desktop-recommends-i386 (100%) rename ubuntu/maverick/metapackages/kubuntu-meta/{ => debian/distrospecific}/desktop-recommends-ia64 (100%) rename ubuntu/maverick/metapackages/kubuntu-meta/{ => debian/distrospecific}/desktop-recommends-lpia (100%) rename ubuntu/maverick/metapackages/kubuntu-meta/{ => debian/distrospecific}/desktop-recommends-powerpc (100%) rename ubuntu/maverick/metapackages/kubuntu-meta/{ => debian/distrospecific}/desktop-recommends-sparc (100%) rename ubuntu/maverick/metapackages/kubuntu-meta/{ => debian/distrospecific}/desktop-sparc (100%) rename ubuntu/maverick/metapackages/kubuntu-meta/{ => debian/distrospecific}/update (100%) rename ubuntu/maverick/metapackages/kubuntu-meta/{ => debian/distrospecific}/update.cfg (100%) rename ubuntu/precise/metapackages/kubuntu-meta/{ => debian/distrospecific}/COPYING (100%) rename ubuntu/precise/metapackages/kubuntu-meta/{ => debian/distrospecific}/README (100%) rename ubuntu/precise/metapackages/kubuntu-meta/{ => debian/distrospecific}/debootstrap-version (100%) rename ubuntu/precise/metapackages/kubuntu-meta/{ => debian/distrospecific}/desktop (100%) rename ubuntu/precise/metapackages/kubuntu-meta/{ => debian/distrospecific}/desktop-amd64 (100%) rename ubuntu/precise/metapackages/kubuntu-meta/{ => debian/distrospecific}/desktop-hppa (100%) rename ubuntu/precise/metapackages/kubuntu-meta/{ => debian/distrospecific}/desktop-i386 (100%) rename ubuntu/precise/metapackages/kubuntu-meta/{ => debian/distrospecific}/desktop-ia64 (100%) rename ubuntu/precise/metapackages/kubuntu-meta/{ => debian/distrospecific}/desktop-lpia (100%) rename ubuntu/precise/metapackages/kubuntu-meta/{ => debian/distrospecific}/desktop-powerpc (100%) rename ubuntu/precise/metapackages/kubuntu-meta/{ => debian/distrospecific}/desktop-recommends-amd64 (100%) rename ubuntu/precise/metapackages/kubuntu-meta/{ => debian/distrospecific}/desktop-recommends-hppa (100%) rename ubuntu/precise/metapackages/kubuntu-meta/{ => debian/distrospecific}/desktop-recommends-i386 (100%) rename ubuntu/precise/metapackages/kubuntu-meta/{ => debian/distrospecific}/desktop-recommends-ia64 (100%) rename ubuntu/precise/metapackages/kubuntu-meta/{ => debian/distrospecific}/desktop-recommends-lpia (100%) rename ubuntu/precise/metapackages/kubuntu-meta/{ => debian/distrospecific}/desktop-recommends-powerpc (100%) rename ubuntu/precise/metapackages/kubuntu-meta/{ => debian/distrospecific}/desktop-recommends-sparc (100%) rename ubuntu/precise/metapackages/kubuntu-meta/{ => debian/distrospecific}/desktop-sparc (100%) rename ubuntu/precise/metapackages/kubuntu-meta/{ => debian/distrospecific}/update (100%) rename ubuntu/precise/metapackages/kubuntu-meta/{ => debian/distrospecific}/update.cfg (100%) rename ubuntu/raring/metapackages/kubuntu-meta/{ => debian/distrospecific}/COPYING (100%) rename ubuntu/raring/metapackages/kubuntu-meta/{ => debian/distrospecific}/README (100%) rename ubuntu/raring/metapackages/kubuntu-meta/{ => debian/distrospecific}/debootstrap-version (100%) rename ubuntu/raring/metapackages/kubuntu-meta/{ => debian/distrospecific}/desktop (100%) rename ubuntu/raring/metapackages/kubuntu-meta/{ => debian/distrospecific}/desktop-amd64 (100%) rename ubuntu/raring/metapackages/kubuntu-meta/{ => debian/distrospecific}/desktop-hppa (100%) rename ubuntu/raring/metapackages/kubuntu-meta/{ => debian/distrospecific}/desktop-i386 (100%) rename ubuntu/raring/metapackages/kubuntu-meta/{ => debian/distrospecific}/desktop-ia64 (100%) rename ubuntu/raring/metapackages/kubuntu-meta/{ => debian/distrospecific}/desktop-lpia (100%) rename ubuntu/raring/metapackages/kubuntu-meta/{ => debian/distrospecific}/desktop-powerpc (100%) rename ubuntu/raring/metapackages/kubuntu-meta/{ => debian/distrospecific}/desktop-recommends-amd64 (100%) rename ubuntu/raring/metapackages/kubuntu-meta/{ => debian/distrospecific}/desktop-recommends-hppa (100%) rename ubuntu/raring/metapackages/kubuntu-meta/{ => debian/distrospecific}/desktop-recommends-i386 (100%) rename ubuntu/raring/metapackages/kubuntu-meta/{ => debian/distrospecific}/desktop-recommends-ia64 (100%) rename ubuntu/raring/metapackages/kubuntu-meta/{ => debian/distrospecific}/desktop-recommends-lpia (100%) rename ubuntu/raring/metapackages/kubuntu-meta/{ => debian/distrospecific}/desktop-recommends-powerpc (100%) rename ubuntu/raring/metapackages/kubuntu-meta/{ => debian/distrospecific}/desktop-recommends-sparc (100%) rename ubuntu/raring/metapackages/kubuntu-meta/{ => debian/distrospecific}/desktop-sparc (100%) rename ubuntu/raring/metapackages/kubuntu-meta/{ => debian/distrospecific}/update (100%) rename ubuntu/raring/metapackages/kubuntu-meta/{ => debian/distrospecific}/update.cfg (100%) diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/COPYING b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/COPYING similarity index 100% rename from ubuntu/maverick/metapackages/kubuntu-meta/COPYING rename to ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/COPYING diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/README b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/README similarity index 100% rename from ubuntu/maverick/metapackages/kubuntu-meta/README rename to ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/README diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debootstrap-version b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/debootstrap-version similarity index 100% rename from ubuntu/maverick/metapackages/kubuntu-meta/debootstrap-version rename to ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/debootstrap-version diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop similarity index 100% rename from ubuntu/maverick/metapackages/kubuntu-meta/desktop rename to ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-amd64 b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-amd64 similarity index 100% rename from ubuntu/maverick/metapackages/kubuntu-meta/desktop-amd64 rename to ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-amd64 diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-hppa b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-hppa similarity index 100% rename from ubuntu/maverick/metapackages/kubuntu-meta/desktop-hppa rename to ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-hppa diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-i386 b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-i386 similarity index 100% rename from ubuntu/maverick/metapackages/kubuntu-meta/desktop-i386 rename to ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-i386 diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-ia64 b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-ia64 similarity index 100% rename from ubuntu/maverick/metapackages/kubuntu-meta/desktop-ia64 rename to ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-ia64 diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-lpia b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-lpia similarity index 100% rename from ubuntu/maverick/metapackages/kubuntu-meta/desktop-lpia rename to ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-lpia diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-powerpc b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-powerpc similarity index 100% rename from ubuntu/maverick/metapackages/kubuntu-meta/desktop-powerpc rename to ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-powerpc diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-amd64 b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-amd64 similarity index 100% rename from ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-amd64 rename to ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-amd64 diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-hppa b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-hppa similarity index 100% rename from ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-hppa rename to ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-hppa diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-i386 b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-i386 similarity index 100% rename from ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-i386 rename to ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-i386 diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-ia64 b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-ia64 similarity index 100% rename from ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-ia64 rename to ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-ia64 diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-lpia b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-lpia similarity index 100% rename from ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-lpia rename to ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-lpia diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-powerpc b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-powerpc similarity index 100% rename from ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-powerpc rename to ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-powerpc diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-sparc b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-sparc similarity index 100% rename from ubuntu/maverick/metapackages/kubuntu-meta/desktop-recommends-sparc rename to ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-sparc diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/desktop-sparc b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-sparc similarity index 100% rename from ubuntu/maverick/metapackages/kubuntu-meta/desktop-sparc rename to ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-sparc diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/update b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/update similarity index 100% rename from ubuntu/maverick/metapackages/kubuntu-meta/update rename to ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/update diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/update.cfg b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/update.cfg similarity index 100% rename from ubuntu/maverick/metapackages/kubuntu-meta/update.cfg rename to ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/update.cfg diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/rules b/ubuntu/maverick/metapackages/kubuntu-meta/debian/rules index 2b69924b8..ceee2fb18 100755 --- 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 diff --git a/ubuntu/precise/metapackages/kubuntu-meta/COPYING b/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/COPYING similarity index 100% rename from ubuntu/precise/metapackages/kubuntu-meta/COPYING rename to ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/COPYING diff --git a/ubuntu/precise/metapackages/kubuntu-meta/README b/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/README similarity index 100% rename from ubuntu/precise/metapackages/kubuntu-meta/README rename to ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/README diff --git a/ubuntu/precise/metapackages/kubuntu-meta/debootstrap-version b/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/debootstrap-version similarity index 100% rename from ubuntu/precise/metapackages/kubuntu-meta/debootstrap-version rename to ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/debootstrap-version diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop b/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop similarity index 100% rename from ubuntu/precise/metapackages/kubuntu-meta/desktop rename to ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-amd64 b/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-amd64 similarity index 100% rename from ubuntu/precise/metapackages/kubuntu-meta/desktop-amd64 rename to ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-amd64 diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-hppa b/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-hppa similarity index 100% rename from ubuntu/precise/metapackages/kubuntu-meta/desktop-hppa rename to ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-hppa diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-i386 b/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-i386 similarity index 100% rename from ubuntu/precise/metapackages/kubuntu-meta/desktop-i386 rename to ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-i386 diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-ia64 b/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-ia64 similarity index 100% rename from ubuntu/precise/metapackages/kubuntu-meta/desktop-ia64 rename to ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-ia64 diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-lpia b/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-lpia similarity index 100% rename from ubuntu/precise/metapackages/kubuntu-meta/desktop-lpia rename to ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-lpia diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-powerpc b/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-powerpc similarity index 100% rename from ubuntu/precise/metapackages/kubuntu-meta/desktop-powerpc rename to ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-powerpc diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-recommends-amd64 b/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-amd64 similarity index 100% rename from ubuntu/precise/metapackages/kubuntu-meta/desktop-recommends-amd64 rename to ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-amd64 diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-recommends-hppa b/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-hppa similarity index 100% rename from ubuntu/precise/metapackages/kubuntu-meta/desktop-recommends-hppa rename to ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-hppa diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-recommends-i386 b/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-i386 similarity index 100% rename from ubuntu/precise/metapackages/kubuntu-meta/desktop-recommends-i386 rename to ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-i386 diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-recommends-ia64 b/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-ia64 similarity index 100% rename from ubuntu/precise/metapackages/kubuntu-meta/desktop-recommends-ia64 rename to ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-ia64 diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-recommends-lpia b/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-lpia similarity index 100% rename from ubuntu/precise/metapackages/kubuntu-meta/desktop-recommends-lpia rename to ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-lpia diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-recommends-powerpc b/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-powerpc similarity index 100% rename from ubuntu/precise/metapackages/kubuntu-meta/desktop-recommends-powerpc rename to ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-powerpc diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-recommends-sparc b/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-sparc similarity index 100% rename from ubuntu/precise/metapackages/kubuntu-meta/desktop-recommends-sparc rename to ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-sparc diff --git a/ubuntu/precise/metapackages/kubuntu-meta/desktop-sparc b/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-sparc similarity index 100% rename from ubuntu/precise/metapackages/kubuntu-meta/desktop-sparc rename to ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/desktop-sparc diff --git a/ubuntu/precise/metapackages/kubuntu-meta/update b/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/update similarity index 100% rename from ubuntu/precise/metapackages/kubuntu-meta/update rename to ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/update diff --git a/ubuntu/precise/metapackages/kubuntu-meta/update.cfg b/ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/update.cfg similarity index 100% rename from ubuntu/precise/metapackages/kubuntu-meta/update.cfg rename to ubuntu/precise/metapackages/kubuntu-meta/debian/distrospecific/update.cfg diff --git a/ubuntu/precise/metapackages/kubuntu-meta/debian/rules b/ubuntu/precise/metapackages/kubuntu-meta/debian/rules index 2b69924b8..ceee2fb18 100755 --- 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 diff --git a/ubuntu/raring/metapackages/kubuntu-meta/COPYING b/ubuntu/raring/metapackages/kubuntu-meta/debian/distrospecific/COPYING similarity index 100% rename from ubuntu/raring/metapackages/kubuntu-meta/COPYING rename to 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 similarity index 100% rename from ubuntu/raring/metapackages/kubuntu-meta/README rename to 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 similarity index 100% rename from ubuntu/raring/metapackages/kubuntu-meta/debootstrap-version rename to 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 similarity index 100% rename from ubuntu/raring/metapackages/kubuntu-meta/desktop rename to 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 similarity index 100% rename from ubuntu/raring/metapackages/kubuntu-meta/desktop-amd64 rename to 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 similarity index 100% rename from ubuntu/raring/metapackages/kubuntu-meta/desktop-hppa rename to 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 similarity index 100% rename from ubuntu/raring/metapackages/kubuntu-meta/desktop-i386 rename to 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 similarity index 100% rename from ubuntu/raring/metapackages/kubuntu-meta/desktop-ia64 rename to 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 similarity index 100% rename from ubuntu/raring/metapackages/kubuntu-meta/desktop-lpia rename to 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 similarity index 100% rename from ubuntu/raring/metapackages/kubuntu-meta/desktop-powerpc rename to 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 similarity index 100% rename from ubuntu/raring/metapackages/kubuntu-meta/desktop-recommends-amd64 rename to 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 similarity index 100% rename from ubuntu/raring/metapackages/kubuntu-meta/desktop-recommends-hppa rename to 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 similarity index 100% rename from ubuntu/raring/metapackages/kubuntu-meta/desktop-recommends-i386 rename to 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 similarity index 100% rename from ubuntu/raring/metapackages/kubuntu-meta/desktop-recommends-ia64 rename to 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 similarity index 100% rename from ubuntu/raring/metapackages/kubuntu-meta/desktop-recommends-lpia rename to 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 similarity index 100% rename from ubuntu/raring/metapackages/kubuntu-meta/desktop-recommends-powerpc rename to 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 similarity index 100% rename from ubuntu/raring/metapackages/kubuntu-meta/desktop-recommends-sparc rename to 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 similarity index 100% rename from ubuntu/raring/metapackages/kubuntu-meta/desktop-sparc rename to 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 similarity index 100% rename from ubuntu/raring/metapackages/kubuntu-meta/update rename to 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 similarity index 100% rename from ubuntu/raring/metapackages/kubuntu-meta/update.cfg rename to 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