dia: 0.96.1 -> 0.97.2

3 files changed, 77 insertions, 52 deletions

diff --git a/dia/.footprint b/dia/.footprint
index 9ac1f56de..7c099f9cb 100644
--- a/dia/.footprint
+++ b/dia/.footprint
@@ -5,16 +5,20 @@ drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/dia/
 -rwxr-xr-x	root/root	usr/lib/dia/libaadl_objects.la
 -rwxr-xr-x	root/root	usr/lib/dia/libaadl_objects.so
--rwxr-xr-x	root/root	usr/lib/dia/libbondgraph_objects.la
--rwxr-xr-x	root/root	usr/lib/dia/libbondgraph_objects.so
+-rwxr-xr-x	root/root	usr/lib/dia/libart_filter.la
+-rwxr-xr-x	root/root	usr/lib/dia/libart_filter.so
 -rwxr-xr-x	root/root	usr/lib/dia/libcairo_filter.la
 -rwxr-xr-x	root/root	usr/lib/dia/libcairo_filter.so
 -rwxr-xr-x	root/root	usr/lib/dia/libcgm_filter.la
 -rwxr-xr-x	root/root	usr/lib/dia/libcgm_filter.so
 -rwxr-xr-x	root/root	usr/lib/dia/libchronogram_objects.la
 -rwxr-xr-x	root/root	usr/lib/dia/libchronogram_objects.so
+-rwxr-xr-x	root/root	usr/lib/dia/libcustom_lines_objects.la
+-rwxr-xr-x	root/root	usr/lib/dia/libcustom_lines_objects.so
 -rwxr-xr-x	root/root	usr/lib/dia/libcustom_objects.la
 -rwxr-xr-x	root/root	usr/lib/dia/libcustom_objects.so
+-rwxr-xr-x	root/root	usr/lib/dia/libdb_objects.la
+-rwxr-xr-x	root/root	usr/lib/dia/libdb_objects.so
 -rwxr-xr-x	root/root	usr/lib/dia/libdia.la
 -rwxr-xr-x	root/root	usr/lib/dia/libdia.so
 -rwxr-xr-x	root/root	usr/lib/dia/libdxf_filter.la
@@ -45,6 +49,8 @@ drwxr-xr-x	root/root	usr/lib/dia/
 -rwxr-xr-x	root/root	usr/lib/dia/libpgf_filter.so
 -rwxr-xr-x	root/root	usr/lib/dia/libpixbuf_filter.la
 -rwxr-xr-x	root/root	usr/lib/dia/libpixbuf_filter.so
+-rwxr-xr-x	root/root	usr/lib/dia/libpostscript_filter.la
+-rwxr-xr-x	root/root	usr/lib/dia/libpostscript_filter.so
 -rwxr-xr-x	root/root	usr/lib/dia/libpstricks_filter.la
 -rwxr-xr-x	root/root	usr/lib/dia/libpstricks_filter.so
 -rwxr-xr-x	root/root	usr/lib/dia/libsadt_objects.la
@@ -72,7 +78,7 @@ drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/applications/
 -rw-r--r--	root/root	usr/share/applications/dia.desktop
 drwxr-xr-x	root/root	usr/share/dia/
--rw-r--r--	root/root	usr/share/dia/dia_logo.png
+-rw-r--r--	root/root	usr/share/dia/dia-splash.png
 drwxr-xr-x	root/root	usr/share/dia/shapes/
 drwxr-xr-x	root/root	usr/share/dia/shapes/Assorted/
 -rw-r--r--	root/root	usr/share/dia/shapes/Assorted/arrow-chevron.png
@@ -1319,6 +1325,33 @@ drwxr-xr-x	root/root	usr/share/dia/shapes/Gane_and_Sarson/
 -rw-r--r--	root/root	usr/share/dia/shapes/Gane_and_Sarson/entity.shape
 -rw-r--r--	root/root	usr/share/dia/shapes/Gane_and_Sarson/process.png
 -rw-r--r--	root/root	usr/share/dia/shapes/Gane_and_Sarson/process.shape
