git.gnu.io has moved to IP address 209.51.188.249 -- please double check where you are logging in.

Commit d27c08ff authored by Bob Mottram's avatar Bob Mottram

Replace markdown library call with classic version

parent 72c97761
......@@ -34,5 +34,5 @@ clean:
if [ -d debian/${APP} ]; then \
rm -rf debian/${APP}; \
fi
rm -f \#* \.#* debian/*.substvars debian/*.log
rm -f \#* \.#* debian/*.substvars debian/*.log debian/*.debhelper debian/files
rm -f ../${APP}*.deb ../${APP}*.changes ../${APP}*.asc ../${APP}*.dsc
......@@ -35,19 +35,20 @@ if [ ! "$?" = "0" ]; then
fi
# change the parent directory name to debian format
mv ../${APP}-debian ../${DIR}
if [[ $(pwd) == *"-debian" ]]; then
echo 'Changing directory name'
mv ../${APP}-debian ../${DIR}
fi
# Create a source archive
make source
if [ ! "$?" = "0" ]; then
mv ../${DIR} ../${APP}-debian
exit 2
fi
# Build the package
dpkg-buildpackage -i -F
if [ ! "$?" = "0" ]; then
mv ../${DIR} ../${APP}-debian
exit 3
fi
......@@ -55,9 +56,6 @@ fi
#gpg -ba ../${APP}_${VERSION}-1_${ARCH_TYPE}.deb
#gpg -ba ../${APP}_${VERSION}.orig.tar.gz
# restore the parent directory name
mv ../${DIR} ../${APP}-debian
if [ ! -f ../${APP}_${VERSION}-${RELEASE}_all.deb ]; then
echo "Failed to build ../${APP}_${VERSION}-${RELEASE}_all.deb"
exit 1
......
......@@ -54,11 +54,15 @@ rm src/theme/neo-quitter/css/genericons/example.html
rm src/theme/neo-quitter/fonts/FontAwesome.otf
rm src/theme/neo-quitter/fonts/fontawesome-webfont.ttf
# replace markdown with libmarkdown-php
# used in lib/util.php
rm -f src/extlib/Michelf/Markdown.php
sed -i 's|return \\Michelf\\Markdown::defaultTransform($c);|return Markdown($c);|g' src/lib/util.php
# some things replaced by debian packages
rm -rf src/extlib/php-gettext
rm -f src/extlib/Auth/OpenID.php
rm -f src/extlib/Auth/Yadis/Yadis.php
rm -f src/extlib/Michelf/Markdown.php
rm -f src/js/extlib/jquery.cookie.js
rm -f src/js/extlib/jquery.form.js
rm -f src/js/extlib/jquery.js
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment