[Libreoffice-commits] .: Branch 'libreoffice-3-6' - extras/prj extras/source extras/util
Andras Timar
timar at kemper.freedesktop.org
Tue Jun 5 07:01:52 PDT 2012
dev/null |binary
extras/prj/build.lst | 1
extras/source/symbols/delzip | 1
extras/source/symbols/makefile.mk | 51 --------------------------------------
extras/util/target.pmk | 3 --
5 files changed, 56 deletions(-)
New commits:
commit 4dd1f2d3cdcb34428ba53ccec305713a7195ea20
Author: Andras Timar <atimar at suse.com>
Date: Tue Jun 5 16:02:34 2012 +0200
Revert "Revert "Remove ugly symbols""
This reverts commit e74c007e25d05e49d94a94d9b024076faa02c8d0.
diff --git a/extras/prj/build.lst b/extras/prj/build.lst
index 3aca646..a9fd80a 100644
--- a/extras/prj/build.lst
+++ b/extras/prj/build.lst
@@ -70,7 +70,6 @@ er extras\source\gallery\accessories\Elements\Bullets2 nmake -
er extras\source\gallery\accessories-nonfree nmake - all er_gaccenf NULL
er extras\source\misc_config nmake - all er_mcnf NULL
er extras\source\palettes nmake - all er_palet NULL
-er extras\source\symbols nmake - all er_symb NULL
er extras\source\templates\layout nmake - all er_tlal NULL
er extras\source\templates\presnt\lang nmake - all er_tprel NULL
er extras\source\templates\wizard\agenda\lang nmake - all er_twagl NULL
diff --git a/extras/source/symbols/delzip b/extras/source/symbols/delzip
deleted file mode 100644
index 636fda9..0000000
--- a/extras/source/symbols/delzip
+++ /dev/null
@@ -1 +0,0 @@
-ECHO is OFF
diff --git a/extras/source/symbols/l_2people.bmp b/extras/source/symbols/l_2people.bmp
deleted file mode 100644
index 5b7a8fc..0000000
Binary files a/extras/source/symbols/l_2people.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_attention1.bmp b/extras/source/symbols/l_attention1.bmp
deleted file mode 100644
index bf6890f..0000000
Binary files a/extras/source/symbols/l_attention1.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_attention2.bmp b/extras/source/symbols/l_attention2.bmp
deleted file mode 100644
index 120c9e9..0000000
Binary files a/extras/source/symbols/l_attention2.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_attention3.bmp b/extras/source/symbols/l_attention3.bmp
deleted file mode 100644
index 7b48a9c..0000000
Binary files a/extras/source/symbols/l_attention3.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_candy.bmp b/extras/source/symbols/l_candy.bmp
deleted file mode 100644
index 935fdf8..0000000
Binary files a/extras/source/symbols/l_candy.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_face.bmp b/extras/source/symbols/l_face.bmp
deleted file mode 100644
index c44d956..0000000
Binary files a/extras/source/symbols/l_face.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_flower.bmp b/extras/source/symbols/l_flower.bmp
deleted file mode 100644
index ced7409..0000000
Binary files a/extras/source/symbols/l_flower.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_ghost.bmp b/extras/source/symbols/l_ghost.bmp
deleted file mode 100644
index 877ba27..0000000
Binary files a/extras/source/symbols/l_ghost.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_halloween.bmp b/extras/source/symbols/l_halloween.bmp
deleted file mode 100644
index 8326cd2..0000000
Binary files a/extras/source/symbols/l_halloween.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_home.bmp b/extras/source/symbols/l_home.bmp
deleted file mode 100644
index c34900a..0000000
Binary files a/extras/source/symbols/l_home.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_lamp.bmp b/extras/source/symbols/l_lamp.bmp
deleted file mode 100644
index 6a824ef..0000000
Binary files a/extras/source/symbols/l_lamp.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_lock.bmp b/extras/source/symbols/l_lock.bmp
deleted file mode 100644
index 986f4d0..0000000
Binary files a/extras/source/symbols/l_lock.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_page_b.bmp b/extras/source/symbols/l_page_b.bmp
deleted file mode 100644
index 94c3c67..0000000
Binary files a/extras/source/symbols/l_page_b.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_page_g.bmp b/extras/source/symbols/l_page_g.bmp
deleted file mode 100644
index f0b8d7d..0000000
Binary files a/extras/source/symbols/l_page_g.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_page_y.bmp b/extras/source/symbols/l_page_y.bmp
deleted file mode 100644
index 39e7c98..0000000
Binary files a/extras/source/symbols/l_page_y.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_people.bmp b/extras/source/symbols/l_people.bmp
deleted file mode 100644
index 1123390..0000000
Binary files a/extras/source/symbols/l_people.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_rose.bmp b/extras/source/symbols/l_rose.bmp
deleted file mode 100644
index 5feafee..0000000
Binary files a/extras/source/symbols/l_rose.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_save.bmp b/extras/source/symbols/l_save.bmp
deleted file mode 100644
index 77a33b0..0000000
Binary files a/extras/source/symbols/l_save.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_smiley_1.bmp b/extras/source/symbols/l_smiley_1.bmp
deleted file mode 100644
index 1d4c064..0000000
Binary files a/extras/source/symbols/l_smiley_1.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_smiley_oh.bmp b/extras/source/symbols/l_smiley_oh.bmp
deleted file mode 100644
index 54d6067..0000000
Binary files a/extras/source/symbols/l_smiley_oh.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_smiley_sad.bmp b/extras/source/symbols/l_smiley_sad.bmp
deleted file mode 100644
index bfa17ea..0000000
Binary files a/extras/source/symbols/l_smiley_sad.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_snow.bmp b/extras/source/symbols/l_snow.bmp
deleted file mode 100644
index fce169d..0000000
Binary files a/extras/source/symbols/l_snow.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_star.bmp b/extras/source/symbols/l_star.bmp
deleted file mode 100644
index 5a12554..0000000
Binary files a/extras/source/symbols/l_star.bmp and /dev/null differ
diff --git a/extras/source/symbols/makefile.mk b/extras/source/symbols/makefile.mk
deleted file mode 100644
index 09bb040..0000000
--- a/extras/source/symbols/makefile.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..
-
-
-
-PRJNAME=extras
-TARGET=symbols
-
-.INCLUDE : settings.mk
-
-.INCLUDE : $(PRJ)$/util$/target.pmk
-
-
-
-ZIP1TARGET = $(SYMBOLS_ALL_TARGET)
-
-ZIP1LIST = * -x makefile.*
-
-
-
-.INCLUDE : target.mk
-
-
-
-
-
diff --git a/extras/source/symbols/s_arrow-1.bmp b/extras/source/symbols/s_arrow-1.bmp
deleted file mode 100644
index 4b77c9b..0000000
Binary files a/extras/source/symbols/s_arrow-1.bmp and /dev/null differ
diff --git a/extras/source/symbols/s_arrow-2.bmp b/extras/source/symbols/s_arrow-2.bmp
deleted file mode 100644
index e7c94e7..0000000
Binary files a/extras/source/symbols/s_arrow-2.bmp and /dev/null differ
diff --git a/extras/source/symbols/s_arrow-3.bmp b/extras/source/symbols/s_arrow-3.bmp
deleted file mode 100644
index 14d544d..0000000
Binary files a/extras/source/symbols/s_arrow-3.bmp and /dev/null differ
diff --git a/extras/source/symbols/s_arrow-4.bmp b/extras/source/symbols/s_arrow-4.bmp
deleted file mode 100644
index d0a192b..0000000
Binary files a/extras/source/symbols/s_arrow-4.bmp and /dev/null differ
diff --git a/extras/source/symbols/s_attention1.bmp b/extras/source/symbols/s_attention1.bmp
deleted file mode 100644
index d3fe270..0000000
Binary files a/extras/source/symbols/s_attention1.bmp and /dev/null differ
diff --git a/extras/source/symbols/s_attention2.bmp b/extras/source/symbols/s_attention2.bmp
deleted file mode 100644
index dc9df13..0000000
Binary files a/extras/source/symbols/s_attention2.bmp and /dev/null differ
diff --git a/extras/source/symbols/s_attention3.bmp b/extras/source/symbols/s_attention3.bmp
deleted file mode 100644
index b52cd4d..0000000
Binary files a/extras/source/symbols/s_attention3.bmp and /dev/null differ
diff --git a/extras/source/symbols/s_ball-b.bmp b/extras/source/symbols/s_ball-b.bmp
deleted file mode 100644
index aba1337..0000000
Binary files a/extras/source/symbols/s_ball-b.bmp and /dev/null differ
diff --git a/extras/source/symbols/s_ball-g.bmp b/extras/source/symbols/s_ball-g.bmp
deleted file mode 100644
index be71aa3..0000000
Binary files a/extras/source/symbols/s_ball-g.bmp and /dev/null differ
diff --git a/extras/source/symbols/s_ball-r.bmp b/extras/source/symbols/s_ball-r.bmp
deleted file mode 100644
index 40f4987..0000000
Binary files a/extras/source/symbols/s_ball-r.bmp and /dev/null differ
diff --git a/extras/source/symbols/s_ball.bmp b/extras/source/symbols/s_ball.bmp
deleted file mode 100644
index 423f065..0000000
Binary files a/extras/source/symbols/s_ball.bmp and /dev/null differ
diff --git a/extras/source/symbols/s_bug.bmp b/extras/source/symbols/s_bug.bmp
deleted file mode 100644
index ca450ae..0000000
Binary files a/extras/source/symbols/s_bug.bmp and /dev/null differ
diff --git a/extras/source/symbols/s_clover.bmp b/extras/source/symbols/s_clover.bmp
deleted file mode 100644
index cff9bd2..0000000
Binary files a/extras/source/symbols/s_clover.bmp and /dev/null differ
diff --git a/extras/source/symbols/s_egg.bmp b/extras/source/symbols/s_egg.bmp
deleted file mode 100644
index 7a3a552..0000000
Binary files a/extras/source/symbols/s_egg.bmp and /dev/null differ
diff --git a/extras/source/symbols/s_face.bmp b/extras/source/symbols/s_face.bmp
deleted file mode 100644
index 60b5db9..0000000
Binary files a/extras/source/symbols/s_face.bmp and /dev/null differ
diff --git a/extras/source/symbols/s_flower.bmp b/extras/source/symbols/s_flower.bmp
deleted file mode 100644
index b560e32..0000000
Binary files a/extras/source/symbols/s_flower.bmp and /dev/null differ
diff --git a/extras/source/symbols/s_ghost.bmp b/extras/source/symbols/s_ghost.bmp
deleted file mode 100644
index a657110..0000000
Binary files a/extras/source/symbols/s_ghost.bmp and /dev/null differ
diff --git a/extras/source/symbols/s_group.bmp b/extras/source/symbols/s_group.bmp
deleted file mode 100644
index fe80f86..0000000
Binary files a/extras/source/symbols/s_group.bmp and /dev/null differ
diff --git a/extras/source/symbols/s_halloween.bmp b/extras/source/symbols/s_halloween.bmp
deleted file mode 100644
index d188517..0000000
Binary files a/extras/source/symbols/s_halloween.bmp and /dev/null differ
diff --git a/extras/source/symbols/s_heart.bmp b/extras/source/symbols/s_heart.bmp
deleted file mode 100644
index 6cea8ec..0000000
Binary files a/extras/source/symbols/s_heart.bmp and /dev/null differ
diff --git a/extras/source/symbols/s_home.bmp b/extras/source/symbols/s_home.bmp
deleted file mode 100644
index 931d25d..0000000
Binary files a/extras/source/symbols/s_home.bmp and /dev/null differ
diff --git a/extras/source/symbols/s_lock.bmp b/extras/source/symbols/s_lock.bmp
deleted file mode 100644
index 09914cb..0000000
Binary files a/extras/source/symbols/s_lock.bmp and /dev/null differ
diff --git a/extras/source/symbols/s_ok-g.bmp b/extras/source/symbols/s_ok-g.bmp
deleted file mode 100644
index 8c3480c..0000000
Binary files a/extras/source/symbols/s_ok-g.bmp and /dev/null differ
diff --git a/extras/source/symbols/s_ok-r.bmp b/extras/source/symbols/s_ok-r.bmp
deleted file mode 100644
index 4423915..0000000
Binary files a/extras/source/symbols/s_ok-r.bmp and /dev/null differ
diff --git a/extras/source/symbols/s_ok.bmp b/extras/source/symbols/s_ok.bmp
deleted file mode 100644
index ca73720..0000000
Binary files a/extras/source/symbols/s_ok.bmp and /dev/null differ
diff --git a/extras/source/symbols/s_page_b.bmp b/extras/source/symbols/s_page_b.bmp
deleted file mode 100644
index c97bc83..0000000
Binary files a/extras/source/symbols/s_page_b.bmp and /dev/null differ
diff --git a/extras/source/symbols/s_page_g.bmp b/extras/source/symbols/s_page_g.bmp
deleted file mode 100644
index ddeb8b5..0000000
Binary files a/extras/source/symbols/s_page_g.bmp and /dev/null differ
diff --git a/extras/source/symbols/s_page_y.bmp b/extras/source/symbols/s_page_y.bmp
deleted file mode 100644
index 1af3658..0000000
Binary files a/extras/source/symbols/s_page_y.bmp and /dev/null differ
diff --git a/extras/source/symbols/s_pen-b.bmp b/extras/source/symbols/s_pen-b.bmp
deleted file mode 100644
index bc340db..0000000
Binary files a/extras/source/symbols/s_pen-b.bmp and /dev/null differ
diff --git a/extras/source/symbols/s_pen-g.bmp b/extras/source/symbols/s_pen-g.bmp
deleted file mode 100644
index fe5ae67..0000000
Binary files a/extras/source/symbols/s_pen-g.bmp and /dev/null differ
diff --git a/extras/source/symbols/s_pen-r.bmp b/extras/source/symbols/s_pen-r.bmp
deleted file mode 100644
index 437df47..0000000
Binary files a/extras/source/symbols/s_pen-r.bmp and /dev/null differ
diff --git a/extras/source/symbols/s_people.bmp b/extras/source/symbols/s_people.bmp
deleted file mode 100644
index d0add8e..0000000
Binary files a/extras/source/symbols/s_people.bmp and /dev/null differ
diff --git a/extras/source/symbols/s_smily_1.bmp b/extras/source/symbols/s_smily_1.bmp
deleted file mode 100644
index 0fcdfdf..0000000
Binary files a/extras/source/symbols/s_smily_1.bmp and /dev/null differ
diff --git a/extras/source/symbols/s_smily_oh.bmp b/extras/source/symbols/s_smily_oh.bmp
deleted file mode 100644
index a9e15d7..0000000
Binary files a/extras/source/symbols/s_smily_oh.bmp and /dev/null differ
diff --git a/extras/source/symbols/s_smily_sad.bmp b/extras/source/symbols/s_smily_sad.bmp
deleted file mode 100644
index 62f140e..0000000
Binary files a/extras/source/symbols/s_smily_sad.bmp and /dev/null differ
diff --git a/extras/source/symbols/s_snow.bmp b/extras/source/symbols/s_snow.bmp
deleted file mode 100644
index a19e235..0000000
Binary files a/extras/source/symbols/s_snow.bmp and /dev/null differ
diff --git a/extras/source/symbols/s_star.bmp b/extras/source/symbols/s_star.bmp
deleted file mode 100644
index 275325f..0000000
Binary files a/extras/source/symbols/s_star.bmp and /dev/null differ
diff --git a/extras/source/symbols/s_team.bmp b/extras/source/symbols/s_team.bmp
deleted file mode 100644
index 08fcc17..0000000
Binary files a/extras/source/symbols/s_team.bmp and /dev/null differ
diff --git a/extras/source/symbols/s_x-g.bmp b/extras/source/symbols/s_x-g.bmp
deleted file mode 100644
index e014a6c..0000000
Binary files a/extras/source/symbols/s_x-g.bmp and /dev/null differ
diff --git a/extras/source/symbols/s_x-r.bmp b/extras/source/symbols/s_x-r.bmp
deleted file mode 100644
index 01c2368..0000000
Binary files a/extras/source/symbols/s_x-r.bmp and /dev/null differ
diff --git a/extras/source/symbols/s_x.bmp b/extras/source/symbols/s_x.bmp
deleted file mode 100644
index 01cbbc1..0000000
Binary files a/extras/source/symbols/s_x.bmp and /dev/null differ
diff --git a/extras/util/target.pmk b/extras/util/target.pmk
index cec58f9..b245df4 100644
--- a/extras/util/target.pmk
+++ b/extras/util/target.pmk
@@ -160,9 +160,6 @@ SAMPLES_TEXTS_TARGET = samtext
SAMPLES_CHAPTERS_TARGET = samchapters
SAMPLES_HOMEPAGE_TARGET = samhomepage
-
-SYMBOLS_ALL_TARGET = symbols
-
TEMPLATE_ROOT_TARGET = tplroot
TEMPLATE_EDUCATE_WRITER_TARGET = tpleduwrit
TEMPLATE_EDUCATE_IMPRESS_TARGET = tpleduimpr
More information about the Libreoffice-commits
mailing list