- updated to 0.90 (merge DEVEL branch).

Changed files:
    dia-automake.patch -> 1.4

diff --git a/dia-automake.patch b/dia-automake.patch
index db9e9591747f26c01b9efd84e5b35f62cc824df4..3892aef44e64217205bb52d18fd5f74b1d6c868b 100644 (file)
--- a/dia-automake.patch
+++ b/dia-automake.patch
@@ -1,44 +1,20 @@
---- dia-0.86/app/Makefile.am   Tue Aug  8 07:03:05 2000
-+++ dia-0.86.new/app/Makefile.am       Tue Aug  8 07:03:36 2000
-@@ -154,7 +154,7 @@
-       $(APP_LIBS) $(XML_LIBS) $(BONOBO_LIBS) $(GDK_IMLIB_LIBS) \
-       $(LIBART_LIBS) $(PNG_LIBS) $(GDK_PIXBUF_LIBS) $(INTLLIBS)
+--- dia-cvs-snapshot.orig/app/Makefile.am      Tue Apr 23 09:23:06 2002
++++ dia-cvs-snapshot/app/Makefile.am   Fri Apr 26 11:48:03 2002
+@@ -229,7 +229,7 @@
+       pixmaps/magnify-minus-data.xbm \
+       pixmaps/magnify-minus-mask.xbm
  
--LDFLAGS = -export-dynamic
-+dia_embedd_LDFLAGS = -export-dynamic
+-run_dia.sh: Makefile.am
++run_dia.sh$(EXEEXT): Makefile.am
+       echo "#!$(SHELL) " > run_dia.sh
+       echo "export DIA_LIB_PATH DIA_SHAPE_PATH DIA_INT_SHAPE_PATH DIA_SHEET_PATH" >> run_dia.sh
+       echo DIA_LIB_PATH=`pwd`/../objects//:`pwd`/../plug-ins// >> run_dia.sh
+@@ -240,7 +240,7 @@
+       echo "\$$DEBUGGER `pwd`/dia \$$*" >> run_dia.sh
+       chmod a+x run_dia.sh
  
- EXTRA_DIST = \
-       dia.gnorba \
---- dia-0.86/configure.in      Wed Aug  2 16:55:21 2000
-+++ dia-0.86.new/configure.in  Tue Aug  8 07:06:00 2000
-@@ -11,7 +11,7 @@
+-run_diaconv.sh: run_dia.sh
++run_diaconv.sh$(EXEEXT): run_dia.sh$(EXEEXT)
+       cat run_dia.sh | sed -e "s%`pwd`/dia%`pwd`/diaconv%g" >run_diaconv.sh 
+       chmod a+x run_diaconv.sh
  
- dnl Initialize libtool
- AC_DISABLE_STATIC
--AC_PROG_LIBTOOL
-+AM_PROG_LIBTOOL
- 
- dnl Build time sanity check
- AM_SANITY_CHECK
---- dia-0.88.1/app/Makefile.am Thu Oct 11 15:54:06 2001
-+++ dia-0.88.1-p/app/Makefile.am       Thu Oct 11 15:54:18 2001
-@@ -28,8 +28,7 @@
-       render_gnomeprint.h
- endif
- 
--noinst_PROGRAMS = run_dia.sh
--run_dia_sh_SOURCES = 
-+noinst_SCRIPTS = run_dia.sh
- 
- if HAVE_BONOBO
- dia_embedd = dia-embedd
---- dia-0.88.1-p/app/Makefile.am       Thu Oct 11 15:54:18 2001
-+++ dia-0.88.1/app/Makefile.am Thu Oct 11 20:37:46 2001
-@@ -10,6 +10,7 @@
-         $(GNOME_CFLAGS) \
-       $(LIBART_CFLAGS) \
-       $(GDK_PIXBUF_CFLAGS) \
-+      -I/usr/include/orbit-1.0 \
-       -DLOCALEDIR=\"$(localedir)\"
- 
- if HAVE_GNOME_PRINT