[dia] My last attempt to fix SISSI resulting in removal from installation



commit c3440a7f99f17f7c529bd8ede3b81700c47fb18a
Author: Hans Breuer <hans breuer org>
Date:   Sun May 3 16:05:50 2009 +0200

    My last attempt to fix SISSI resulting in removal from installation
    
    The SISSI objects are considered alpha due to various issues:
     - they use a non-common way of shape definition
     - they do not properly implement the std-props API
     - they us bitmap icons to draw and some of these are not found
     - fixing fialures in 'shape files' does not fix already created
       diagrams (maybe the icon is stored in the diagram?)
     - drawing icons looks like using uninitialized colors
     - the SISSI object configuration dialog has issues
     - some of these issue were already raised in the original
       bug report bgo#355995.  After that was closed the SISSI
       objects were basically unmaintained from the original
       contributor
---
 lib/plug-ins.h            |    2 +-
 objects/SISSI/Makefile.am |    5 +++++
 sheets/Makefile.am        |    5 +++--
 sheets/SISSI/16.xml       |    2 +-
 sheets/SISSI/17.xml       |    2 +-
 sheets/SISSI/19.xml       |    2 +-
 sheets/SISSI/20.xml       |    2 +-
 sheets/SISSI/21.xml       |    2 +-
 sheets/SISSI/22.xml       |    2 +-
 sheets/SISSI/23.xml       |    2 +-
 sheets/SISSI/Makefile.am  |    7 +++++--
 11 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/lib/plug-ins.h b/lib/plug-ins.h
index 9da4af1..a2ec0ce 100644
--- a/lib/plug-ins.h
+++ b/lib/plug-ins.h
@@ -48,7 +48,7 @@ G_BEGIN_DECLS
  * The list is by no means complete. If in doubt about your change
  * please ask on dia-list or alternative increment ;-)      --hb
  */
