catch up with upstream which no longer uses rsync directly

BKrev: 4090ee1aqvJ1M0HkwRaYcmKLOym_fQ

diff --git a/opie-taskbar/opie-taskbar/server.pro b/opie-taskbar/opie-taskbar/server.pro
index e69de29..58e4d63 100644 (file)
--- a/opie-taskbar/opie-taskbar/server.pro
+++ b/opie-taskbar/opie-taskbar/server.pro
@@ -0,0 +1,82 @@
+TEMPLATE       = app
+
+CONFIG         += qt warn_on 
+
+DESTDIR                = 
+
+HEADERS                += server.h \
+                 serverinterface.h \
+                 launchertab.h \
+                 documentlist.h \
+                 appicons.h \
+                 taskbar.h \
+                  runningappbar.h \
+                 applauncher.h \
+                 stabmon.h \
+                 inputmethods.h \
+                 systray.h \
+                 wait.h \
+                 shutdownimpl.h \
+                 launcher.h \
+                 launcherview.h \
+                 calibrate/calibrate.h \
+                 startmenu.h \
+                 transferserver.h \
+                 qcopbridge.h \
+                 packageslave.h \
+                 irserver.h \
+                 firstuse.h \
+                 syncdialog.h \
+                 serverapp.h \
+                 qprocess.h \
+                 screensaver.h \
+        mediummount/mediumwidget.h \
+                  mediadlg.h
+
+SOURCES                += server.cpp \
+                 serverinterface.cpp \
+                 launchertab.cpp \
+                 documentlist.cpp \
+                 appicons.cpp \
+                 taskbar.cpp \
+                  runningappbar.cpp \
+                 applauncher.cpp \
+                 stabmon.cpp \
+                 inputmethods.cpp \
+                 systray.cpp \
+                 wait.cpp \
+                 shutdownimpl.cpp \
+                 launcher.cpp \
+                 launcherview.cpp \
+                 calibrate/calibrate.cpp \
+                 transferserver.cpp \
+                 packageslave.cpp \
+                 irserver.cpp \
+                 qcopbridge.cpp \
+                 startmenu.cpp \
+                 main.cpp \
+                 firstuse.cpp \
+                 syncdialog.cpp \
+                 serverapp.cpp \
+                 qprocess.cpp \
+                 qprocess_unix.cpp \
+                 screensaver.cpp \
+        mediummount/mediumwidget.cc \
+                  mediadlg.cpp
+
+
+INCLUDEPATH += calibrate
+DEPENDPATH     += calibrate
+
+INCLUDEPATH += $(OPIEDIR)/include rsync
+DEPENDPATH     += rsync
+
+INCLUDEPATH += mediummount
+DEPENDPATH     += mediummount
+
+
+TARGET         = qpe
+
+LIBS = -lqpe -lopiecore2 -lopieui2 -lqrsync
+
+include ( $(OPIEDIR)/include.pro )

diff --git a/opie-taskbar/opie-taskbar_cvs.oe b/opie-taskbar/opie-taskbar_cvs.oe
index 191f546..66640f8 100644 (file)
--- a/opie-taskbar/opie-taskbar_cvs.oe
+++ b/opie-taskbar/opie-taskbar_cvs.oe
@@ -3,12 +3,11 @@ SECTION = "opie/base"
 PRIORITY = "optional"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
 LICENSE = "GPL"
-DEPENDS = "libopie2"
+DEPENDS = "opie-libqrsync libopie2"
 PV = "1.1.3-cvs-${CVSDATE}"
 APPNAME = "qpe"
 
 SRC_URI = "cvs://anoncvs:anoncvs@192.58.209.91/cvs;module=opie/core/apps/calibrate;date=${CVSDATE} \
-           cvs://anoncvs:anoncvs@192.58.209.91/cvs;module=opie/rsync;date=${CVSDATE} \
            cvs://anoncvs:anoncvs@192.58.209.91/cvs;module=opie/noncore/settings/mediummount;date=${CVSDATE} \
            cvs://anoncvs:anoncvs@192.58.209.91/cvs;module=opie/core/launcher;date=${CVSDATE} \
            cvs://anoncvs:anoncvs@192.58.209.91/cvs;module=opie/pics;date=${CVSDATE}                     \
@@ -20,7 +19,6 @@ S = "${WORKDIR}/launcher"
 inherit opie
 
 do_configure_prepend() {
-       ln -s ${WORKDIR}/rsync ${S}/rsync
        ln -s ${WORKDIR}/calibrate ${S}/calibrate
        ln -s ${WORKDIR}/mediummount ${S}/mediummount
        install -m 0644 ${FILESDIR}/server.pro ${S}/server.pro