+drwxr-xr-x	root/root	usr/share/dia/shapes/Lights/
+-rw-r--r--	root/root	usr/share/dia/shapes/Lights/ACL.png
+-rw-r--r--	root/root	usr/share/dia/shapes/Lights/ACL.shape
+-rw-r--r--	root/root	usr/share/dia/shapes/Lights/Blacklight.png
+-rw-r--r--	root/root	usr/share/dia/shapes/Lights/Blacklight.shape
+-rw-r--r--	root/root	usr/share/dia/shapes/Lights/Blinders.png
+-rw-r--r--	root/root	usr/share/dia/shapes/Lights/Blinders.shape
+-rw-r--r--	root/root	usr/share/dia/shapes/Lights/ERS.png
+-rw-r--r--	root/root	usr/share/dia/shapes/Lights/ERS.shape
+-rw-r--r--	root/root	usr/share/dia/shapes/Lights/Fresnel.png
+-rw-r--r--	root/root	usr/share/dia/shapes/Lights/Fresnel.shape
+-rw-r--r--	root/root	usr/share/dia/shapes/Lights/Moving_head.png
+-rw-r--r--	root/root	usr/share/dia/shapes/Lights/Moving_head.shape
+-rw-r--r--	root/root	usr/share/dia/shapes/Lights/PAR.png
+-rw-r--r--	root/root	usr/share/dia/shapes/Lights/PAR.shape
+-rw-r--r--	root/root	usr/share/dia/shapes/Lights/PAR_floor.png
+-rw-r--r--	root/root	usr/share/dia/shapes/Lights/PAR_floor.shape
+-rw-r--r--	root/root	usr/share/dia/shapes/Lights/PC.png
+-rw-r--r--	root/root	usr/share/dia/shapes/Lights/PC.shape
+-rw-r--r--	root/root	usr/share/dia/shapes/Lights/Scanner.png
+-rw-r--r--	root/root	usr/share/dia/shapes/Lights/Scanner.shape
+-rw-r--r--	root/root	usr/share/dia/shapes/Lights/Striplight.png
+-rw-r--r--	root/root	usr/share/dia/shapes/Lights/Striplight.shape
+-rw-r--r--	root/root	usr/share/dia/shapes/Lights/Stroboscope.png
+-rw-r--r--	root/root	usr/share/dia/shapes/Lights/Stroboscope.shape
+-rw-r--r--	root/root	usr/share/dia/shapes/Lights/Structure.png
+-rw-r--r--	root/root	usr/share/dia/shapes/Lights/Structure.shape
 drwxr-xr-x	root/root	usr/share/dia/shapes/Logic/
 -rw-r--r--	root/root	usr/share/dia/shapes/Logic/and.png
 -rw-r--r--	root/root	usr/share/dia/shapes/Logic/and.shape
@@ -1404,6 +1437,10 @@ drwxr-xr-x	root/root	usr/share/dia/shapes/Map/Isometric/
 -rw-r--r--	root/root	usr/share/dia/shapes/Map/Isometric/Tree1.png
 -rw-r--r--	root/root	usr/share/dia/shapes/Map/Isometric/Tree1.shape
 drwxr-xr-x	root/root	usr/share/dia/shapes/Misc/
+-rw-r--r--	root/root	usr/share/dia/shapes/Misc/expended-node.png
+-rw-r--r--	root/root	usr/share/dia/shapes/Misc/expended-node.shape
+-rw-r--r--	root/root	usr/share/dia/shapes/Misc/expensible-node.png
+-rw-r--r--	root/root	usr/share/dia/shapes/Misc/expensible-node.shape
 -rw-r--r--	root/root	usr/share/dia/shapes/Misc/file.png
 -rw-r--r--	root/root	usr/share/dia/shapes/Misc/file.shape
 -rw-r--r--	root/root	usr/share/dia/shapes/Misc/folder.png
@@ -1515,8 +1552,6 @@ drwxr-xr-x	root/root	usr/share/dia/shapes/Pneumatic/
 -rw-r--r--	root/root	usr/share/dia/shapes/Pneumatic/seojack.png
 -rw-r--r--	root/root	usr/share/dia/shapes/Pneumatic/seojack.shape
 drwxr-xr-x	root/root	usr/share/dia/shapes/RDP/
--rw-r--r--	root/root	usr/share/dia/shapes/RDP/arc.png
--rw-r--r--	root/root	usr/share/dia/shapes/RDP/arc_inhibiteur.png
 -rw-r--r--	root/root	usr/share/dia/shapes/RDP/place.png
 -rw-r--r--	root/root	usr/share/dia/shapes/RDP/place.shape
 -rw-r--r--	root/root	usr/share/dia/shapes/RDP/place_marquee.png
@@ -1614,6 +1649,7 @@ drwxr-xr-x	root/root	usr/share/dia/sheets/
 -rw-r--r--	root/root	usr/share/dia/sheets/Circuit.sheet
 -rw-r--r--	root/root	usr/share/dia/sheets/Contact.sheet
 -rw-r--r--	root/root	usr/share/dia/sheets/Cybernetics.sheet
+-rw-r--r--	root/root	usr/share/dia/sheets/Database.sheet
 -rw-r--r--	root/root	usr/share/dia/sheets/ER.sheet
 drwxr-xr-x	root/root	usr/share/dia/sheets/ER/
 -rw-r--r--	root/root	usr/share/dia/sheets/ER/weakentity.png
