Merging upstream version 0.1.4 (Closes: #761151).
authorAndriy Grytsenko <andrej@rep.kiev.ua>
Fri, 12 Sep 2014 11:51:29 +0000 (14:51 +0300)
committerAndriy Grytsenko <andrej@rep.kiev.ua>
Fri, 12 Sep 2014 12:32:25 +0000 (15:32 +0300)
The file lxde-science.directory also installed by lxsession into the same place.
Upstream renamed it into lxde-science-math.directory to fix the conflict.

configure
configure.ac
desktop-directories/Makefile.am
desktop-directories/Makefile.in
desktop-directories/lxde-science-math.directory.in [new file with mode: 0644]
desktop-directories/lxde-science.directory.in [deleted file]
po/POTFILES.in

index 19ab233..6669117 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for lxmenu-data 0.1.3.
+# Generated by GNU Autoconf 2.69 for lxmenu-data 0.1.4.
 #
 # Report bugs to <http://lxde.org/>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='lxmenu-data'
 PACKAGE_TARNAME='lxmenu-data'
-PACKAGE_VERSION='0.1.3'
-PACKAGE_STRING='lxmenu-data 0.1.3'
+PACKAGE_VERSION='0.1.4'
+PACKAGE_STRING='lxmenu-data 0.1.4'
 PACKAGE_BUGREPORT='http://lxde.org/'
 PACKAGE_URL=''
 
@@ -1314,7 +1314,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures lxmenu-data 0.1.3 to adapt to many kinds of systems.
+\`configure' configures lxmenu-data 0.1.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1380,7 +1380,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of lxmenu-data 0.1.3:";;
+     short | recursive ) echo "Configuration of lxmenu-data 0.1.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1472,7 +1472,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-lxmenu-data configure 0.1.3
+lxmenu-data configure 0.1.4
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1841,7 +1841,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by lxmenu-data $as_me 0.1.3, which was
+It was created by lxmenu-data $as_me 0.1.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2704,7 +2704,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='lxmenu-data'
- VERSION='0.1.3'
+ VERSION='0.1.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6117,7 +6117,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by lxmenu-data $as_me 0.1.3, which was
+This file was extended by lxmenu-data $as_me 0.1.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6174,7 +6174,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-lxmenu-data config.status 0.1.3
+lxmenu-data config.status 0.1.4
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
index bf60e92..0d263d7 100644 (file)
@@ -1,4 +1,4 @@
-AC_INIT([lxmenu-data], [0.1.3],
+AC_INIT([lxmenu-data], [0.1.4],
         [http://lxde.org/])
 AM_INIT_AUTOMAKE([foreign no-dist-gzip dist-xz])
 
index 3ca665e..8dc7e62 100644 (file)
@@ -17,7 +17,7 @@ directory_in_files =                          \
        lxde-office.directory.in                \
        lxde-other.directory.in                 \
        lxde-personal.directory.in              \
-       lxde-science.directory.in               \
+       lxde-science-math.directory.in          \
        lxde-settings.directory.in              \
        lxde-settings-system.directory.in       \
        lxde-system.directory.in                \
index 0c7ca4d..0bb7647 100644 (file)
@@ -268,7 +268,7 @@ directory_in_files = \
        lxde-office.directory.in                \
        lxde-other.directory.in                 \
        lxde-personal.directory.in              \
-       lxde-science.directory.in               \
+       lxde-science-math.directory.in          \
        lxde-settings.directory.in              \
        lxde-settings-system.directory.in       \
        lxde-system.directory.in                \
diff --git a/desktop-directories/lxde-science-math.directory.in b/desktop-directories/lxde-science-math.directory.in
new file mode 100644 (file)
index 0000000..6e5c7ba
--- /dev/null
@@ -0,0 +1,79 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Icon=applications-science
+_Name=Science & Math
+Name[af]=Wetenskap & Wiskunde
+Name[ar]=العلوم والرياضيات
+Name[be]=Навука і матэматыка
+Name[bg]=Математика
+Name[bn]=বিজ্ঞান এবং গণিত
+Name[bn_IN]=বিজ্ঞান ও গণিত
+Name[br]=Skiant ha Jedoniel
+Name[ca]=Ciència i Matemàtiques
+Name[cs]=Věda a matematika
+Name[csb]=Ùczbòwé
+Name[cy]=Gwyddoniaeth a Mathemateg
+Name[da]=Naturvidenskab og matematik
+Name[de]=Wissenschaft & Mathematik
+Name[el]=Επιστήμη & Μαθηματικά
+Name[en_GB]=Science & Maths
+Name[eo]=Scienco kaj matematiko
+Name[es]=Ciencia y matemáticas
+Name[et]=Teadus
+Name[eu]=Zientzia eta matematikaa
+Name[fa]=علوم و ریاضی
+Name[fi]=Tiede ja matematiikka
+Name[fr]=Science et mathématiques
+Name[fy]=Wittenskiplik en wiskunde
+Name[ga]=Eolaíocht agus Matamaitic
+Name[gl]=Ciencia e matemáticas
+Name[gu]=વિજ્ઞાન અને ગણિત
+Name[he]=מדע ומתמטיקה
+Name[hi]=विज्ञान और गणित
+Name[hr]=Znanost i matematika
+Name[hu]=Tudományok, matematika
+Name[is]=Vísindi og stærðfræði
+Name[it]=Scienza e matematica
+Name[ja]=サイエンス & 数学
+Name[ka]=მეცნიერება და მათემატიკა 
+Name[kk]=Ғылыми және математикалық
+Name[km]=វិទ្យាសាស្ត្រ និង​គណិតវិទ្យា
+Name[ko]=과학과 수학
+Name[ku]=Zanîn & Matematîk
+Name[lt]=Mokslas ir matematika
+Name[lv]=Zinātne un matemātika
+Name[mk]=Наука и математика
+Name[ml]=ശാസ്ത്രവും ഗണിതവും
+Name[mr]=विज्ञान व गणित
+Name[ms]=Matematik & Sains
+Name[nb]=Vitenskap og matematikk
+Name[nds]=Wetenschap & Mathematik
+Name[ne]=विज्ञान र गणीत
+Name[nl]=Wetenschap en wiskunde
+Name[nn]=Vitskap og matematikk
+Name[pa]=ਵਿਗਿਆਨ ਅਤੇ ਗਣਿਤ
+Name[pl]=Naukowe
+Name[pt]=Ciência e Matemática
+Name[pt_BR]=Ciências & Matemática
+Name[ro]=Știință și matematică
+Name[ru]=Научные и математические
+Name[se]=Dieđa ja matematihkka
+Name[sk]=Veda
+Name[sl]=Znanost in matematika
+Name[sr]=Наука и математика
+Name[sr@latin]=Nauka i matematika
+Name[sv]=Vetenskap och matematik
+Name[ta]=அறிவியல் & கணிதம்
+Name[te]=విజ్ఞానం & గణితం
+Name[tg]=Илм ва математика
+Name[th]=วิทยาศาสตร์และคณิตศาสตร์
+Name[tr]=Bilim ve Matematik
+Name[uk]=Наука і математика
+Name[uz]=Fan va Matematika
+Name[uz@cyrillic]=Фан ва Математика
+Name[vi]=Khoa học và Toán học
+Name[wa]=Siyinces et matematikes
+Name[x-test]=xxScience & Mathxx
+Name[zh_CN]=科学和数学
+Name[zh_TW]=科學與數學
diff --git a/desktop-directories/lxde-science.directory.in b/desktop-directories/lxde-science.directory.in
deleted file mode 100644 (file)
index c90a288..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Directory
-Icon=applications-science
-_Name=Science & Math
index c7b40d2..6363f7e 100644 (file)
@@ -14,7 +14,7 @@ desktop-directories/lxde-network.directory.in
 desktop-directories/lxde-office.directory.in
 desktop-directories/lxde-other.directory.in
 desktop-directories/lxde-personal.directory.in
-desktop-directories/lxde-science.directory.in
+desktop-directories/lxde-science-math.directory.in
 desktop-directories/lxde-settings.directory.in
 desktop-directories/lxde-settings-system.directory.in
 desktop-directories/lxde-system.directory.in