- up for version 0.93-pre3

Changed files:
    dia-locale-names.patch -> 1.2
    dia-python.patch -> 1.2

diff --git a/dia-locale-names.patch b/dia-locale-names.patch
index f4c2678726e09d9abbcc22043ff5a91c74687622..d154c10aaa85ea5d6ad4fcb946527f15343f87c6 100644 (file)
--- a/dia-locale-names.patch
+++ b/dia-locale-names.patch
@@ -1,12 +1,12 @@
-diff -urN aa/dia-0.92.2/configure.in dia-0.92.2/configure.in
---- aa/dia-0.92.2/configure.in 2003-11-01 12:23:46.000000000 +0100
-+++ dia-0.92.2/configure.in    2004-03-13 00:17:14.392468576 +0100
-@@ -216,7 +216,7 @@
+diff -urN dia-0.93-pre3.orig/configure.in dia-0.93-pre3/configure.in
+--- dia-0.93-pre3.orig/configure.in    2004-04-16 11:49:20.282635224 +0200
++++ dia-0.93-pre3/configure.in 2004-04-16 11:50:50.039990032 +0200
+@@ -217,7 +217,7 @@
  GETTEXT_PACKAGE=dia
  AC_SUBST(GETTEXT_PACKAGE)
  AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Needed for glib gettext])
--ALL_LINGUAS="am az be ca cs da de el en_GB es fi fr ga hu it ja ko mk ml ms nl nn no pl pt pt_BR ro ru sk sl sr sr@Latn sv tr uk vi zh_CN zh_TW"
-+ALL_LINGUAS="am az be ca cs da de el en_GB es fi fr ga hu it ja ko mk ml ms nb nl nn pl pt pt_BR ro ru sk sl sr sr@Latn sv tr uk vi zh_CN zh_TW"
+-ALL_LINGUAS="am az be ca cs da de el en_CA en_GB es fi fr ga hr hu is it ja ko mk mn ml ms nl nn no pl pt pt_BR ro ru sk sl sq sr sr@Latn sv tr uk vi zh_CN zh_TW"
++ALL_LINGUAS="am az be ca cs da de el en_CA en_GB es fi fr ga hr hu is it ja ko mk mn ml ms nb nl nn pl pt pt_BR ro ru sk sl sq sr sr@Latn sv tr uk vi zh_CN zh_TW"
  AM_GLIB_GNU_GETTEXT
  
  dnl INTLOBJS doesn't seem to always get subst'ed, but I believe it's

diff --git a/dia-python.patch b/dia-python.patch
index 8968323b0a7216a6a348ef814083209e8b695886..76eee7616768b826b788f3389d31da0b8c7d2116 100644 (file)
--- a/dia-python.patch
+++ b/dia-python.patch
@@ -1,22 +1,22 @@
-diff -urN aa/dia-0.92.2/acinclude.m4 dia-0.92.2/acinclude.m4
---- aa/dia-0.92.2/acinclude.m4 2002-03-09 23:22:42.000000000 +0100
-+++ dia-0.92.2/acinclude.m4    2004-03-13 00:39:43.668347464 +0100
-@@ -211,7 +211,7 @@
+diff -urN dia-0.93-pre3.orig/acinclude.m4 dia-0.93-pre3/acinclude.m4
+--- dia-0.93-pre3.orig/acinclude.m4    2004-04-16 11:49:20.275636288 +0200
++++ dia-0.93-pre3/acinclude.m4 2004-04-16 11:55:01.459768416 +0200
+@@ -214,7 +214,7 @@
  [AC_REQUIRE([AM_PATH_PYTHON])
  AC_REQUIRE([AM_CHECK_PYTHON_HEADERS])
  
 -AC_MSG_CHECKING(for libpython${PYTHON_VERSION}.a)
 +AC_MSG_CHECKING(for libpython${PYTHON_VERSION})
  
- py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
+ py_config_dir=`$PYTHON -c "import os; print os.path.abspath('$pyexecdir/../config')"`
  
-@@ -222,13 +222,8 @@
+@@ -225,13 +225,8 @@
    py_basemodlibs=`sed -n -e 's/^BASEMODLIBS=\(.*\)/\1/p' $py_makefile`
    py_other_libs=`sed -n -e 's/^LIBS=\(.*\)/\1/p' $py_makefile`
  
 -dnl now the actual libpython
--  if test -e "${py_exec_prefix}/lib/python${PYTHON_VERSION}/config/libpython${PYTHON_VERSION}.a"; then
--    PYTHON_LIBS="-L${py_exec_prefix}/lib/python${PYTHON_VERSION}/config -lpython${PYTHON_VERSION} $py_localmodlibs $py_basemodlibs $py_other_libs"
+-  if test -e "${py_config_dir}/libpython${PYTHON_VERSION}.a"; then
+-    PYTHON_LIBS="-L${py_config_dir} -lpython${PYTHON_VERSION} $py_localmodlibs $py_basemodlibs $py_other_libs"
 +    PYTHON_LIBS="-lpython${PYTHON_VERSION} $py_localmodlibs $py_basemodlibs $py_other_libs"
      AC_MSG_RESULT(found)
 -  else