Misc simplification and cleanup.

2008-03-03  Tor Lillqvist  <tml@novell.com>

	* evolution-zip.in: Misc simplification and cleanup.


svn path=/trunk/; revision=35113

2 files changed, 48 insertions, 70 deletions

diff --git a/ChangeLog b/ChangeLog
index 239e14065f..d89df1fb3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-03-03  Tor Lillqvist  <tml@novell.com>
+
+	* evolution-zip.in: Misc simplification and cleanup.
+
 2008-03-03  Changwoo Ryu  <cwryu@debian.org>
 
 	* configure.in: Add mail/default/ko/Makefile to AC_OUTPUT.
diff --git a/evolution-zip.in b/evolution-zip.in
index 7ab07f70c1..34089b0408 100755
--- a/evolution-zip.in
+++ b/evolution-zip.in
@@ -11,58 +11,47 @@ DEVZIP=/tmp/evolution-dev-@VERSION@.zip
 cd @prefix@
 rm $ZIP
 zip -r $ZIP -@ <<EOF
-bin/libeutil-0.dll
+bin/libeabutil-0.dll
 bin/libeconduit-0.dll
-bin/libevolution-a11y-0.dll
-bin/libevolution-calendar-a11y-0.dll
-bin/libevolution-widgets-a11y-0.dll
-bin/libevolution-addressbook-a11y-0.dll
-bin/libetimezonedialog-0.dll
-bin/libetable-0.dll
-bin/libetext-0.dll
-bin/libemiscwidgets-0.dll
+bin/libecontacteditor-0.dll
+bin/libecontactlisteditor-0.dll
 bin/libefilterbar-0.dll
-bin/libmenus-0.dll
+bin/libemiscwidgets-0.dll
 bin/libeshell-0.dll
-bin/libfilter-0.dll
 bin/libessmime-0.dll
-bin/libevolution-smime-0.dll
-bin/libeabutil-0.dll
+bin/libetable-0.dll
+bin/libetext-0.dll
+bin/libetimezonedialog-0.dll
+bin/libeutil-0.dll
+bin/libevolution-a11y-0.dll
+bin/libevolution-addressbook-a11y-0.dll
 bin/libevolution-addressbook-importers-0.dll
-bin/libecontacteditor-0.dll
-bin/libecontactlisteditor-0.dll
+bin/libevolution-calendar-a11y-0.dll
 bin/libevolution-calendar-importers-0.dll
 bin/libevolution-mail-importers-0.dll
+bin/libevolution-smime-0.dll
+bin/libevolution-widgets-a11y-0.dll
+bin/libfilter-0.dll
+bin/libmenus-0.dll
 bin/evolution.exe
-lib/bonobo/servers/GNOME_Evolution_Shell.server
 lib/bonobo/servers/GNOME_Evolution_Addressbook.server
-lib/bonobo/servers/GNOME_Evolution_Calendar_AlarmNotify.server
 lib/bonobo/servers/GNOME_Evolution_Calendar.server
+lib/bonobo/servers/GNOME_Evolution_Calendar_AlarmNotify.server
 lib/bonobo/servers/GNOME_Evolution_Mail.server
-lib/evolution/@BASE_VERSION@/components/libevolution-addressbook.dll
-lib/evolution/@BASE_VERSION@/components/libevolution-calendar.dll
-lib/evolution/@BASE_VERSION@/components/libevolution-mail.dll
-libexec/evolution/@BASE_VERSION@/evolution-addressbook-export.exe
-libexec/evolution/@BASE_VERSION@/evolution-alarm-notify.exe
+lib/bonobo/servers/GNOME_Evolution_Shell.server
 share/mime-info/evolution.keys
 share/mime-info/evolution.mime
-share/evolution/@BASE_VERSION@/errors
-share/evolution/@BASE_VERSION@/glade
-share/evolution/@BASE_VERSION@/ecps
-share/evolution/@BASE_VERSION@/etspec
-share/evolution/@BASE_VERSION@/addresstypes.xml
-share/evolution/@BASE_VERSION@/filtertypes.xml
-share/evolution/@BASE_VERSION@/vfoldertypes.xml
-share/evolution/@BASE_VERSION@/searchtypes.xml
-share/evolution/@BASE_VERSION@/default
-share/evolution/@BASE_VERSION@/weather
-share/evolution/@BASE_VERSION@/ui
-share/evolution/@BASE_VERSION@/views
-etc/gconf
+share/evolution/@BASE_VERSION@
+etc/gconf/gconf.xml.defaults/schemas/apps/evolution
+etc/gconf/schemas
 EOF
 
