4 files changed, 12 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index d343f54..5ccad50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,7 +9,11 @@
         * #1464 - Packagemanager dont set active filter after install a package (drw)
         * n.a. - PackageManager - (Minor UI tweak) in filter dialog, when option is enabled, set focus to widget that corresponds to that option (drw)
         * n.a. - PackageManager - (Minor UI tweak) fix double entry in source feed configuration when adding a new feed (drw)
-    
+        
+        Internal
+        --------
+        * Moved libopie1 to unsupported (mickeyl)
+
         2004-11-14Opie 1.1.7
 
         New Features
@@ -54,8 +58,11 @@
         * n.a.  - Build system: Enable distcc and ccache when crosscompiling too, and use them everywhere we can (clem)
         * n.a.  - Build system: Fix deps in several config.in (and fix scripts/deps.pl too) to stop breaking builds, especially with make -j highNumber (clem)
         * n.a.  - Removed hardcoded icon size in a couple of applets (mickeyl)
-        * n.a.  - Opie-Qashmoney has been moved to unsupported (mickeyl)
-        * n.a.  - Opie-Ubrowser has been moved to unsupported (mickeyl)
+
+        Internal
+        --------
+        * Opie-Qashmoney has been moved to unsupported (mickeyl)
+        * Opie-Ubrowser has been moved to unsupported (mickeyl)
 
         2004-09-17Opie 1.1.6
 
diff --git a/Rules.make b/Rules.make
index c025d72..644a6cf 100644
--- a/Rules.make
+++ b/Rules.make
@@ -165,11 +165,6 @@ $(OPIEDIR)/stamp-headers :
         ( cd include/qpe &&  rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; )
         ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; )
         ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; )
-ifeq ($(CONFIG_LIBOPIE),y)
-        # libopie1
-        ( cd include/opie &&  rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; )
-        ( cd include/opie &&  ln -sf ../../libopie/pim/*.h .; )
-endif
         # libopie2
         ( cd include/opie2 && ln -sf ../../libopie2/opiecore/*.h .; )
         ( cd include/opie2 && ln -sf ../../libopie2/opiecore/device/*.h .; )
@@ -192,10 +187,6 @@ endif
         ( cd include/ && ln -sf ../inputmethods/pickboard/pickboardcfg.h .; )
         ( cd include/ && ln -sf ../inputmethods/pickboard/pickboardpicks.h .; )
         # all
-ifeq ($(CONFIG_LIBOPIE),y)
-        ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
-        ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done )
-endif
         ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opieui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
         ln -sf ../../libopie2/opieui/$$generatedHeader $$generatedHeader; done )
         ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opiepim/ui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
diff --git a/config.in b/config.in
index 372ecfb..8cffa38 100644
--- a/config.in
+++ b/config.in
@@ -181,8 +181,6 @@ menu "Base"
     source library/config.in
     source x11/config.in
   endchoice
-  source libopie/config.in
-
   source libopie2/config.in
   source libqtaux/config.in
   source rsync/config.in
diff --git a/packages b/packages
index ac614f2..e84184c 100644
--- a/packages
+++ b/packages
@@ -11,7 +11,7 @@ CONFIG_BACKUP	noncore/settings/backup	backup.pro
         CONFIG_BARTENDER noncore/apps/opie-bartenderbartender.pro
         CONFIG_BATTERYAPPLET    core/applets/batteryappletbatteryapplet.pro
         CONFIG_BEND     noncore/unsupported/mail2/bendbend.pro
-CONFIG_BIGSCREEN_EXAMPLE       libopie/big-screen/example      osplitter_mail.pro
+CONFIG_BIGSCREEN_EXAMPLE       unsupported/libopie/big-screen/example      osplitter_mail.pro
         CONFIG_BINARY   noncore/tools/calc2/binarybinary.pro
         CONFIG_BLUE-PIN         noncore/net/opietooth/blue-pinblue-pin.pro
         CONFIG_BOUNCE   noncore/games/bouncebounce.pro
@@ -85,9 +85,8 @@ CONFIG_LIBOPIE2NET	libopie2/opienet	opienet.pro
         CONFIG_LIBOPIE2PIM      libopie2/opiepimopiepim.pro
         CONFIG_LIBOPIE2SECURITYlibopie2/opiesecurity opiesecurity.pro
         CONFIG_LIBOPIE2UI       libopie2/opieuiopieui.pro
-        CONFIG_LIBOPIE  libopielibopie.pro
-        CONFIG_LIBOPIE_PIM      libopie/pimpim.pro
         CONFIG_LIBOPIETOOTH     noncore/net/opietooth/liblib.pro
+        CONFIG_LIBOPIEnoncore/unsupported/libopie libopie.pro
         CONFIG_LIBQPE   librarylibrary.pro
         CONFIG_LIBQPE-X11       x11/libqpe-x11libqpe-x11.pro
 CONFIG_LIBQRSYNC    rsync   rsync.pro