luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

makedeb.sh did contain the conflict markers.

This commit is contained in:
Matthias Koefferlein 2018-09-09 22:47:56 +02:00
parent 84072aa23e
commit 25868ccd96
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/makedeb.sh
View File

@ -89,15 +89,10 @@ cd ..
mkdir -p makedeb-tmp/${sharedir}/doc/klayout
mkdir -p makedeb-tmp/${sharedir}/applications
mkdir -p makedeb-tmp/${sharedir}/pixmaps
<<<<<<< HEAD
mkdir -p makedeb-tmp/${libdir}/db_plugins
mkdir -p makedeb-tmp/${libdir}/lay_plugins
mkdir -p makedeb-tmp/${pylibdir}
mkdir -p makedeb-tmp/${bindir}
=======
mkdir -p makedeb-tmp/${bindir}
mkdir -p makedeb-tmp/${libdir}
>>>>>>> master
cp etc/klayout.desktop makedeb-tmp/${sharedir}/applications
cp etc/logo.png makedeb-tmp/${sharedir}/pixmaps
@ -108,13 +103,10 @@ cp COPYRIGHT makedeb-tmp/${sharedir}/doc/klayout/copyright
cp -pd $bininstdir/strm* makedeb-tmp/${bindir}
cp -pd $bininstdir/klayout makedeb-tmp/${bindir}
cp -pd $bininstdir/lib*so* makedeb-tmp/${libdir}
<<<<<<< HEAD
cp -pd $bininstdir/db_plugins/lib*so* makedeb-tmp/${libdir}/db_plugins
cp -pd $bininstdir/lay_plugins/lib*so* makedeb-tmp/${libdir}/lay_plugins
cp -pd $bininstdir/pymod/klayout/*so makedeb-tmp/${pylibdir}
cp -pd $bininstdir/pymod/klayout/*py makedeb-tmp/${pylibdir}
=======
>>>>>>> master
cd makedeb-tmp
@ -138,13 +130,9 @@ grep -q $version ${sharedir}/doc/klayout/changelog.Debian || (
echo "Modifying control file .."
strip ${bindir}/*
strip ${libdir}/*.so*
<<<<<<< HEAD
strip ${pylibdir}/*.so
strip ${libdir}/db_plugins/*.so*
strip ${libdir}/lay_plugins/*.so*
=======
>>>>>>> master
size=`du -ck usr | grep total | sed "s/ *total//"`