-#define DIA_PLUGIN_API_VERSION 12
+#define DIA_PLUGIN_API_VERSION 13
 
 typedef enum {
   DIA_PLUGIN_INIT_OK,
diff --git a/objects/SISSI/Makefile.am b/objects/SISSI/Makefile.am
index df5bee3..f6c9d19 100644
--- a/objects/SISSI/Makefile.am
+++ b/objects/SISSI/Makefile.am
@@ -30,3 +30,8 @@ EXTRA_DIST = \
 	pixmaps/broken.xpm \
 	methode_attack.h \
 	classification.h
+
+# Prevent installation - considered too alpha
+install-pkglibLTLIBRARIES:
+	:
+
diff --git a/sheets/Makefile.am b/sheets/Makefile.am
index 0ad6709..69bc4c4 100644
--- a/sheets/Makefile.am
+++ b/sheets/Makefile.am
@@ -12,7 +12,7 @@ sheet_in_files = \
   ciscohub.sheet.in ciscomisc.sheet.in cisconetwork.sheet.in \
   ciscotelephony.sheet.in Cybernetics.sheet.in IsometricMap.sheet.in \
   Istar.sheet.in Jackson.sheet.in KAOS.sheet.in ChemEng.sheet.in \
-  AADL.sheet.in Gane_and_Sarson.sheet.in BPMN.sheet.in SISSI.sheet.in \
+  AADL.sheet.in Gane_and_Sarson.sheet.in BPMN.sheet.in \
   Lights.sheet.in Database.sheet.in
 
 SHEETS = $(sheet_in_files:.sheet.in=.sheet)
@@ -25,7 +25,8 @@ sheet_DATA = $(SHEETS)
 	 	-c $(top_srcdir)/po/.intltool-merge-cache
 
 EXTRA_DIST = $(sheet_in_files) \
-	checktrans checktrans.py
+	checktrans checktrans.py \
+	SISSI.sheet.in 
 
 CLEANFILES = sheet-translation-report $(SHEETS) 
 
diff --git a/sheets/SISSI/16.xml b/sheets/SISSI/16.xml
index 743530c..b9f4b85 100644
--- a/sheets/SISSI/16.xml
+++ b/sheets/SISSI/16.xml
@@ -53,7 +53,7 @@
         <sissi:real val="0"/>
       </sissi:attribute>
       <sissi:attribute name="file_image">
-	<sissi:string>#personne.xpm#</sissi:string>
+	<sissi:string>#personne.png#</sissi:string>
       </sissi:attribute>
       <sissi:attribute name="confidentiality">
         <sissi:string>##</sissi:string>
diff --git a/sheets/SISSI/17.xml b/sheets/SISSI/17.xml
index 92f3e4f..11d4fbc 100644
--- a/sheets/SISSI/17.xml
+++ b/sheets/SISSI/17.xml
@@ -53,7 +53,7 @@
         <sissi:real val="0"/>
       </sissi:attribute>
       <sissi:attribute name="file_image">
-	<sissi:string>#meuble.xpm#</sissi:string>
+	<sissi:string>#meuble.png#</sissi:string>
       </sissi:attribute>
       <sissi:attribute name="confidentiality">
         <sissi:string>##</sissi:string>
diff --git a/sheets/SISSI/19.xml b/sheets/SISSI/19.xml
index 1862737..321d710 100644
--- a/sheets/SISSI/19.xml
+++ b/sheets/SISSI/19.xml
@@ -53,7 +53,7 @@
         <sissi:real val="0"/>
       </sissi:attribute>
       <sissi:attribute name="file_image">
-	<sissi:string>#sauvegarde.xpm#</sissi:string>
+	<sissi:string>#sauvegarde.png#</sissi:string>
       </sissi:attribute>
       <sissi:attribute name="confidentiality">
         <sissi:string>##</sissi:string>
diff --git a/sheets/SISSI/20.xml b/sheets/SISSI/20.xml
index e5c1bd7..66728cd 100644
--- a/sheets/SISSI/20.xml
+++ b/sheets/SISSI/20.xml
@@ -53,7 +53,7 @@
         <sissi:real val="0"/>
       </sissi:attribute>
       <sissi:attribute name="file_image">
-	<sissi:string>#logiciel.xpm#</sissi:string>
+	<sissi:string>#logiciel.png#</sissi:string>
       </sissi:attribute>
       <sissi:attribute name="confidentiality">
         <sissi:string>##</sissi:string>
diff --git a/sheets/SISSI/21.xml b/sheets/SISSI/21.xml
index 39adfff..60a8eb5 100644
--- a/sheets/SISSI/21.xml
+++ b/sheets/SISSI/21.xml
@@ -53,7 +53,7 @@
         <sissi:real val="0"/>
       </sissi:attribute>
       <sissi:attribute name="file_image">
-	<sissi:string>#analyse.xpm#</sissi:string>
+	<sissi:string>#analyse.png#</sissi:string>
       </sissi:attribute>
       <sissi:attribute name="confidentiality">
         <sissi:string>##</sissi:string>
diff --git a/sheets/SISSI/22.xml b/sheets/SISSI/22.xml
index 26dbd13..8e9d98c 100644
--- a/sheets/SISSI/22.xml
+++ b/sheets/SISSI/22.xml
@@ -53,7 +53,7 @@
         <sissi:real val="0"/>
       </sissi:attribute>
       <sissi:attribute name="file_image">
-	<sissi:string>#si.xpm#</sissi:string>
+	<sissi:string>#si.png#</sissi:string>
       </sissi:attribute>
       <sissi:attribute name="confidentiality">
         <sissi:string>##</sissi:string>
diff --git a/sheets/SISSI/23.xml b/sheets/SISSI/23.xml
index 7d8cb6c..25f03a1 100644
--- a/sheets/SISSI/23.xml
+++ b/sheets/SISSI/23.xml
@@ -53,7 +53,7 @@
         <sissi:real val="0"/>
       </sissi:attribute>
       <sissi:attribute name="file_image">
-	<sissi:string>#info.xpm#</sissi:string>
+	<sissi:string>#info.png#</sissi:string>
       </sissi:attribute>
       <sissi:attribute name="confidentiality">
         <sissi:string>##</sissi:string>
diff --git a/sheets/SISSI/Makefile.am b/sheets/SISSI/Makefile.am
index 15db685..e354fe7 100644
--- a/sheets/SISSI/Makefile.am
+++ b/sheets/SISSI/Makefile.am
@@ -126,6 +126,9 @@ PIX = \
 	75.xml \
 	76.xml
 
-	
-SISSIsheet_DATA = $(PIX)
+
+# disabled installation - considered too alpha to support
+#SISSIsheet_DATA = $(PIX)
+SISSIsheet_DATA =
 EXTRA_DIST = $(PIX)
+



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]