@@ -1667,12 +1703,14 @@ drwxr-xr-x	root/root	usr/share/dia/sheets/KAOS/
 -rw-r--r--	root/root	usr/share/dia/sheets/KAOS/requirement.png
 -rw-r--r--	root/root	usr/share/dia/sheets/KAOS/responsibility.png
 -rw-r--r--	root/root	usr/share/dia/sheets/KAOS/softgoal.png
+-rw-r--r--	root/root	usr/share/dia/sheets/Lights.sheet
 -rw-r--r--	root/root	usr/share/dia/sheets/Logic.sheet
 -rw-r--r--	root/root	usr/share/dia/sheets/MSE.sheet
 -rw-r--r--	root/root	usr/share/dia/sheets/Misc.sheet
 -rw-r--r--	root/root	usr/share/dia/sheets/Pneumatic.sheet
 -rw-r--r--	root/root	usr/share/dia/sheets/SADT.sheet
 -rw-r--r--	root/root	usr/share/dia/sheets/SDL.sheet
+drwxr-xr-x	root/root	usr/share/dia/sheets/SISSI/
 -rw-r--r--	root/root	usr/share/dia/sheets/UML.sheet
 drwxr-xr-x	root/root	usr/share/dia/sheets/UML/
 -rw-r--r--	root/root	usr/share/dia/sheets/UML/aggregation.png
@@ -1692,7 +1730,9 @@ drwxr-xr-x	root/root	usr/share/dia/sheets/UML/
 -rw-r--r--	root/root	usr/share/dia/sheets/sybase.sheet
 drwxr-xr-x	root/root	usr/share/dia/ui/
 -rw-r--r--	root/root	usr/share/dia/ui/display-ui.xml
+-rw-r--r--	root/root	usr/share/dia/ui/integrated-ui.xml
 -rw-r--r--	root/root	usr/share/dia/ui/popup-ui.xml
+-rw-r--r--	root/root	usr/share/dia/ui/toolbar-ui.xml
 -rw-r--r--	root/root	usr/share/dia/ui/toolbox-ui.xml
 drwxr-xr-x	root/root	usr/share/dia/xslt/
 -rw-r--r--	root/root	usr/share/dia/xslt/dia-uml.xsl
@@ -1703,46 +1743,26 @@ drwxr-xr-x	root/root	usr/share/dia/xslt/
 -rw-r--r--	root/root	usr/share/dia/xslt/dia-uml2owl.xsl
 -rw-r--r--	root/root	usr/share/dia/xslt/dia-uml2python.xsl
 -rw-r--r--	root/root	usr/share/dia/xslt/stylesheets.xml
