Merge the conflict

2004/11/13 21:06:11+01:00 handhelds.org!zecke
Opie 1.1.7:
	Remove CVSDATE and PR from the package files

2004/11/13 20:52:18+01:00 handhelds.org!zecke
Update packaging of 1.1.7 to match the 'cvs' version of the Opie versions

2004/11/13 20:36:08+01:00 handhelds.org!zecke
Upgrade all Opie 1.1.6 files to Opie 1.1.7 in preparation
of the next OpenZaurus/Familiar release.

Remove all occurrences of Opie1.1.6 in the files

BKrev: 41966a744AeMTtlPuskXFPg512ykqQ

4 files changed, 0 insertions, 208 deletions

diff --git a/opie-taskbar/opie-taskbar/server.pro-1.1.6 b/opie-taskbar/opie-taskbar/server.pro-1.1.6
deleted file mode 100644
index c262de99e2..0000000000
--- a/opie-taskbar/opie-taskbar/server.pro-1.1.6
+++ /dev/null
@@ -1,82 +0,0 @@
-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 -lopiesecurity2 -lqrsync
-
-include ( $(OPIEDIR)/include.pro )
diff --git a/opie-taskbar/opie-taskbar/server.pro-1.1.7 b/opie-taskbar/opie-taskbar/server.pro-1.1.7
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/opie-taskbar/opie-taskbar/server.pro-1.1.7
diff --git a/opie-taskbar/opie-taskbar_1.1.6.oe b/opie-taskbar/opie-taskbar_1.1.6.oe
deleted file mode 100644
index 0379e9a67b..0000000000
--- a/opie-taskbar/opie-taskbar_1.1.6.oe
+++ /dev/null
@@ -1,126 +0,0 @@
-DESCRIPTION = "Opie Launcher and Taskbar"
-SECTION = "opie/base"
-PRIORITY = "optional"
-LICENSE = "GPL"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-DEPENDS = "opie-libqrsync"
-
-APPNAME = "qpe"
-PR = "r1"
-
-TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/core/apps/calibrate \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/noncore/settings/mediummount \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/core/launcher \
-           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/pics \
-           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-1.1.6 \
-           file://opie-reorgfiles \
-           file://opie \
-           file://qpe.conf"
-
-S = "${WORKDIR}/launcher"
-
-# Caps/Numlock icons for devices with keyboard
-EXTRA_QMAKEVARS_POST_append_collie 	= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
-EXTRA_QMAKEVARS_POST_append_poodle 	= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
-EXTRA_QMAKEVARS_POST_append_shepherd 	= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
-EXTRA_QMAKEVARS_POST_append_corgi 	= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
-EXTRA_QMAKEVARS_POST_append_husky 	= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
-EXTRA_QMAKEVARS_POST_append_tosa 	= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
-
-# Wallpaper and welcome splash
-PIXMAP_SIZE 		= ""
-PIXMAP_SIZE_shepherd 	= "-640x480"
-PIXMAP_SIZE_corgi 	= "-640x480"
-PIXMAP_SIZE_husky 	= "-640x480"
-PIXMAP_SIZE_tosa 	= "-640x480"
-PIXMAP_SIZE_simpad 	= "-800x600"
-
-inherit opie update-rc.d
-
-INITSCRIPT_NAME = "opie"
-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-1.1.6 ${S}/server.pro
-}
-
-do_stage() {
-    install obexinterface.h ${STAGING_INCDIR}/
-
-}
-
-SECTIONS = "1Pim Applications Examples Games Opie-SH Python Settings"
-PICS = "opielogo32x32.png start_button.png new_wait.png opielogo16x16.png sidebar.png"
-
-do_install() {
-	install -d ${D}/${palmtopdir}/bin
-	for i in ${SECTIONS}
-	do
-		install -d ${D}/${palmtopdir}/apps/$i/
-		install -m 0644 ${WORKDIR}/apps/$i/.directory ${D}/${palmtopdir}/apps/$i/
-	done
-	install -d ${D}/${palmtopdir}/pics/launcher
-	install -d ${D}/${palmtopdir}/pics/logo
-	install -d ${D}/${palmtopdir}/pics/RoH/star/
-	install -d ${D}/etc/init.d
-	install -d ${D}/${palmtopdir}/etc/colors
-	install -d ${D}/${palmtopdir}/etc/skel
-
-	install -m 0755 ${S}/qpe ${D}/${palmtopdir}/bin/qpe
-	install -m 0755 ${WORKDIR}/opie-reorgfiles ${D}/${palmtopdir}/bin/
-	install -m 0644 ${WORKDIR}/apps/Settings/calibrate.desktop ${D}/${palmtopdir}/apps/Settings/
-	install -m 0644 ${WORKDIR}/apps/Settings/quit.desktop ${D}/${palmtopdir}/apps/Settings/
-
-	for p in ${PICS}
-	do
-		install -m 0644 ${WORKDIR}/pics/launcher/$p ${D}/${palmtopdir}/pics/launcher/$p
-	done
-	install -m 0644 ${WORKDIR}/pics/launcher/firstuse${PIXMAP_SIZE}.jpg ${D}/${palmtopdir}/pics/launcher/firstuse.jpg
-	install -m 0644 ${WORKDIR}/pics/launcher/opie-background${PIXMAP_SIZE}.jpg ${D}/${palmtopdir}/pics/launcher/opie-background.jpg
-
-	install -m 0644 ${WORKDIR}/pics/logo/*.* ${D}/${palmtopdir}/pics/logo/
-	install -m 0644 ${WORKDIR}/pics/RoH/star/*.png ${D}/${palmtopdir}/pics/RoH/star/
-
-	install -m 0644 ${WORKDIR}/etc/colors/*.scheme ${D}/${palmtopdir}/etc/colors/
-	install -m 0644 ${WORKDIR}/etc/mime.types ${D}/etc/
-
-	install -m 0755 ${WORKDIR}/opie ${D}/etc/init.d/opie
-	install -m 0644 ${WORKDIR}/qpe.conf ${D}/${palmtopdir}/etc/skel/
-}
-
-# These two should be installed only on devices with keyboard
-do_install_append_collie () {
-	install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
-	install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
-}
-do_install_append_poodle () {
-	install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
-	install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
-}
-do_install_append_corgi () {
-	install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
-	install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
-}
-do_install_append_shepherd () {
-	install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
-	install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
-}
-do_install_append_husky () {
-	install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
-	install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
-}
-do_install_append_tosa () {
-	install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
-	install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
-}
-
-FILES_opie-taskbar_append = " /etc ${palmtopdir}/apps ${palmtopdir}/pics"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
diff --git a/opie-taskbar/opie-taskbar_1.1.7.oe b/opie-taskbar/opie-taskbar_1.1.7.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/opie-taskbar/opie-taskbar_1.1.7.oe