4 files changed, 6 insertions, 32 deletions
diff --git a/packages/libopieobex/chdir-patch.patch b/packages/libopieobex/chdir-patch.patch
deleted file mode 100644
index 60889ae893..0000000000
--- a/packages/libopieobex/chdir-patch.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Most Obex Push receivers are broken when getting a path inside
-the push. We will change the working directory.
-This patch is included upstream already
-
-Index: obex.cc
-===================================================================
-RCS file: /cvs/opie/core/obex/obex.cc,v
-retrieving revision 1.9
-diff -u -r1.9 obex.cc
---- obex.cc	12 Sep 2004 18:55:56 -0000	1.9
-+++ obex.cc	29 Mar 2005 23:28:37 -0000
-@@ -74,8 +74,10 @@
-     }
-     // OProcess inititialisation
-     m_send = new OProcess();
-+    m_send->setWorkingDirectory( QFileInfo(m_file).dirPath(true) );
-+
-     *m_send << "irobex_palm3";
--    *m_send << QFile::encodeName(m_file);
-+    *m_send << QFile::encodeName(QFileInfo(m_file).fileName());
- 
-     // connect to slots Exited and and StdOut
-     connect(m_send,  SIGNAL(processExited(Opie::Core::OProcess*) ),
diff --git a/packages/libopieobex/libopieobex0_1.2.0.bb b/packages/libopieobex/libopieobex0_1.2.0.bb
deleted file mode 100644
index a90177b6d5..0000000000
--- a/packages/libopieobex/libopieobex0_1.2.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-include libopieobex0.inc
-
-PR = "r1"
-
-SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/obex \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics      \
-	   file://chdir-patch.patch;patch=1;pnum=0           "
diff --git a/packages/libopieobex/libopieobex0_1.2.1.bb b/packages/libopieobex/libopieobex0_1.2.1.bb
new file mode 100644
index 0000000000..f5a2b1bc45
--- /dev/null
+++ b/packages/libopieobex/libopieobex0_1.2.1.bb
@@ -0,0 +1,5 @@
+include libopieobex0.inc
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/obex \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics      "
diff --git a/packages/libopieobex/libopieobex0_cvs.bb b/packages/libopieobex/libopieobex0_cvs.bb
index 05983a8ee3..3ea7522aa5 100644
--- a/packages/libopieobex/libopieobex0_cvs.bb
+++ b/packages/libopieobex/libopieobex0_cvs.bb
@@ -1,7 +1,6 @@
 include libopieobex0.inc
 
-PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r1"
+PV = "1.2.1+cvs-${CVSDATE}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/obex \
            ${HANDHELDS_CVS};module=opie/pics"