diff -Nru libqtjambi-snapshot-0.0~201506031728+bzr3571~ubuntu14.10.1/debian/bzr-builder.manifest libqtjambi-snapshot-0.0~201506261446+bzr3574~ubuntu14.10.1/debian/bzr-builder.manifest --- libqtjambi-snapshot-0.0~201506031728+bzr3571~ubuntu14.10.1/debian/bzr-builder.manifest 2015-06-03 17:29:03.000000000 +0000 +++ libqtjambi-snapshot-0.0~201506261446+bzr3574~ubuntu14.10.1/debian/bzr-builder.manifest 2015-06-26 14:46:51.000000000 +0000 @@ -1,3 +1,3 @@ -# bzr-builder format 0.3 deb-version 0.0~201506031728+bzr3571 -lp:~qtjambi-community/qtjambi/master revid:git-v1:7d83771c873601c83d74037a04e03dfdfec44d5b +# bzr-builder format 0.3 deb-version 0.0~201506261446+bzr3574 +lp:~qtjambi-community/qtjambi/master revid:git-v1:f16d275aad45e1941b818e3878bcb917fe098058 nest debian lp:~qtjambi-community/ubuntu/utopic/qtjambi-snapshot/debian debian revid:darryl.miles@darrylmiles.org-20150602171706-aufj1mo4z66duup0 diff -Nru libqtjambi-snapshot-0.0~201506031728+bzr3571~ubuntu14.10.1/debian/changelog libqtjambi-snapshot-0.0~201506261446+bzr3574~ubuntu14.10.1/debian/changelog --- libqtjambi-snapshot-0.0~201506031728+bzr3571~ubuntu14.10.1/debian/changelog 2015-06-03 17:29:03.000000000 +0000 +++ libqtjambi-snapshot-0.0~201506261446+bzr3574~ubuntu14.10.1/debian/changelog 2015-06-26 14:46:51.000000000 +0000 @@ -1,8 +1,8 @@ -libqtjambi-snapshot (0.0~201506031728+bzr3571~ubuntu14.10.1) utopic; urgency=low +libqtjambi-snapshot (0.0~201506261446+bzr3574~ubuntu14.10.1) utopic; urgency=low * Auto build. - -- qtjambi-community Wed, 03 Jun 2015 17:29:03 +0000 + -- qtjambi-community Fri, 26 Jun 2015 14:46:51 +0000 libqtjambi-snapshot (4.7.4-0ubuntu0) oneiric; urgency=low diff -Nru libqtjambi-snapshot-0.0~201506031728+bzr3571~ubuntu14.10.1/dist/linux/designer_lib_expander.sh libqtjambi-snapshot-0.0~201506261446+bzr3574~ubuntu14.10.1/dist/linux/designer_lib_expander.sh --- libqtjambi-snapshot-0.0~201506031728+bzr3571~ubuntu14.10.1/dist/linux/designer_lib_expander.sh 1970-01-01 00:00:00.000000000 +0000 +++ libqtjambi-snapshot-0.0~201506261446+bzr3574~ubuntu14.10.1/dist/linux/designer_lib_expander.sh 2015-06-26 14:46:43.000000000 +0000 @@ -0,0 +1,20 @@ +#/bin/bash + +VERSION=$(ls qtjambi-4*.jar) +VERSION=${VERSION:8:5} + +OS=$(ls qtjambi-native-*.jar) +OS=${OS:15:7} + +RELEASE=qtjambi-$OS-community-$VERSION +COMPILER=gcc + +LIBNAME=QtJambi-$VERSION + +unzip -q qtjambi-native-$OS-$COMPILER-$VERSION.jar -d . + +cp -R plugins-designer/* plugins/ + +rm -r -f META-INF +rm -r -f plugins-designer +rm qtjambi-deployment.xml diff -Nru libqtjambi-snapshot-0.0~201506031728+bzr3571~ubuntu14.10.1/dist/linux/designer.sh libqtjambi-snapshot-0.0~201506261446+bzr3574~ubuntu14.10.1/dist/linux/designer.sh --- libqtjambi-snapshot-0.0~201506031728+bzr3571~ubuntu14.10.1/dist/linux/designer.sh 2015-06-03 17:28:58.000000000 +0000 +++ libqtjambi-snapshot-0.0~201506261446+bzr3574~ubuntu14.10.1/dist/linux/designer.sh 2015-06-26 14:46:43.000000000 +0000 @@ -1,3 +1,5 @@ +#!/bin/bash + if [ -e binpatch ]; then ./binpatch @@ -11,7 +13,21 @@ echo "to work. If Java is installed then make sure that the 'java' executable" echo "is available in the PATH environment." else - VERSION=`sed '/^\#/d' version.properties | grep 'qtjambi.version' | tail -n 1 | sed 's/^.*=//;s/^[[:space:]]*//;s/[[:space:]]*$//'` + + if [ ! -d "plugins" ]; then + echo "Expanding Qt Jambi libs and plugins in order for Qt Designer to work." + ./designer_lib_expander.sh + fi + + VERSION=$(ls qtjambi-4*.jar) + VERSION=${VERSION:8:5} CP=$me/qtjambi-$VERSION.jar:$me/qtjambi-examples-$VERSION.jar:$me/qtjambi-designer-$VERSION.jar - LD_LIBRARY_PATH=$me/lib QT_PLUGIN_PATH=$me/plugins CLASSPATH=$CP $me/bin/designer + + if [ "$JAVA_HOME" == "" ]; then + JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") + echo "Warning JAVA_HOME was not set! Attempting to use: "$JAVA_HOME + LD_LIBRARY_PATH=$me/lib QT_PLUGIN_PATH=$me/plugins CLASSPATH=$CP JAVA_HOME=$JAVA_HOME $me/bin/designer + else + LD_LIBRARY_PATH=$me/lib QT_PLUGIN_PATH=$me/plugins CLASSPATH=$CP $me/bin/designer + fi fi diff -Nru libqtjambi-snapshot-0.0~201506031728+bzr3571~ubuntu14.10.1/dist/linux/examples.sh libqtjambi-snapshot-0.0~201506261446+bzr3574~ubuntu14.10.1/dist/linux/examples.sh --- libqtjambi-snapshot-0.0~201506031728+bzr3571~ubuntu14.10.1/dist/linux/examples.sh 1970-01-01 00:00:00.000000000 +0000 +++ libqtjambi-snapshot-0.0~201506261446+bzr3574~ubuntu14.10.1/dist/linux/examples.sh 2015-06-26 14:46:43.000000000 +0000 @@ -0,0 +1,20 @@ +#!/bin/bash + +me=$(dirname $0) + +if ! java -version 2>&1 | grep -q "1\.[5-9]" +then + echo "Qt Jambi requires Java version 1.5.0 or higher to be preinstalled" + echo "to work. If Java is installed then make sure that the 'java' executable" + echo "is available in the PATH environment." +else + VERSION=$(ls qtjambi-4*.jar) + VERSION=${VERSION:8:5} + + OS=$(ls qtjambi-native-*.jar) + OS=${OS:15:7} + + CP=$me/qtjambi-$VERSION.jar:$me/qtjambi-examples-src.jar:$me/qtjambi-examples-$VERSION.jar:$me/qtjambi-native-$OS-gcc-$VERSION.jar + + java -cp $CP com.trolltech.launcher.Launcher +fi diff -Nru libqtjambi-snapshot-0.0~201506031728+bzr3571~ubuntu14.10.1/dist/linux/packager-linux.sh libqtjambi-snapshot-0.0~201506261446+bzr3574~ubuntu14.10.1/dist/linux/packager-linux.sh --- libqtjambi-snapshot-0.0~201506031728+bzr3571~ubuntu14.10.1/dist/linux/packager-linux.sh 2015-06-03 17:28:58.000000000 +0000 +++ libqtjambi-snapshot-0.0~201506261446+bzr3574~ubuntu14.10.1/dist/linux/packager-linux.sh 2015-06-26 14:46:43.000000000 +0000 @@ -1,97 +1,47 @@ #/bin/bash -echo "This version is currently broken! It shouldn't even be applied to master repository!" -exit 1 - -if [ "$2" == "" ] ; then - echo "You need to give LIBDIR and BINDIR!" - exit 1 +if [ "${QTDIR}" == "" ]; then + echo "Error: QTDIR variable is not set!" + exit 1 fi -LIBDIR="$1" -BINDIR="$2" - -if [ "$3" == "--phonon-dir" ] ; then - phononlib="$4" -else - phononlib=$LIBDIR -fi - -if [ "$5" == "--version" ] ; then - VERSION="$6" -else - VERSION=`cat version.properties | cut -d= -f2 | tr -d ' '` -fi +VERSION=$(ls qtjambi-4*.jar) +VERSION=${VERSION:8:5} +OS=$(ls build/qtjambi-native-*.jar | cut -sd / -f 2-) +OS=${OS:15:7} -OS=linux32 RELEASE=qtjambi-$OS-community-$VERSION COMPILER=gcc mkdir $RELEASE mkdir $RELEASE/bin -mkdir $RELEASE/lib -cp version.properties $RELEASE +#cp version.properties $RELEASE + cp qtjambi-$VERSION.jar $RELEASE cp qtjambi-designer-$VERSION.jar $RELEASE cp qtjambi-examples-$VERSION.jar $RELEASE -cp qtjambi-util-$VERSION.jar $RELEASE -cp qtjambi-$OS-$COMPILER-$VERSION.jar $RELEASE - -cp dist/linux/qtjambi.sh $RELEASE +cp jars/qtjambi-examples-src.jar $RELEASE +cp build/qtjambi-native-$OS-$COMPILER-$VERSION.jar $RELEASE + +cp dist/linux/examples.sh $RELEASE cp dist/linux/designer.sh $RELEASE +cp dist/linux/designer_lib_expander.sh $RELEASE -cp dist/changes-$VERSION $RELEASE -cp dist/install.html $RELEASE +#cp dist/install.html $RELEASE +#cp dist/LGPL_EXCEPTION.TXT $RELEASE cp dist/LICENSE.GPL3 $RELEASE cp dist/LICENSE.LGPL $RELEASE -cp dist/readme.html $RELEASE - -cp -R java/src/qtjambi-examples/com $RELEASE - -cp bin/juic $RELEASE/binbcp $BIND -IR/lrelease $RELEASE/bin -cp $BINDIR/lrelease $RELEASE/bin -cp $BINDIR/lupdate $RELEASE/bin +#cp dist/readme.txt $RELEASE + +cp build/qmake-juic/juic $RELEASE/bin + cp $QTDIR/bin/designer $RELEASE/bin +cp $QTDIR/bin/linguist $RELEASE/bin +cp $QTDIR/bin/lrelease $RELEASE/bin +cp $QTDIR/bin/lupdate $RELEASE/bin -cp lib/libqtjambi.so $RELEASE/lib -cp lib/libqtjambi.so.1 $RELEASE/lib -cp $phononlib/libphonon.so.4 $RELEASE/lib -cp $LIBDIR/libQtCore.so.4 $RELEASE/lib -cp $LIBDIR/libQtGui.so.4 $RELEASE/lib -cp $QTDIR/lib/libQtHelp.so.4 $RELEASE/lib -cp $QTDIR/lib/libQtMultimedia.so.4 $RELEASE/lib -cp $LIBDIR/libQtSql.so.4 $RELEASE/lib -cp $LIBDIR/libQtScript.so.4 $RELEASE/lib -cp $LIBDIR/libQtSvg.so.4 $RELEASE/lib -cp $LIBDIR/libQtWebKit.so.4 $RELEASE/lib -cp $QTDIR/lib/libQtScriptTools.so.4 $RELEASE/lib -cp $LIBDIR/libQtXmlPatterns.so.4 $RELEASE/lib -cp $LIBDIR/libQtDesignerComponents.so.4 $RELEASE/lib -cp $LIBDIR/libQtDesigner.so.4 $RELEASE/lib - -cp lib/libcom_trolltech_qt_core.so $RELEASE/lib -cp lib/libcom_trolltech_qt_gui.so $RELEASE/lib -cp lib/libcom_trolltech_qt_help.so $RELEASE/lib -cp lib/libcom_trolltech_qt_multimedia.so $RELEASE/lib -cp lib/libcom_trolltech_qt_network.so $RELEASE/lib -cp lib/libcom_trolltech_qt_opengl.so $RELEASE/lib -cp lib/libcom_trolltech_qt_phonon.so $RELEASE/lib -cp lib/libcom_trolltech_qt_sql.so $RELEASE/lib -cp lib/libcom_trolltech_qt_script.so $RELEASE/lib -cp lib/libcom_trolltech_qt_scripttools.so $RELEASE/lib -cp lib/libcom_trolltech_qt_svg.so $RELEASE/lib -cp lib/libcom_trolltech_qt_webkit.so $RELEASE/lib -cp lib/libcom_trolltech_qt_xml.so $RELEASE/lib -cp lib/libcom_trolltech_qt_xmlpatterns.so $RELEASE/lib -cp lib/libcom_trolltech_tools_designer.so $RELEASE/lib - -cp -R $LIBDIR/plugins $RELEASE -cp -R plugins/designer/ $RELEASE/plugins -cp -R plugins/qtjambi $RELEASE/plugins - tar czf $RELEASE.tar.gz $RELEASE diff -Nru libqtjambi-snapshot-0.0~201506031728+bzr3571~ubuntu14.10.1/dist/linux/qtjambi.sh libqtjambi-snapshot-0.0~201506261446+bzr3574~ubuntu14.10.1/dist/linux/qtjambi.sh --- libqtjambi-snapshot-0.0~201506031728+bzr3571~ubuntu14.10.1/dist/linux/qtjambi.sh 2015-06-03 17:28:58.000000000 +0000 +++ libqtjambi-snapshot-0.0~201506261446+bzr3574~ubuntu14.10.1/dist/linux/qtjambi.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -#!/bin/sh - -me=$(dirname $0) - -if [ -e binpatch ]; -then - ./binpatch - export LD_LIBRARY_PATH=$me/lib - export QT_PLUGIN_PATH=$me/plugins -fi - -if ! java -version 2>&1 | grep -q "1\.[5-9]" -then - echo "Qt Jambi requires Java version 1.5.0 or higher to be preinstalled" - echo "to work. If Java is installed then make sure that the 'java' executable" - echo "is available in the PATH environment." -else - for lib in $(ls $me/qtjambi*.jar); do - CP=$lib:$CP - done - java -cp $CP com.trolltech.launcher.Launcher -fi diff -Nru libqtjambi-snapshot-0.0~201506031728+bzr3571~ubuntu14.10.1/README.md libqtjambi-snapshot-0.0~201506261446+bzr3574~ubuntu14.10.1/README.md --- libqtjambi-snapshot-0.0~201506031728+bzr3571~ubuntu14.10.1/README.md 2015-06-03 17:28:58.000000000 +0000 +++ libqtjambi-snapshot-0.0~201506261446+bzr3574~ubuntu14.10.1/README.md 2015-06-26 14:46:43.000000000 +0000 @@ -15,7 +15,7 @@ ## Features * Qt 4.8 compliant bindings for Linux, Mac OSX and Windows -* “Stand-alone” generator for generating bindings for miscelleanous Qt programs and libraries +* “Stand-alone” generator for generating bindings for miscellaneous Qt programs and libraries ### Known problems @@ -42,7 +42,9 @@ Newest releases can be found at http://qtjambi.org/downloads. -If you wish to compile Jambi from sources, there is more information at [INSTALL.md](install.md). +If you wish to compile Jambi from sources, there is more information at [INSTALL.md](INSTALL.md). + +For a more detailed guide check our [Compiling Guides](http://redmine.smar.fi/projects/qtjambi/wiki/Compiling_Guides) ## Contributing diff -Nru libqtjambi-snapshot-0.0~201506031728+bzr3571~ubuntu14.10.1/src/java/ant-qtjambi/com/trolltech/tools/ant/PlatformJarTask.java libqtjambi-snapshot-0.0~201506261446+bzr3574~ubuntu14.10.1/src/java/ant-qtjambi/com/trolltech/tools/ant/PlatformJarTask.java --- libqtjambi-snapshot-0.0~201506031728+bzr3571~ubuntu14.10.1/src/java/ant-qtjambi/com/trolltech/tools/ant/PlatformJarTask.java 2015-06-03 17:28:58.000000000 +0000 +++ libqtjambi-snapshot-0.0~201506261446+bzr3574~ubuntu14.10.1/src/java/ant-qtjambi/com/trolltech/tools/ant/PlatformJarTask.java 2015-06-26 14:46:43.000000000 +0000 @@ -812,7 +812,7 @@ break; case GCC: - copyPlatformAgnosticRuntime("png"); + //copyPlatformAgnosticRuntime("png"); // This is auto-detected and emitted in the descriptor now break;