dia r3898 - in trunk: . objects objects/EML po sheets

[hans svn gnome org]

Author: hans
Date: Tue Mar  4 20:49:06 2008
New Revision: 3898
URL: http://svn.gnome.org/viewvc/dia?rev=3898&view=rev

Log:
2008-03-04  Hans Breuer  <hans breuer org>

	* objects/EML/* sheets/EML.sheet.in : removed
	* objects/Makefile.am : almost 7 years being disabled is enough
	* po/POTFILES.in sheets/Makefile.am : adapted


Removed:
   trunk/objects/EML/
Modified:
   trunk/ChangeLog
   trunk/objects/Makefile.am
   trunk/po/POTFILES.skip
   trunk/sheets/Makefile.am

Modified: trunk/objects/Makefile.am
==============================================================================
--- trunk/objects/Makefile.am	(original)
+++ trunk/objects/Makefile.am	Tue Mar  4 20:49:06 2008
@@ -3,8 +3,5 @@
 SUBDIRS = standard network UML ER FS flowchart custom custom_lines GRAFCET \
 	chronogram SADT Misc bondgraph Istar Jackson KAOS AADL SISSI Database #EML
 
-## I have disabled building the EML files, for GPL compliance reasons. Ask me
-## why in private, if you care. -- CC.
-
 EXTRA_DIST = \
 	makefile.msc objects.def

Modified: trunk/po/POTFILES.skip
==============================================================================
--- trunk/po/POTFILES.skip	(original)
+++ trunk/po/POTFILES.skip	Tue Mar  4 20:49:06 2008
@@ -1,12 +1,5 @@
 dia.desktop.in
-objects/EML/eml.c
-objects/EML/instantiation.c
-objects/EML/interaction-ortho.c
-objects/EML/interaction.c
-objects/EML/nlist.c
-objects/EML/process.c
-objects/EML/process_dialog.c
 objects/FS/flow-poly.c
 objects/sybase/sybase.c
-sheets/EML.sheet.in
+
 

Modified: trunk/sheets/Makefile.am
==============================================================================
--- trunk/sheets/Makefile.am	(original)
+++ trunk/sheets/Makefile.am	Tue Mar  4 20:49:06 2008
@@ -15,8 +15,6 @@
   AADL.sheet.in Gane_and_Sarson.sheet.in BPMN.sheet.in SISSI.sheet.in \
   Lights.sheet.in Database.sheet.in
 
-# EML.sheet.in disabled as the objects have GPL issues, see objects/Makefile.am
-
 SHEETS = $(sheet_in_files:.sheet.in=.sheet)
 
 sheetdir = $(pkgdatadir)/sheets