diff options
| -rw-r--r-- | packaging/ubuntu/debian/changelog (renamed from packaging/ubuntu/changelog.txt) | 0 | ||||
| -rw-r--r-- | packaging/ubuntu/debian/control (renamed from packaging/ubuntu/control) | 0 | ||||
| -rw-r--r-- | packaging/ubuntu/debian/copyright (renamed from packaging/ubuntu/copyright) | 0 | ||||
| -rwxr-xr-x | packaging/ubuntu/debian/rules (renamed from packaging/ubuntu/rules) | 0 | ||||
| -rw-r--r-- | packaging/ubuntu/debian/source.lintian-overrides (renamed from packaging/ubuntu/source.lintian-overrides) | 0 | ||||
| -rw-r--r-- | packaging/ubuntu/make-package.sh | 10 |
6 files changed, 5 insertions, 5 deletions
diff --git a/packaging/ubuntu/changelog.txt b/packaging/ubuntu/debian/changelog index e1fb94cb0..e1fb94cb0 100644 --- a/packaging/ubuntu/changelog.txt +++ b/packaging/ubuntu/debian/changelog diff --git a/packaging/ubuntu/control b/packaging/ubuntu/debian/control index 874f25c2d..874f25c2d 100644 --- a/packaging/ubuntu/control +++ b/packaging/ubuntu/debian/control diff --git a/packaging/ubuntu/copyright b/packaging/ubuntu/debian/copyright index 75e69b368..75e69b368 100644 --- a/packaging/ubuntu/copyright +++ b/packaging/ubuntu/debian/copyright diff --git a/packaging/ubuntu/rules b/packaging/ubuntu/debian/rules index 76ac5b98a..76ac5b98a 100755 --- a/packaging/ubuntu/rules +++ b/packaging/ubuntu/debian/rules diff --git a/packaging/ubuntu/source.lintian-overrides b/packaging/ubuntu/debian/source.lintian-overrides index a2065afeb..a2065afeb 100644 --- a/packaging/ubuntu/source.lintian-overrides +++ b/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 |