From 6029e80345cb7a458002c341e824f3b6ef7f8c68 Mon Sep 17 00:00:00 2001 From: Daniel Hokka Zakrisson Date: Tue, 15 Mar 2011 23:36:10 +0100 Subject: [PATCH] manifest fixes --- contrib/make-deb-manifest | 13 +++++++++++-- contrib/make-manifest | 2 +- contrib/manifest.dat.pathsubst | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/contrib/make-deb-manifest b/contrib/make-deb-manifest index 2bdf68f..24981e3 100755 --- a/contrib/make-deb-manifest +++ b/contrib/make-deb-manifest @@ -35,7 +35,6 @@ getname() { for i in {core,build,legacy,sysv,lib,devel,base,python}; do getname $i - echo -n >${fullname}.install rm -f ${fullname}.conffiles done @@ -58,6 +57,16 @@ while read style file; do fi for i in ${DESTDIR}$file; do i=${i#${DESTDIR}} - echo "${i%/} ${i%/*}" >>${fullname}.install + dir=`dirname $i` + mkdir -p $fullname$dir + if test -d "$DESTDIR${i%/}"; then + if test "${i%/}" != "$i"; then + mkdir -p $fullname${i%/} + else + cp -a $DESTDIR$i $fullname$dir + fi + else + cp -d --preserve=all $DESTDIR${i%/} $fullname$dir + fi done done < $data diff --git a/contrib/make-manifest b/contrib/make-manifest index fd418f2..9bddeb2 100755 --- a/contrib/make-manifest +++ b/contrib/make-manifest @@ -34,7 +34,7 @@ while read style file; do (\#*) continue;; esac if test "${file%/}" != "$file"; then - echo -n '%dir ' + echo -n '%dir ' >>$name-$style.list fi echo "${file%/}" >>$name-$style.list done diff --git a/contrib/manifest.dat.pathsubst b/contrib/manifest.dat.pathsubst index e59680e..1de35d9 100644 --- a/contrib/manifest.dat.pathsubst +++ b/contrib/manifest.dat.pathsubst @@ -168,7 +168,7 @@ base @SYSCONFDIR@/vservers/.defaults/files/ base @PKGLIBDIR@/defaults/ base @PKGCACHEDIR@/ base @PKGSTATEDIR@/ -base @PKGSTATEREVDIR@/ +base @PKGSTATEDIR@.rev/ base @VSHELPERSTATEDIR@/ core @PKGLIBDIR@/ legacy @LEGACYDIR@/ -- 1.8.1.5