-zip -r $ZIP share/evolution/@BASE_VERSION@/images
-zip $ZIP lib/evolution/@BASE_VERSION@/plugins/*.eplug lib/evolution/@BASE_VERSION@/plugins/*.dll lib/evolution/@BASE_VERSION@/plugins/*.xml lib/evolution/@BASE_VERSION@/plugins/*.glade
+zip $ZIP lib/evolution/@BASE_VERSION@/components/*dll
+zip $ZIP lib/evolution/@BASE_VERSION@/plugins/*.eplug 
+zip $ZIP lib/evolution/@BASE_VERSION@/plugins/*.dll 
+zip $ZIP lib/evolution/@BASE_VERSION@/plugins/*.xml
+
+zip $ZIP libexec/evolution/@BASE_VERSION@/*exe
 
 if [ -f share/locale/de/LC_MESSAGES/evolution-@BASE_VERSION@.mo ]; then
   zip $ZIP share/locale/*/LC_MESSAGES/evolution-@BASE_VERSION@.mo
@@ -72,45 +61,30 @@ fi
 
 rm $DEVZIP
 zip -r $DEVZIP -@ <<EOF
-lib/libeutil.dll.a
+lib/libeabutil.dll.a
 lib/libeconduit.dll.a
-lib/libevolution-a11y.dll.a
-lib/libevolution-calendar-a11y.dll.a
-lib/libevolution-widgets-a11y.dll.a
-lib/libevolution-addressbook-a11y.dll.a
-lib/libetimezonedialog.dll.a
-lib/libetable.dll.a
-lib/libetext.dll.a
-lib/libemiscwidgets.dll.a
+lib/libecontacteditor.dll.a
+lib/libecontactlisteditor.dll.a
 lib/libefilterbar.dll.a
-lib/libmenus.dll.a
+lib/libemiscwidgets.dll.a
 lib/libeshell.dll.a
-lib/libfilter.dll.a
 lib/libessmime.dll.a
-lib/libevolution-smime.dll.a
-lib/libeabutil.dll.a
+lib/libetable.dll.a
+lib/libetext.dll.a
+lib/libetimezonedialog.dll.a
+lib/libeutil.dll.a
+lib/libevolution-a11y.dll.a
+lib/libevolution-addressbook-a11y.dll.a
 lib/libevolution-addressbook-importers.dll.a
-lib/libecontacteditor.dll.a
-lib/libecontactlisteditor.dll.a
+lib/libevolution-calendar-a11y.dll.a
 lib/libevolution-calendar-importers.dll.a
 lib/libevolution-mail-importers.dll.a
-lib/pkgconfig/evolution-shell.pc
+lib/libevolution-smime.dll.a
+lib/libevolution-widgets-a11y.dll.a
+lib/libfilter.dll.a
+lib/libmenus.dll.a
 lib/pkgconfig/evolution-plugin.pc
-include/evolution-@BASE_VERSION@/e-conduit
-include/evolution-@BASE_VERSION@/e-util
-include/evolution-@BASE_VERSION@/table
-include/evolution-@BASE_VERSION@/text
-include/evolution-@BASE_VERSION@/misc
-include/evolution-@BASE_VERSION@/menus
-include/evolution-@BASE_VERSION@/shell
-include/evolution-@BASE_VERSION@/addressbook
-include/evolution-@BASE_VERSION@/calendar
-include/evolution-@BASE_VERSION@/mail
-share/idl/evolution-@BASE_VERSION@/Evolution-ConfigControl.idl
-share/idl/evolution-@BASE_VERSION@/Evolution-Component.idl
-share/idl/evolution-@BASE_VERSION@/Evolution-Shell.idl
-share/idl/evolution-@BASE_VERSION@/Evolution.idl
-share/idl/evolution-@BASE_VERSION@/evolution-calendar.idl
-share/idl/evolution-@BASE_VERSION@/Evolution-Composer.idl
-share/idl/evolution-@BASE_VERSION@/Evolution-Mail.idl
+lib/pkgconfig/evolution-shell.pc
+include/evolution-@BASE_VERSION@
+share/idl/evolution-@BASE_VERSION@
 EOF