Opie-Taskbar CVS introduced qrr.cpp and qrr.h. We need to make sure that it will...

with CVS and 1.1.6

Added alternative server.pro for 1.1.6 and cvs

BKrev: 41694c0dAfB5i18V4_qaIzUC4svQEQ

diff --git a/opie-taskbar/opie-taskbar/server.pro b/opie-taskbar/opie-taskbar/server.pro
index fef0282..2dee9a9 100644 (file)
--- a/opie-taskbar/opie-taskbar/server.pro
+++ b/opie-taskbar/opie-taskbar/server.pro
@@ -5,6 +5,7 @@ CONFIG          += qt warn_on
 DESTDIR                = 
 
 HEADERS                += server.h \
+                 qrr.h     \
                  serverinterface.h \
                  launchertab.h \
                  documentlist.h \
@@ -34,6 +35,7 @@ HEADERS               += server.h \
                   mediadlg.h
 
 SOURCES                += server.cpp \
+                 qrr.cpp \
                  serverinterface.cpp \
                  launchertab.cpp \
                  documentlist.cpp \

diff --git a/opie-taskbar/opie-taskbar/server.pro-1.1.6 b/opie-taskbar/opie-taskbar/server.pro-1.1.6
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/opie-taskbar/opie-taskbar_1.1.6.oe b/opie-taskbar/opie-taskbar_1.1.6.oe
index 4906f25..0379e9a 100644 (file)
--- a/opie-taskbar/opie-taskbar_1.1.6.oe
+++ b/opie-taskbar/opie-taskbar_1.1.6.oe
@@ -16,7 +16,7 @@ SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/co
            cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/apps \
            cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/root \
            cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/etc \
-           file://server.pro \
+           file://server.pro-1.1.6 \
            file://opie-reorgfiles \
            file://opie \
            file://qpe.conf"
@@ -47,7 +47,7 @@ INITSCRIPT_PARAMS = "defaults 99"
 do_configure_prepend() {
        ln -s ${WORKDIR}/calibrate ${S}/calibrate
        ln -s ${WORKDIR}/mediummount ${S}/mediummount
-       install -m 0644 ${WORKDIR}/server.pro ${S}/server.pro
+       install -m 0644 ${WORKDIR}/server.pro-1.1.6 ${S}/server.pro
 }
 
 do_stage() {