bye bye libopie1

4 files changed, 12 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index d343f54..5ccad50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,3 +11,7 @@
 	* 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-14	Opie 1.1.7
@@ -56,4 +60,7 @@
 	* 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)
 
diff --git a/Rules.make b/Rules.make
index c025d72..644a6cf 100644
--- a/Rules.make
+++ b/Rules.make
@@ -167,7 +167,2 @@ $(OPIEDIR)/stamp-headers :
 	( 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
@@ -194,6 +189,2 @@ endif
 	# 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 \
diff --git a/config.in b/config.in
index 372ecfb..8cffa38 100644
--- a/config.in
+++ b/config.in
@@ -183,4 +183,2 @@ menu "Base"
   endchoice
-  source libopie/config.in
-
   source libopie2/config.in
diff --git a/packages b/packages
index ac614f2..e84184c 100644
--- a/packages
+++ b/packages
@@ -13,3 +13,3 @@ CONFIG_BATTERYAPPLET	core/applets/batteryapplet	batteryapplet.pro
 CONFIG_BEND	noncore/unsupported/mail2/bend	bend.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/binary	binary.pro
@@ -87,5 +87,4 @@ CONFIG_LIBOPIE2SECURITY	libopie2/opiesecurity opiesecurity.pro
 CONFIG_LIBOPIE2UI	libopie2/opieui	opieui.pro
-CONFIG_LIBOPIE	libopie	libopie.pro
-CONFIG_LIBOPIE_PIM	libopie/pim	pim.pro
 CONFIG_LIBOPIETOOTH	noncore/net/opietooth/lib	lib.pro
+CONFIG_LIBOPIE	noncore/unsupported/libopie libopie.pro
 CONFIG_LIBQPE	library	library.pro