From 8f224c17373c8714ffeb13127a4e266a47990a16 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Wed, 3 Dec 2014 09:38:52 -0800 Subject: [PATCH] Ubuntu packaging: move support files into debian directory Signed-off-by: Dirk Hohndel --- packaging/ubuntu/{changelog.txt => debian/changelog} | 0 packaging/ubuntu/{ => debian}/control | 0 packaging/ubuntu/{ => debian}/copyright | 0 packaging/ubuntu/{ => debian}/rules | 0 packaging/ubuntu/{ => debian}/source.lintian-overrides | 0 packaging/ubuntu/make-package.sh | 10 +++++----- 6 files changed, 5 insertions(+), 5 deletions(-) rename packaging/ubuntu/{changelog.txt => debian/changelog} (100%) rename packaging/ubuntu/{ => debian}/control (100%) rename packaging/ubuntu/{ => debian}/copyright (100%) rename packaging/ubuntu/{ => debian}/rules (100%) rename packaging/ubuntu/{ => debian}/source.lintian-overrides (100%) diff --git a/packaging/ubuntu/changelog.txt b/packaging/ubuntu/debian/changelog similarity index 100% rename from packaging/ubuntu/changelog.txt rename to packaging/ubuntu/debian/changelog diff --git a/packaging/ubuntu/control b/packaging/ubuntu/debian/control similarity index 100% rename from packaging/ubuntu/control rename to packaging/ubuntu/debian/control diff --git a/packaging/ubuntu/copyright b/packaging/ubuntu/debian/copyright similarity index 100% rename from packaging/ubuntu/copyright rename to packaging/ubuntu/debian/copyright diff --git a/packaging/ubuntu/rules b/packaging/ubuntu/debian/rules similarity index 100% rename from packaging/ubuntu/rules rename to packaging/ubuntu/debian/rules diff --git a/packaging/ubuntu/source.lintian-overrides b/packaging/ubuntu/debian/source.lintian-overrides similarity index 100% rename from packaging/ubuntu/source.lintian-overrides rename to packaging/ubuntu/debian/source.lintian-overrides diff --git a/packaging/ubuntu/make-package.sh b/packaging/ubuntu/make-package.sh index 71daff1ae..02a7bf02c 100644 --- a/packaging/ubuntu/make-package.sh +++ b/packaging/ubuntu/make-package.sh @@ -22,14 +22,14 @@ echo $GITVERSION > .gitversion dh_make --email dirk@hohndel.org -c gpl2 --createorig --single --yes -p subsurface_$VERSION rm debian/*.ex debian/*.EX debian/README.* -cp ../subsurface/packaging/ubuntu/control debian/control -cp ../subsurface/packaging/ubuntu/copyright debian/copyright -cp ../subsurface/packaging/ubuntu/rules debian/rules -cp ../subsurface/packaging/ubuntu/source.lintian-overrides debian/source.lintian-overrides +cp ../subsurface/packaging/ubuntu/debian/control debian/control +cp ../subsurface/packaging/ubuntu/debian/copyright debian/copyright +cp ../subsurface/packaging/ubuntu/debian/rules debian/rules +cp ../subsurface/packaging/ubuntu/debian/source.lintian-overrides debian/source.lintian-overrides # do something clever with changelog mv debian/changelog debian/autocl head -1 debian/autocl | sed -e 's/unstable/trusty/' > debian/changelog -cat ../subsurface/packaging/ubuntu/changelog.txt >> debian/changelog +cat ../subsurface/packaging/ubuntu/debian/changelog >> debian/changelog tail -1 debian/autocl >> debian/changelog rm -f debian/autocl