Added Euroconv for Eric Santonacci

Changed the opiemail config.in files to the correct dependencies. How did this slip in again ?

6 files changed, 22 insertions, 12 deletions

diff --git a/apps/Applications/euroconv.desktop b/apps/Applications/euroconv.desktop
new file mode 100644
index 0000000..012d26e
--- a/dev/null
+++ b/apps/Applications/euroconv.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Comment=An Euro converter
+Comment[fr]=Un convertisseur Euro
+Exec=euroconv
+Icon=euroconv/euroconv
+Type=Application
+Name=Euroconv
+Name[fr]=Euroconv
+Name[de]=Euroconv
+
diff --git a/library/qpeapplication.h b/library/qpeapplication.h
index 7f74510..5c18836 100644
--- a/library/qpeapplication.h
+++ b/library/qpeapplication.h
@@ -176,13 +176,13 @@ inline void QPEApplication::setCurrentRotation( int r )
         case 270:
             e = Rot270;
             break;
 	default:
 	    return;
     }
 
     qDebug("calling qApp->desktop()->qwsDisplay()->setTransformation( %d )\n", e);
-    qApp->desktop()->qwsDisplay()->setTransformation( e );
+    //qApp->desktop()->qwsDisplay()->setTransformation( e );
 }
 
 
 #endif
diff --git a/noncore/unsupported/mail2/bend/config.in b/noncore/unsupported/mail2/bend/config.in
index 097a965..d784bec 100644
--- a/noncore/unsupported/mail2/bend/config.in
+++ b/noncore/unsupported/mail2/bend/config.in
@@ -1,4 +1,4 @@
   config BEND
     boolean "bend"
-    default "y" if OPIEMAIL2
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && OPIEMAIL2
+   default "y" if MAIL
+   depends ( LIBQPE || LIBQPE-X11 ) && LIBMAIL && LIBOPIE && MAIL
diff --git a/noncore/unsupported/mail2/config.in b/noncore/unsupported/mail2/config.in
index af0fa3c..02006a4 100644
--- a/noncore/unsupported/mail2/config.in
+++ b/noncore/unsupported/mail2/config.in
@@ -1,13 +1,12 @@
-  config OPIEMAIL2
-    boolean "opiemail"
-    default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && BEND && LIBMAIL
-
   config MAIL
-    boolean
+    boolean "mail"
     default "y" if OPIEMAIL
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && BEND && LIBMAIL
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
 
+ config OPIEMAIL2
+    boolean "opiemail"
+    default "y"
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && BEND && LIBMAIL && MAIL
 
   source noncore/mail/bend/config.in
   source noncore/mail/libmail/config.in
diff --git a/noncore/unsupported/mail2/libmail/config.in b/noncore/unsupported/mail2/libmail/config.in
index dd7b2dc..9262679 100644
--- a/noncore/unsupported/mail2/libmail/config.in
+++ b/noncore/unsupported/mail2/libmail/config.in
@@ -1,4 +1,4 @@
   config LIBMAIL
     boolean "libmail"
-    default "y" if OPIEMAIL2
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && OPIEMAIL2
+    default "y" if MAIL
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && MAIL
diff --git a/packages b/packages
index b05f90a..d9b0b48 100644
--- a/packages
+++ b/packages
@@ -1,16 +1,17 @@
 CONFIG_APPSKEY	noncore/settings/appskey	appskey.pro
 CONFIG_BINARY	noncore/tools/calc2/binary	binary.pro
 CONFIG_CALC2	noncore/tools/calc2	calc2.pro
 CONFIG_CALIBRATE	core/apps/calibrate	calibrate.pro
 CONFIG_CHESS	noncore/games/chess	chess.pro
 CONFIG_CONVERTER	noncore/unsupported/opiemail/converter	converter.pro
 CONFIG_DIALUP	noncore/unsupported/netsetup/dialup	dialup.pro
 CONFIG_DICTIONARY	noncore/apps/dictionary	dictionary.pro
+CONFIG_EUROCONV		noncore/tools/euroconv/ euroconv.pro
 CONFIG_GSMTOOL	noncore/comm/gsmtool	gsmtool.pro
 CONFIG_KEYVIEW	development/keyview	keyview.pro
 CONFIG_LAN	noncore/unsupported/netsetup/lan	lan.pro
 CONFIG_LIB	noncore/unsupported/opiemail/lib	lib.pro
 CONFIG_LIBFFMPEG	core/multimedia/opieplayer/libffmpeg	libffmpeg.pro
 CONFIG_LIBFLASH	core/multimedia/opieplayer/libflash	libflash.pro
 CONFIG_LIBOPIE_PIM	libopie/pim	pim.pro
 CONFIG_LIBSQL	libsql	libsql.pro