summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorAndras Timar <atimar@suse.com>2013-03-02 21:55:39 +0100
committerAndras Timar <atimar@suse.com>2013-03-03 19:19:26 +0100
commita5783fe922b2419b5b662eb5f544a1f401341dbf (patch)
tree034f7cba7ec642ce937b0ac94eed13b839141834 /bin
parent5e8402ade84ab1816d32793e3476521e1c5b1027 (diff)
remove stale javafilters
Change-Id: Id0c413d64e6f6fa7ded3c5ff10e764bc2e40f006
Diffstat (limited to 'bin')
-rwxr-xr-xbin/distro-install-desktop-integration1
-rwxr-xr-xbin/distro-install-file-lists4
2 files changed, 0 insertions, 5 deletions
diff --git a/bin/distro-install-desktop-integration b/bin/distro-install-desktop-integration
index ab7da92f173b..e925924d0f0e 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -122,7 +122,6 @@ rm -rf $sysui_temp
# we do not want some stuff from the plain packages
rm -f $DESTDIR/$PREFIXDIR/bin/$INSTALLDIRNAME-printeradmin
-rm -f $DESTDIR$PREFIXDIR/share/applications/libreoffice-javafilter.desktop
rm -f $DESTDIR$PREFIXDIR/share/applications/libreoffice-printeradmin.desktop
if test -d $DESTDIR/opt ; then
rm -f $DESTDIR/opt/$INSTALLDIRNAME
diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists
index a902107a6f1b..d83855b738cc 100755
--- a/bin/distro-install-file-lists
+++ b/bin/distro-install-file-lists
@@ -132,7 +132,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
if test "z$OOO_VENDOR" = "zMandriva" ; then
merge_flists gid_Module_Optional_Grfflt $FILELISTSDIR/draw_list.txt
merge_flists gid_Module_Optional_Headless $FILELISTSDIR/common_list.txt
- merge_flists gid_Module_Optional_Javafilter $FILELISTSDIR/common_list.txt
merge_flists gid_Module_Optional_Pymailmerge $FILELISTSDIR/pyuno_list.txt
merge_flists gid_Module_Optional_Pyuno $FILELISTSDIR/pyuno_list.txt
merge_flists gid_Module_Optional_Extensions_Script_Provider_For_Python $FILELISTSDIR/pyuno_list.txt
@@ -141,7 +140,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
else
merge_flists gid_Module_Optional_Grfflt $FILELISTSDIR/common_list.txt
merge_flists gid_Module_Optional_Headless $FILELISTSDIR/common_list.txt
- merge_flists gid_Module_Optional_Javafilter $FILELISTSDIR/filters_list.txt
merge_flists gid_Module_Optional_Pymailmerge $FILELISTSDIR/mailmerge_list.txt
merge_flists gid_Module_Optional_Pyuno $FILELISTSDIR/pyuno_list.txt
merge_flists gid_Module_Optional_Pyuno_LibreLogo $FILELISTSDIR/pyuno_list.txt
@@ -151,7 +149,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
else
merge_flists gid_Module_Optional_Grfflt $FILELISTSDIR/common_list.txt
merge_flists gid_Module_Optional_Headless $FILELISTSDIR/common_list.txt
- merge_flists gid_Module_Optional_Javafilter $FILELISTSDIR/common_list.txt
merge_flists gid_Module_Optional_Pymailmerge $FILELISTSDIR/common_list.txt
merge_flists gid_Module_Optional_Pyuno $FILELISTSDIR/common_list.txt
merge_flists gid_Module_Optional_Pyuno_LibreLogo $FILELISTSDIR/common_list.txt
@@ -403,7 +400,6 @@ else
create_package_directory gid_Module_Root_Files_Images pkg/libreoffice-common
create_package_directory gid_Module_Oo_Linguistic pkg/libreoffice-common
create_package_directory gid_Module_Optional_Xsltfiltersamples pkg/libreoffice-common
- create_package_directory gid_Module_Optional_Javafilter pkg/libreoffice-common
create_package_directory gid_Module_Optional_Grfflt pkg/libreoffice-draw
create_package_directory gid_Module_Prg_Calc_Bin pkg/libreoffice-calc
create_package_directory gid_Module_Prg_Math_Bin pkg/libreoffice-math