From e6d7e8e6936e70e1d6a7d1f5df5171280befbfd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Wed, 15 Jan 2014 20:07:03 +0100
Subject: Update remaining metapackages on Debian and Ubuntu to conform the
 current automated scripts on build-farm

---
 .../distrospecific/ubiquity-hooks/55_trinity       | 52 ++++++++++++++++++++++
 .../metapackages/ubiquity-trinity/debian/rules     | 16 +++++++
 .../ubiquity-trinity/ubiquity-hooks/55_trinity     | 52 ----------------------
 3 files changed, 68 insertions(+), 52 deletions(-)
 create mode 100755 ubuntu/raring/metapackages/ubiquity-trinity/debian/distrospecific/ubiquity-hooks/55_trinity
 delete mode 100755 ubuntu/raring/metapackages/ubiquity-trinity/ubiquity-hooks/55_trinity

(limited to 'ubuntu/raring/metapackages/ubiquity-trinity')

diff --git a/ubuntu/raring/metapackages/ubiquity-trinity/debian/distrospecific/ubiquity-hooks/55_trinity b/ubuntu/raring/metapackages/ubiquity-trinity/debian/distrospecific/ubiquity-hooks/55_trinity
new file mode 100755
index 000000000..e31165c02
--- /dev/null
+++ b/ubuntu/raring/metapackages/ubiquity-trinity/debian/distrospecific/ubiquity-hooks/55_trinity
@@ -0,0 +1,52 @@
+#! /bin/sh
+set -e
+
+#-- configure autologin
+. /usr/share/debconf/confmodule
+
+export LANG=C # avoid locale errors from perl
+ROOT=/target
+chroot=chroot
+log='log-output -t trinity-livecd'
+
+db_get passwd/username
+USER="$RET"
+db_get passwd/auto-login
+if [ -n "$USER" ] && [ "$RET" = true ]; then
+    if $chroot $ROOT [ -f /etc/trinity/kdm/kdmrc ]; then
+        # Configure KDM autologin
+        $log $chroot $ROOT sed -i$BACKUP -r \
+            -e "s/^#?AutoLoginEnable=.*\$/AutoLoginEnable=true/" \
+            -e "s/^#?AutoLoginUser=.*\$/AutoLoginUser=$USER/" \
+            -e "s/^#?AutoLoginAgain=.*\$/AutoLoginAgain=true/" \
+            /etc/trinity/kdm/kdmrc
+    fi
+
+    if $chroot $ROOT [ -f /etc/trinity/tdm/tdmrc ]; then
+        # Configure TDM autologin
+        $log $chroot $ROOT sed -i$BACKUP -r \
+            -e "s/^#?AutoLoginEnable=.*\$/AutoLoginEnable=true/" \
+            -e "s/^#?AutoLoginUser=.*\$/AutoLoginUser=$USER/" \
+            -e "s/^#?AutoLoginAgain=.*\$/AutoLoginAgain=true/" \
+            /etc/trinity/tdm/tdmrc
+    fi
+fi
+
+#-- cleanup additional packages
+packages=""
+if [ -f "$ROOT/var/lib/dpkg/info/casper-trinity.list" ]; then
+    packages="$packages casper-trinity"
+fi
+if [ -f "$ROOT/var/lib/dpkg/info/ubiquity-trinity.list" ]; then
+    packages="$packages ubiquity-trinity"
+fi
+if [ -n "$packages" ]; then
+    if [ -f "$ROOT/usr/bin/apt-get" ]; then
+        $chroot $ROOT apt-get -y purge $packages
+        $chroot $ROOT apt-get -y --purge autoremove
+    else
+        $chroot $ROOT dpkg -P $packages
+    fi
+fi
+
+exit 0
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
diff --git a/ubuntu/raring/metapackages/ubiquity-trinity/ubiquity-hooks/55_trinity b/ubuntu/raring/metapackages/ubiquity-trinity/ubiquity-hooks/55_trinity
deleted file mode 100755
index e31165c02..000000000
--- a/ubuntu/raring/metapackages/ubiquity-trinity/ubiquity-hooks/55_trinity
+++ /dev/null
@@ -1,52 +0,0 @@
-#! /bin/sh
-set -e
-
-#-- configure autologin
-. /usr/share/debconf/confmodule
-
-export LANG=C # avoid locale errors from perl
-ROOT=/target
-chroot=chroot
-log='log-output -t trinity-livecd'
-
-db_get passwd/username
-USER="$RET"
-db_get passwd/auto-login
-if [ -n "$USER" ] && [ "$RET" = true ]; then
-    if $chroot $ROOT [ -f /etc/trinity/kdm/kdmrc ]; then
-        # Configure KDM autologin
-        $log $chroot $ROOT sed -i$BACKUP -r \
-            -e "s/^#?AutoLoginEnable=.*\$/AutoLoginEnable=true/" \
-            -e "s/^#?AutoLoginUser=.*\$/AutoLoginUser=$USER/" \
-            -e "s/^#?AutoLoginAgain=.*\$/AutoLoginAgain=true/" \
-            /etc/trinity/kdm/kdmrc
-    fi
-
-    if $chroot $ROOT [ -f /etc/trinity/tdm/tdmrc ]; then
-        # Configure TDM autologin
-        $log $chroot $ROOT sed -i$BACKUP -r \
-            -e "s/^#?AutoLoginEnable=.*\$/AutoLoginEnable=true/" \
-            -e "s/^#?AutoLoginUser=.*\$/AutoLoginUser=$USER/" \
-            -e "s/^#?AutoLoginAgain=.*\$/AutoLoginAgain=true/" \
-            /etc/trinity/tdm/tdmrc
-    fi
-fi
-
-#-- cleanup additional packages
-packages=""
-if [ -f "$ROOT/var/lib/dpkg/info/casper-trinity.list" ]; then
-    packages="$packages casper-trinity"
-fi
-if [ -f "$ROOT/var/lib/dpkg/info/ubiquity-trinity.list" ]; then
-    packages="$packages ubiquity-trinity"
-fi
-if [ -n "$packages" ]; then
-    if [ -f "$ROOT/usr/bin/apt-get" ]; then
-        $chroot $ROOT apt-get -y purge $packages
-        $chroot $ROOT apt-get -y --purge autoremove
-    else
-        $chroot $ROOT dpkg -P $packages
-    fi
-fi
-
-exit 0
-- 
cgit v1.2.3