Ignore:
Timestamp:
Nov 28, 2013, 2:43:52 PM (12 years ago)
Author:
Silvan Scherrer
Message:

smtube diff was wrong in the last commit

File:
1 edited

Legend:

Unmodified
Added
Removed

  • diffs/smtube_1.7_GA.diff

    r150 r151  
    1 diff -Naur -x '*.qm' -x geoip.dat -x conf.pri E:\trees\smtube\trunk\..\vendor\current/build_os2.cmd E:\trees\smtube\trunk/build_os2.cmd
     1diff -Naur E:\trees\smtube\trunk\..\vendor\current/build_os2.cmd E:\trees\smtube\trunk/build_os2.cmd
    22--- E:\trees\smtube\trunk\..\vendor\current/build_os2.cmd       1970-01-01 01:00:00.000000000 +0100
    3 +++ E:\trees\smtube\trunk/build_os2.cmd 2013-11-28 12:41:08.000000000 +0100
     3+++ E:\trees\smtube\trunk/build_os2.cmd 2013-11-28 12:54:50.000000000 +0100
    44@@ -0,0 +1,288 @@
    55+/* SMTube Build Script */
    … …  
    163163+    when command = "DIFF" then do
    164164+
    165 +       address cmd 'diff -Naur ' || vendorDir || ' ' || sourceDir || ' -x *.qm -x geoip.dat -x conf.pri > ' || diffDir || 'smtube_' || SMTube_version || '_' || SMTube_build || '.diff'
     165+       address cmd 'diff -Naur ' || vendorDir || ' ' || sourceDir || ' > ' || diffDir || 'smtube_' || SMTube_version || '_' || SMTube_build || '.diff'
    166166+       
    167167+    end
    … …  
    291291+    say "    diff (creates a diff from vendor to trunk)"
    292292+exit 255
    293 diff -Naur -x '*.qm' -x geoip.dat -x conf.pri E:\trees\smtube\trunk\..\vendor\current/get_svn_revision.sh E:\trees\smtube\trunk/get_svn_revision.sh
     293diff -Naur E:\trees\smtube\trunk\..\vendor\current/get_svn_revision.sh E:\trees\smtube\trunk/get_svn_revision.sh
    294294--- E:\trees\smtube\trunk\..\vendor\current/get_svn_revision.sh 2012-02-24 23:23:26.000000000 +0100
    295295+++ E:\trees\smtube\trunk/get_svn_revision.sh   2013-05-23 18:29:44.000000000 +0200
    … …  
    309309 OLD_REVISION=`cat src/svn_revision.h 2> /dev/null`
    310310 
    311 diff -Naur -x '*.qm' -x geoip.dat -x conf.pri E:\trees\smtube\trunk\..\vendor\current/os2/smtube_de.txt E:\trees\smtube\trunk/os2/smtube_de.txt
     311diff -Naur E:\trees\smtube\trunk\..\vendor\current/os2/smtube_de.txt E:\trees\smtube\trunk/os2/smtube_de.txt
    312312--- E:\trees\smtube\trunk\..\vendor\current/os2/smtube_de.txt   1970-01-01 01:00:00.000000000 +0100
    313313+++ E:\trees\smtube\trunk/os2/smtube_de.txt     2013-05-27 16:30:32.000000000 +0200
    … …  
    408408+  * erste Version
    409409+
    410 diff -Naur -x '*.qm' -x geoip.dat -x conf.pri E:\trees\smtube\trunk\..\vendor\current/os2/smtube_en.txt E:\trees\smtube\trunk/os2/smtube_en.txt
     410diff -Naur E:\trees\smtube\trunk\..\vendor\current/os2/smtube_en.txt E:\trees\smtube\trunk/os2/smtube_en.txt
    411411--- E:\trees\smtube\trunk\..\vendor\current/os2/smtube_en.txt   1970-01-01 01:00:00.000000000 +0100
    412412+++ E:\trees\smtube\trunk/os2/smtube_en.txt     2013-05-27 16:30:54.000000000 +0200
    … …  
    506506+2013-05-23
    507507+  * first version
    508 diff -Naur -x '*.qm' -x geoip.dat -x conf.pri E:\trees\smtube\trunk\..\vendor\current/os2/smtube_fr.txt E:\trees\smtube\trunk/os2/smtube_fr.txt
     508diff -Naur E:\trees\smtube\trunk\..\vendor\current/os2/smtube_fr.txt E:\trees\smtube\trunk/os2/smtube_fr.txt
    509509--- E:\trees\smtube\trunk\..\vendor\current/os2/smtube_fr.txt   1970-01-01 01:00:00.000000000 +0100
    510510+++ E:\trees\smtube\trunk/os2/smtube_fr.txt     2013-05-28 12:53:00.000000000 +0200
    … …  
    613613+2013-05-23
    614614+  * Version initiale
    615 diff -Naur -x '*.qm' -x geoip.dat -x conf.pri E:\trees\smtube\trunk\..\vendor\current/os2/smtube.ico E:\trees\smtube\trunk/os2/smtube.ico
     615diff -Naur E:\trees\smtube\trunk\..\vendor\current/os2/smtube.ico E:\trees\smtube\trunk/os2/smtube.ico
    616616--- E:\trees\smtube\trunk\..\vendor\current/os2/smtube.ico      1970-01-01 01:00:00.000000000 +0100
    617617+++ E:\trees\smtube\trunk/os2/smtube.ico        2013-05-23 19:53:18.000000000 +0200
    … …  
    11331133
    11341134\ No newline at end of file
    1135 diff -Naur -x '*.qm' -x geoip.dat -x conf.pri E:\trees\smtube\trunk\..\vendor\current/smtube.pro E:\trees\smtube\trunk/smtube.pro
     1135diff -Naur E:\trees\smtube\trunk\..\vendor\current/smtube.pro E:\trees\smtube\trunk/smtube.pro
    11361136--- E:\trees\smtube\trunk\..\vendor\current/smtube.pro  1970-01-01 01:00:00.000000000 +0100
    11371137+++ E:\trees\smtube\trunk/smtube.pro    2013-05-23 18:30:40.000000000 +0200
    … …  
    11431143+src.file=src/smtube.pro
    11441144\ No newline at end of file
    1145 diff -Naur -x '*.qm' -x geoip.dat -x conf.pri E:\trees\smtube\trunk\..\vendor\current/src/main.cpp E:\trees\smtube\trunk/src/main.cpp
     1145diff -Naur E:\trees\smtube\trunk\..\vendor\current/src/main.cpp E:\trees\smtube\trunk/src/main.cpp
    11461146--- E:\trees\smtube\trunk\..\vendor\current/src/main.cpp        2013-01-12 01:03:30.000000000 +0100
    11471147+++ E:\trees\smtube\trunk/src/main.cpp  2013-05-23 19:40:56.000000000 +0200
    … …  
    11551155 #ifdef TRANSLATION_PATH
    11561156         QString s = QString(TRANSLATION_PATH);
    1157 diff -Naur -x '*.qm' -x geoip.dat -x conf.pri E:\trees\smtube\trunk\..\vendor\current/src/players.cpp E:\trees\smtube\trunk/src/players.cpp
     1157diff -Naur E:\trees\smtube\trunk\..\vendor\current/src/players.cpp E:\trees\smtube\trunk/src/players.cpp
    11581158--- E:\trees\smtube\trunk\..\vendor\current/src/players.cpp     2013-01-12 01:03:30.000000000 +0100
    11591159+++ E:\trees\smtube\trunk/src/players.cpp       2013-05-23 18:40:32.000000000 +0200
    … …  
    11721172        if (!fi.exists() || !fi.isExecutable() || fi.isDir()) {
    11731173                qDebug("Player::exec: command: '%s' is not a valid executable", bin.toUtf8().constData());
    1174 diff -Naur -x '*.qm' -x geoip.dat -x conf.pri E:\trees\smtube\trunk\..\vendor\current/src/smtube_os2.rc E:\trees\smtube\trunk/src/smtube_os2.rc
     1174diff -Naur E:\trees\smtube\trunk\..\vendor\current/src/qtsingleapplication/qtlocalpeer.cpp E:\trees\smtube\trunk/src/qtsingleapplication/qtlocalpeer.cpp
     1175--- E:\trees\smtube\trunk\..\vendor\current/src/qtsingleapplication/qtlocalpeer.cpp     2013-11-28 13:04:16.000000000 +0100
     1176+++ E:\trees\smtube\trunk/src/qtsingleapplication/qtlocalpeer.cpp       2013-11-28 13:03:38.000000000 +0100
     1177@@ -48,12 +48,11 @@
     1178 typedef BOOL(WINAPI*PProcessIdToSessionId)(DWORD,DWORD*);
     1179 static PProcessIdToSessionId pProcessIdToSessionId = 0;
     1180 #endif
     1181-#if defined(Q_OS_UNIX)
     1182+#if defined(Q_OS_UNIX) || defined(Q_OS_OS2)
     1183 #include <time.h>
     1184 #include <unistd.h>
     1185 #endif
     1186 
     1187-
     1188 namespace QtLP_Private {
     1189 #include "qtlockedfile.cpp"
     1190 #if defined(Q_OS_WIN)
     1191diff -Naur E:\trees\smtube\trunk\..\vendor\current/src/smtube_os2.rc E:\trees\smtube\trunk/src/smtube_os2.rc
    11751192--- E:\trees\smtube\trunk\..\vendor\current/src/smtube_os2.rc   1970-01-01 01:00:00.000000000 +0100
    11761193+++ E:\trees\smtube\trunk/src/smtube_os2.rc     2013-05-23 19:46:54.000000000 +0200
    11771194@@ -0,0 +1 @@
    11781195+ICON   1    DISCARDABLE     "..\os2\smtube.ico"
    1179 diff -Naur -x '*.qm' -x geoip.dat -x conf.pri E:\trees\smtube\trunk\..\vendor\current/src/smtube.pro E:\trees\smtube\trunk/src/smtube.pro
     1196diff -Naur E:\trees\smtube\trunk\..\vendor\current/src/smtube.pro E:\trees\smtube\trunk/src/smtube.pro
    11801197--- E:\trees\smtube\trunk\..\vendor\current/src/smtube.pro      2013-05-03 23:03:38.000000000 +0200
    11811198+++ E:\trees\smtube\trunk/src/smtube.pro        2013-11-28 11:55:12.000000000 +0100
Note: See TracChangeset for help on using the changeset viewer.