Handle new package namedpkg

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>

5 files changed, 36 insertions, 35 deletions

diff --git a/pmwg-ci/DEBIAN/control b/automerge/DEBIAN/control
index 0e3cda8..c305781 100644
--- a/pmwg-ci/DEBIAN/control
+++ b/automerge/DEBIAN/control
@@ -1,4 +1,4 @@
-Package: pmwg-ci
+Package: automerge
 Version: 0.6
 Section: base
 Priority: optional
diff --git a/pmwg-ci/DEBIAN/postinst b/automerge/DEBIAN/postinst
index cc1f786..cc1f786 100755
--- a/pmwg-ci/DEBIAN/postinst
+++ b/automerge/DEBIAN/postinst
diff --git a/pmwg-ci/DEBIAN/postrm b/automerge/DEBIAN/postrm
index cc1f786..cc1f786 100755
--- a/pmwg-ci/DEBIAN/postrm
+++ b/automerge/DEBIAN/postrm
diff --git a/ci-dpkg b/ci-dpkg
new file mode 100755
index 0000000..b9acd0c
--- /dev/null
+++ b/ci-dpkg
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+TAG=$(git describe --tags master) 
+VERSION=${TAG:1}
+
+if [ $(id -u) -eq 0 ]; then
+    echo "This script can't be run as root"
+    exit 1
+fi
+
+git merge --no-edit $TAG
+
+mkdir -p ./automerge/usr/bin
+cp ci-blame  ./automerge/usr/bin
+cp ci-config ./automerge/usr/bin
+cp ci-merge  ./automerge/usr/bin
+cp ci-report ./automerge/usr/bin
+cp ci-test ./automerge/usr/bin
+
+mkdir -p ./automerge/usr/share/doc
+cp README ./automerge/usr/share/doc
+cp copyright ./automerge/usr/share/doc
+cp changelog ./automerge/usr/share/doc
+cp changelog.Debian ./automerge/usr/share/doc
+
+mkdir -p ./automerge/etc
+cp ci.conf.sample ./automerge/etc
+
+sed -i "s/Version:.*/Version: $VERSION/" automerge/DEBIAN/control
+git add automerge/DEBIAN/control
+git commit -s -m "Setting version $VERSION in control file" automerge/DEBIAN/control
+
+dpkg-deb --build automerge automerge-$VERSION.deb
+
+rm -rf ./automerge/usr ./automerge/etc
diff --git a/pmwg-ci-dpkg b/pmwg-ci-dpkg
deleted file mode 100755
index 1ba5ed2..0000000
--- a/pmwg-ci-dpkg
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-TAG=$(git describe --tags master) 
-VERSION=${TAG:1}
-
-if [ $(id -u) -eq 0 ]; then
-    echo "This script can't be run as root"
-    exit 1
-fi
-
-git merge --no-edit $TAG
-
-mkdir -p ./pmwg-ci/usr/bin
-cp pmwg-ci-blame  ./pmwg-ci/usr/bin
-cp pmwg-ci-config ./pmwg-ci/usr/bin
-cp pmwg-ci-integ  ./pmwg-ci/usr/bin
-cp pmwg-ci-report ./pmwg-ci/usr/bin
-
-mkdir -p ./pmwg-ci/usr/share/doc
-cp README ./pmwg-ci/usr/share/doc
-cp copyright ./pmwg-ci/usr/share/doc
-cp changelog ./pmwg-ci/usr/share/doc
-cp changelog.Debian ./pmwg-ci/usr/share/doc
-
-mkdir -p ./pmwg-ci/etc
-cp pmwg-ci.conf ./pmwg-ci/etc
-
-sed -i "s/Version:.*/Version: $VERSION/" pmwg-ci/DEBIAN/control
-git add pmwg-ci/DEBIAN/control
-git commit -s -m "Setting version $VERSION in control file" pmwg-ci/DEBIAN/control
-
-dpkg-deb --build pmwg-ci pmwg-ci-$VERSION.deb
-
-rm -rf ./pmwg-ci/usr ./pmwg-ci/etc