Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-06-22 06:42:13 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-06-22 06:42:13 (GMT) |
| commit | fead5b2c5492a076294aceb0b0cb3e35f5a76b56 (patch) | |
| tree | 7eccbf0740ce9b0f70f981397f560156747c0614 /Swift/Packaging/Debian/package.sh | |
| parent | cb20f254b21f770dda4cc9a361ea75d2b7f2d877 (diff) | |
| parent | ffb711c02f9ab6b32c6fd7c21d21f35f4552a5fd (diff) | |
| download | swift-fead5b2c5492a076294aceb0b0cb3e35f5a76b56.zip swift-fead5b2c5492a076294aceb0b0cb3e35f5a76b56.tar.bz2 | |
Merge branch 'swift-1.x'
* swift-1.x:
Some more Debian fixes.
Conflicts:
COPYING
Diffstat (limited to 'Swift/Packaging/Debian/package.sh')
| -rwxr-xr-x | Swift/Packaging/Debian/package.sh | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Swift/Packaging/Debian/package.sh b/Swift/Packaging/Debian/package.sh index 5740022..5bc9fbc 100755 --- a/Swift/Packaging/Debian/package.sh +++ b/Swift/Packaging/Debian/package.sh @@ -28,6 +28,7 @@ find $DIRNAME -name .gitignore | xargs rm -f find $DIRNAME/3rdParty -type f | grep -v uuid | grep -v SConscript | xargs rm -f find $DIRNAME/3rdParty -depth -empty -type d -exec rmdir {} \; rm -rf $DIRNAME/3rdParty/SCons +rm -rf $DIRNAME/Swift/Packaging/Debian # Initialize the build version echo $VERSION > $DIRNAME/VERSION.swift @@ -37,7 +38,7 @@ echo $VERSION > $DIRNAME/VERSION.swift mkdir -p $DIRNAME/3rdParty/Boost/uuid/boost cp -r $DIRNAME/3rdParty/Boost/src/boost/uuid $DIRNAME/3rdParty/Boost/uuid/boost -# Create orig tarball for debuild +# Create orig tarball tar czf swift-im_$DEBIAN_VERSION.orig.tar.gz $DIRNAME # Detect dependencies @@ -48,20 +49,18 @@ if [ "$DISTRIBUTION" = "Debian-squeeze" -o "$DISTRIBUTION" = "Ubuntu-lucid" ]; t fi # Initialize debian files -ln -s Swift/Packaging/Debian/debian $DIRNAME/debian +cp -r debian $DIRNAME/debian if [ -z "$CHANGELOG" ]; then ../../../BuildTools/UpdateDebianChangelog.py $DIRNAME/debian/changelog $DEBIAN_VERSION else cp $CHANGELOG $DIRNAME/debian/changelog fi cat $DIRNAME/debian/control.in | sed -e "s/%SWIFTEN_SOVERSION%/$SWIFTEN_SOVERSION/g" | sed -e "s/%WEBKIT_DEPENDENCY%/$WEBKIT_DEPENDENCY/g" > $DIRNAME/debian/control +rm $DIRNAME/debian/control.in mv $DIRNAME/debian/libswiften.install $DIRNAME/debian/libswiften$SWIFTEN_SOVERSION.install -mv $DIRNAME/debian/libswiften-dev.install $DIRNAME/debian/libswiften$SWIFTEN_SOVERSION-dev.install -mv $DIRNAME/debian/libswiften-dev.manpages $DIRNAME/debian/libswiften$SWIFTEN_SOVERSION-dev.manpages +cat ../../../COPYING | awk '/--- END OF OpenSSL/,EOF' | tail -n +3 >> $DIRNAME/debian/copyright # Build cd $DIRNAME set +e debuild -i -I --lintian-opts --pedantic -#dpkg-buildpackage -S -rfakeroot -i -I -#dpkg-buildpackage -b -rfakeroot -i -I |