summaryrefslogtreecommitdiffstats
path: root/ubuntu/raring/metapackages
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2014-01-15 20:07:03 +0100
committerSlávek Banko <slavek.banko@axis.cz>2014-01-15 20:07:15 +0100
commite6d7e8e6936e70e1d6a7d1f5df5171280befbfd1 (patch)
treee4df23e3e314e60f112b3e6360f4a89c37ea8e23 /ubuntu/raring/metapackages
parent68a2f23896b2dfd53c80fff69f3663b76b1b73e0 (diff)
downloadtde-packaging-e6d7e8e6936e70e1d6a7d1f5df5171280befbfd1.tar.gz
tde-packaging-e6d7e8e6936e70e1d6a7d1f5df5171280befbfd1.zip
Update remaining metapackages on Debian and Ubuntu
to conform the current automated scripts on build-farm
Diffstat (limited to 'ubuntu/raring/metapackages')
-rwxr-xr-xubuntu/raring/metapackages/casper-trinity/debian/distrospecific/scripts/casper-bottom/15autologin-trinity (renamed from ubuntu/raring/metapackages/casper-trinity/scripts/casper-bottom/15autologin-trinity)0
-rwxr-xr-xubuntu/raring/metapackages/casper-trinity/debian/distrospecific/scripts/casper-bottom/25adduser-trinity (renamed from ubuntu/raring/metapackages/casper-trinity/scripts/casper-bottom/25adduser-trinity)0
-rwxr-xr-xubuntu/raring/metapackages/casper-trinity/debian/rules16
-rw-r--r--ubuntu/raring/metapackages/rename-meta/Makefile8
-rwxr-xr-xubuntu/raring/metapackages/rename-meta/debian/rules1
-rw-r--r--[-rwxr-xr-x]ubuntu/raring/metapackages/sudo-trinity/debian/changelog0
-rw-r--r--[-rwxr-xr-x]ubuntu/raring/metapackages/sudo-trinity/debian/compat0
-rw-r--r--[-rwxr-xr-x]ubuntu/raring/metapackages/sudo-trinity/debian/dirs0
-rw-r--r--[-rwxr-xr-x]ubuntu/raring/metapackages/sudo-trinity/debian/distrospecific/Makefile (renamed from ubuntu/raring/metapackages/sudo-trinity/Makefile)24
-rw-r--r--ubuntu/raring/metapackages/sudo-trinity/debian/distrospecific/etc/sudoers.d/tde-secure-path (renamed from ubuntu/raring/metapackages/sudo-trinity/etc/sudoers.d/tde-secure-path)0
-rwxr-xr-xubuntu/raring/metapackages/sudo-trinity/debian/rules16
-rwxr-xr-xubuntu/raring/metapackages/ubiquity-trinity/debian/distrospecific/ubiquity-hooks/55_trinity (renamed from ubuntu/raring/metapackages/ubiquity-trinity/ubiquity-hooks/55_trinity)0
-rwxr-xr-xubuntu/raring/metapackages/ubiquity-trinity/debian/rules16
13 files changed, 60 insertions, 21 deletions
diff --git a/ubuntu/raring/metapackages/casper-trinity/scripts/casper-bottom/15autologin-trinity b/ubuntu/raring/metapackages/casper-trinity/debian/distrospecific/scripts/casper-bottom/15autologin-trinity
index a018471b7..a018471b7 100755
--- a/ubuntu/raring/metapackages/casper-trinity/scripts/casper-bottom/15autologin-trinity
+++ b/ubuntu/raring/metapackages/casper-trinity/debian/distrospecific/scripts/casper-bottom/15autologin-trinity
diff --git a/ubuntu/raring/metapackages/casper-trinity/scripts/casper-bottom/25adduser-trinity b/ubuntu/raring/metapackages/casper-trinity/debian/distrospecific/scripts/casper-bottom/25adduser-trinity
index bd764edcc..bd764edcc 100755
--- a/ubuntu/raring/metapackages/casper-trinity/scripts/casper-bottom/25adduser-trinity
+++ b/ubuntu/raring/metapackages/casper-trinity/debian/distrospecific/scripts/casper-bottom/25adduser-trinity
diff --git a/ubuntu/raring/metapackages/casper-trinity/debian/rules b/ubuntu/raring/metapackages/casper-trinity/debian/rules
index 9ded53d05..e6b6748ab 100755
--- a/ubuntu/raring/metapackages/casper-trinity/debian/rules
+++ b/ubuntu/raring/metapackages/casper-trinity/debian/rules
@@ -4,3 +4,19 @@ include /usr/share/cdbs/1/rules/debhelper.mk
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
+
+build: debian/stamp-distrospecific
+
+debian/stamp-distrospecific:
+ dh_testdir
+ [ -e debian/stamp-distrospecific ] || \
+ ls -a1 debian/distrospecific | grep -v "^\.*$$" | \
+ tee debian/stamp-distrospecific | \
+ tr "\n" "\0" | (cd debian/distrospecific && xargs -r0 mv -t ../..)
+
+clean::
+ dh_testdir
+ [ ! -e debian/stamp-distrospecific ] || \
+ cat debian/stamp-distrospecific | \
+ tr "\n" "\0" | xargs -r0 mv -t debian/distrospecific
+ rm -f debian/stamp-distrospecific
diff --git a/ubuntu/raring/metapackages/rename-meta/Makefile b/ubuntu/raring/metapackages/rename-meta/Makefile
deleted file mode 100644
index a36e6a1c9..000000000
--- a/ubuntu/raring/metapackages/rename-meta/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-FPACKAGE = ubuntu-trinity-rename-meta
-VERSION = 1.0
-
-build:
-
-clean:
-
-install:
diff --git a/ubuntu/raring/metapackages/rename-meta/debian/rules b/ubuntu/raring/metapackages/rename-meta/debian/rules
index a9e7e66cb..bcf749744 100755
--- a/ubuntu/raring/metapackages/rename-meta/debian/rules
+++ b/ubuntu/raring/metapackages/rename-meta/debian/rules
@@ -1,5 +1,4 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/class/makefile.mk
include /usr/share/cdbs/1/rules/debhelper.mk
DEB_BUILD_OPTIONS := nostrip
diff --git a/ubuntu/raring/metapackages/sudo-trinity/debian/changelog b/ubuntu/raring/metapackages/sudo-trinity/debian/changelog
index 6d79a642a..6d79a642a 100755..100644
--- a/ubuntu/raring/metapackages/sudo-trinity/debian/changelog
+++ b/ubuntu/raring/metapackages/sudo-trinity/debian/changelog
diff --git a/ubuntu/raring/metapackages/sudo-trinity/debian/compat b/ubuntu/raring/metapackages/sudo-trinity/debian/compat
index 7ed6ff82d..7ed6ff82d 100755..100644
--- a/ubuntu/raring/metapackages/sudo-trinity/debian/compat
+++ b/ubuntu/raring/metapackages/sudo-trinity/debian/compat
diff --git a/ubuntu/raring/metapackages/sudo-trinity/debian/dirs b/ubuntu/raring/metapackages/sudo-trinity/debian/dirs
index ee19d5d17..ee19d5d17 100755..100644
--- a/ubuntu/raring/metapackages/sudo-trinity/debian/dirs
+++ b/ubuntu/raring/metapackages/sudo-trinity/debian/dirs
diff --git a/ubuntu/raring/metapackages/sudo-trinity/Makefile b/ubuntu/raring/metapackages/sudo-trinity/debian/distrospecific/Makefile
index bc4653675..f106ff05e 100755..100644
--- a/ubuntu/raring/metapackages/sudo-trinity/Makefile
+++ b/ubuntu/raring/metapackages/sudo-trinity/debian/distrospecific/Makefile
@@ -1,12 +1,12 @@
-FPACKAGE = sudo-trinity
-VERSION = 1.0
-
-build:
-
-clean:
-
-install:
- mkdir -p /etc
- cp -Rp etc/* $(DESTDIR)/etc/
- chmod -R 644 $(DESTDIR)/etc
- chmod -R 0440 $(DESTDIR)/etc/sudoers.d/tde-secure-path \ No newline at end of file
+FPACKAGE = sudo-trinity
+VERSION = 1.0
+
+build:
+
+clean:
+
+install:
+ mkdir -p /etc
+ cp -Rp etc/* $(DESTDIR)/etc/
+ chmod -R 644 $(DESTDIR)/etc
+ chmod -R 0440 $(DESTDIR)/etc/sudoers.d/tde-secure-path
diff --git a/ubuntu/raring/metapackages/sudo-trinity/etc/sudoers.d/tde-secure-path b/ubuntu/raring/metapackages/sudo-trinity/debian/distrospecific/etc/sudoers.d/tde-secure-path
index f3c34f20a..f3c34f20a 100644
--- a/ubuntu/raring/metapackages/sudo-trinity/etc/sudoers.d/tde-secure-path
+++ b/ubuntu/raring/metapackages/sudo-trinity/debian/distrospecific/etc/sudoers.d/tde-secure-path
diff --git a/ubuntu/raring/metapackages/sudo-trinity/debian/rules b/ubuntu/raring/metapackages/sudo-trinity/debian/rules
index f8c89d5db..e5e2870b7 100755
--- a/ubuntu/raring/metapackages/sudo-trinity/debian/rules
+++ b/ubuntu/raring/metapackages/sudo-trinity/debian/rules
@@ -9,3 +9,19 @@ DEB_INSTALL_DOCS_ALL :=
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
+
+pre-build:: debian/stamp-distrospecific
+
+debian/stamp-distrospecific:
+ dh_testdir
+ [ -e debian/stamp-distrospecific ] || \
+ ls -a1 debian/distrospecific | grep -v "^\.*$$" | \
+ tee debian/stamp-distrospecific | \
+ tr "\n" "\0" | (cd debian/distrospecific && xargs -r0 mv -t ../..)
+
+clean::
+ dh_testdir
+ [ ! -e debian/stamp-distrospecific ] || \
+ cat debian/stamp-distrospecific | \
+ tr "\n" "\0" | xargs -r0 mv -t debian/distrospecific
+ rm -f debian/stamp-distrospecific
diff --git a/ubuntu/raring/metapackages/ubiquity-trinity/ubiquity-hooks/55_trinity b/ubuntu/raring/metapackages/ubiquity-trinity/debian/distrospecific/ubiquity-hooks/55_trinity
index e31165c02..e31165c02 100755
--- a/ubuntu/raring/metapackages/ubiquity-trinity/ubiquity-hooks/55_trinity
+++ b/ubuntu/raring/metapackages/ubiquity-trinity/debian/distrospecific/ubiquity-hooks/55_trinity
diff --git a/ubuntu/raring/metapackages/ubiquity-trinity/debian/rules b/ubuntu/raring/metapackages/ubiquity-trinity/debian/rules
index 9ded53d05..e6b6748ab 100755
--- a/ubuntu/raring/metapackages/ubiquity-trinity/debian/rules
+++ b/ubuntu/raring/metapackages/ubiquity-trinity/debian/rules
@@ -4,3 +4,19 @@ include /usr/share/cdbs/1/rules/debhelper.mk
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
+
+build: debian/stamp-distrospecific
+
+debian/stamp-distrospecific:
+ dh_testdir
+ [ -e debian/stamp-distrospecific ] || \
+ ls -a1 debian/distrospecific | grep -v "^\.*$$" | \
+ tee debian/stamp-distrospecific | \
+ tr "\n" "\0" | (cd debian/distrospecific && xargs -r0 mv -t ../..)
+
+clean::
+ dh_testdir
+ [ ! -e debian/stamp-distrospecific ] || \
+ cat debian/stamp-distrospecific | \
+ tr "\n" "\0" | xargs -r0 mv -t debian/distrospecific
+ rm -f debian/stamp-distrospecific