-drwxr-xr-x	root/root	usr/share/help/
-drwxr-xr-x	root/root	usr/share/help/dia/
-drwxr-xr-x	root/root	usr/share/help/dia/en/
--rw-r--r--	root/root	usr/share/help/dia/en/authors.xml
--rw-r--r--	root/root	usr/share/help/dia/en/dia.xml
--rw-r--r--	root/root	usr/share/help/dia/en/entities.xml
-drwxr-xr-x	root/root	usr/share/help/dia/en/graphics/
--rw-r--r--	root/root	usr/share/help/dia/en/graphics/greendots.png
--rw-r--r--	root/root	usr/share/help/dia/en/graphics/home_network.png
--rw-r--r--	root/root	usr/share/help/dia/en/graphics/line_icon.png
--rw-r--r--	root/root	usr/share/help/dia/en/graphics/line_props.png
--rw-r--r--	root/root	usr/share/help/dia/en/intro.xml
--rw-r--r--	root/root	usr/share/help/dia/en/license.xml
--rw-r--r--	root/root	usr/share/help/dia/en/usage-canvas.xml
--rw-r--r--	root/root	usr/share/help/dia/en/usage-customization.xml
--rw-r--r--	root/root	usr/share/help/dia/en/usage-layers.xml
--rw-r--r--	root/root	usr/share/help/dia/en/usage-loadsave.xml
--rw-r--r--	root/root	usr/share/help/dia/en/usage-objects-basic.xml
--rw-r--r--	root/root	usr/share/help/dia/en/usage-objects-selecting.xml
--rw-r--r--	root/root	usr/share/help/dia/en/usage-objects-special.xml
--rw-r--r--	root/root	usr/share/help/dia/en/usage-objects.xml
--rw-r--r--	root/root	usr/share/help/dia/en/usage-quickstart.xml
-drwxr-xr-x	root/root	usr/share/help/dia/eu/
--rw-r--r--	root/root	usr/share/help/dia/eu/dia.xml
-drwxr-xr-x	root/root	usr/share/help/dia/eu/graphics/
--rw-r--r--	root/root	usr/share/help/dia/eu/graphics/greendots.png
--rw-r--r--	root/root	usr/share/help/dia/eu/graphics/home_network.png
--rw-r--r--	root/root	usr/share/help/dia/eu/graphics/line_icon.png
--rw-r--r--	root/root	usr/share/help/dia/eu/graphics/line_props.png
-drwxr-xr-x	root/root	usr/share/help/dia/pl/
--rw-r--r--	root/root	usr/share/help/dia/pl/dia.xml
-drwxr-xr-x	root/root	usr/share/help/dia/pl/graphics/
--rw-r--r--	root/root	usr/share/help/dia/pl/graphics/greendots.png
--rw-r--r--	root/root	usr/share/help/dia/pl/graphics/home_network.png
--rw-r--r--	root/root	usr/share/help/dia/pl/graphics/line_props.png
+drwxr-xr-x	root/root	usr/share/icons/
+drwxr-xr-x	root/root	usr/share/icons/hicolor/
+drwxr-xr-x	root/root	usr/share/icons/hicolor/16x16/
+drwxr-xr-x	root/root	usr/share/icons/hicolor/16x16/apps/
+-rw-r--r--	root/root	usr/share/icons/hicolor/16x16/apps/dia.png
+drwxr-xr-x	root/root	usr/share/icons/hicolor/22x22/
+drwxr-xr-x	root/root	usr/share/icons/hicolor/22x22/apps/
+-rw-r--r--	root/root	usr/share/icons/hicolor/22x22/apps/dia.png
+drwxr-xr-x	root/root	usr/share/icons/hicolor/24x24/
+drwxr-xr-x	root/root	usr/share/icons/hicolor/24x24/apps/
+-rw-r--r--	root/root	usr/share/icons/hicolor/24x24/apps/dia.png
+drwxr-xr-x	root/root	usr/share/icons/hicolor/32x32/
+drwxr-xr-x	root/root	usr/share/icons/hicolor/32x32/apps/
+-rw-r--r--	root/root	usr/share/icons/hicolor/32x32/apps/dia.png
+drwxr-xr-x	root/root	usr/share/icons/hicolor/48x48/
+drwxr-xr-x	root/root	usr/share/icons/hicolor/48x48/apps/
+-rw-r--r--	root/root	usr/share/icons/hicolor/48x48/apps/dia.png
+drwxr-xr-x	root/root	usr/share/icons/hicolor/scalable/
+drwxr-xr-x	root/root	usr/share/icons/hicolor/scalable/apps/
+-rw-r--r--	root/root	usr/share/icons/hicolor/scalable/apps/dia.svg
 drwxr-xr-x	root/root	usr/share/mime-info/
 -rw-r--r--	root/root	usr/share/mime-info/dia.keys
 -rw-r--r--	root/root	usr/share/mime-info/dia.mime
-drwxr-xr-x	root/root	usr/share/omf/
-drwxr-xr-x	root/root	usr/share/omf/dia/
-drwxr-xr-x	root/root	usr/share/pixmaps/
--rw-r--r--	root/root	usr/share/pixmaps/dia-diagram.png
--rw-r--r--	root/root	usr/share/pixmaps/dia_gnome_icon.png
diff --git a/dia/.md5sum b/dia/.md5sum
index 4c9760d12..f65ad65fa 100644
--- a/dia/.md5sum
+++ b/dia/.md5sum
@@ -1 +1 @@
-7b81b22baa2df55efe4845865dddc7b6  dia-0.96.1.tar.bz2
+1e1180a513fb567709b09bc19f12105e  dia-0.97.2.tar.xz
diff --git a/dia/Pkgfile b/dia/Pkgfile
index f1eed7703..0bd94fb69 100644
--- a/dia/Pkgfile
+++ b/dia/Pkgfile
@@ -2,24 +2,29 @@
 # URL: http://live.gnome.org/Dia/
 # Maintainer: Danny Rawlins, monster dot romster at gmail dot com
 # Packager: Younes Hafri, ycrux at club dash internet dot fr
-# Depends on: libart_lgpl libgcrypt popt gtk p5-xml-parser
+# Depends on: docbook-xsl gtk intltool libart_lgpl libgcrypt popt xorg-libxdamage
 
 name=dia
-version=0.96.1
+version=0.97.2
 release=1
-source=(ftp://ftp.gnome.org/pub/gnome/sources/dia/${version%.*}/dia-$version.tar.bz2)
+source=(ftp://ftp.gnome.org/pub/gnome/sources/$name/${version%.*}/$name-$version.tar.xz)
 
 build() {
-	cd dia-$version
+	cd $name-$version
 
 	./configure \
 		--prefix=/usr \
+		--mandir=/usr/man \
 		--disable-nls \
 		--disable-db2html
 
 	make
 	make DESTDIR=$PKG install
-	rm -r $PKG/usr/share/locale
+
+	rm -r \
+		$PKG/usr/share/locale \
+		$PKG/usr/share/doc \
+		$PKG/usr/share/man
+
 	rmdir $PKG/usr/share/oaf
 }
-