manifest fixes
authorDaniel Hokka Zakrisson <daniel@hozac.com>
Tue, 15 Mar 2011 22:36:10 +0000 (23:36 +0100)
committerDaniel Hokka Zakrisson <daniel@hozac.com>
Tue, 15 Mar 2011 22:36:10 +0000 (23:36 +0100)
contrib/make-deb-manifest
contrib/make-manifest
contrib/manifest.dat.pathsubst

index 2bdf68f..24981e3 100755 (executable)
@@ -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
index fd418f2..9bddeb2 100755 (executable)
@@ -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
index e59680e..1de35d9 100644 (file)
@@ -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@/