libgnomedb r1730 - in trunk: . WixInstaller libgnomedb/data-entries

From: vivien svn gnome org
To: svn-commits-list gnome org
Subject: libgnomedb r1730 - in trunk: . WixInstaller libgnomedb/data-entries
Date: Thu, 19 Jun 2008 21:11:36 +0000 (UTC)
Author: vivien
Date: Thu Jun 19 21:11:35 2008
New Revision: 1730
URL: http://svn.gnome.org/viewvc/libgnomedb?rev=1730&view=rev

Log:
2008-06-19  Vivien Malerba <malerba gnome-db org>

	* configure.in:
	* libgnomedb/data-entries/Makefile.am: fixed XML translation issue
	* WixInstaller: configuration files to use with the Wix Windows
        installer to produce .msm and .msi files


Added:
   trunk/WixInstaller/
   trunk/WixInstaller/Make.bat
   trunk/WixInstaller/README
   trunk/WixInstaller/build.bat
   trunk/WixInstaller/clean.bat
   trunk/WixInstaller/gnomedb-module.wxs
   trunk/WixInstaller/gnomedb-properties.wxs
   trunk/WixInstaller/gnomedb-share.wxs
   trunk/WixInstaller/gpl.rtf
   trunk/WixInstaller/gtk-fragment.wxs
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/libgnomedb/data-entries/Makefile.am

Added: trunk/WixInstaller/Make.bat
==============================================================================
--- (empty file)
+++ trunk/WixInstaller/Make.bat	Thu Jun 19 21:11:35 2008
@@ -0,0 +1,47 @@
+ echo off
+
+REM Values to change include VERSION and INSTALLDIR, both below.
+
+REM The subdirectory to install into
+SET INSTALLDIR="GnomeDb-4.0"
+
+if NOT "%1"=="" SET VERSION="%1"
+if NOT "%1"=="" GOTO GOT_VERSION
+
+REM The full version number of the build in XXXX.XX.XX format
+SET VERSION="3.99.3"
+
+echo.
+echo Version not specified - defaulting to %VERSION%
+echo.
+
+:GOT_VERSION
+
+echo.
+echo Compiling individual .wxs files
+
+for %%f in (*.wxs) do (
+candle -nologo -dVERSION=%VERSION% -dINSTALLDIR=%INSTALLDIR% "%%f"
+IF ERRORLEVEL 1 GOTO ERR_HANDLER
+)
+
+echo.
+echo Creating GnomeDb module...
+light -nologo -out gnomedb-module-%VERSION%.msm gnomedb-module.wixobj gtk-fragment.wixobj gnomedb-share.wixobj
+IF ERRORLEVEL 1 GOTO ERR_HANDLER
+
+echo.
+echo Creating GnomeDbProperties installer
+light -nologo -out gnome-db-properties-%VERSION%.msi -dVERSION=%VERSION% -dINSTALLDIR=%INSTALLDIR% -ext WixUIExtension -cultures:en-us gnomedb-properties.wixobj
+IF ERRORLEVEL 1 GOTO ERR_HANDLER
+
+echo.
+echo Done!
+GOTO EXIT
+
+:ERR_HANDLER
+echo.
+echo Aborting build!
+GOTO EXIT
+
+:EXIT

Added: trunk/WixInstaller/README
==============================================================================
--- (empty file)
+++ trunk/WixInstaller/README	Thu Jun 19 21:11:35 2008
@@ -0,0 +1,28 @@
+Instructions on how to use Wix to build MSI files
+-------------------------------------------------
+Wix is available at http://wix.sourceforge/net under the "Common Public License".
+
+Before using Wix, make sure you have the following directory layout:
+.
+|-- bin
+|   |-- ...
+|   `-- ...
+|-- depend
+|   `-- gtk
+|-- gdawix                  <-- current directory
+|   |-- README              <-- this file
+|   |-- gnomedb-module.wxs
+|   |-- build.bat           <-- execute this to build
+|   |-- clean.bat
+|   |-- gnomedb-properties.wxs
+|   |-- gnomedb-share.wxs
+|   |-- gtk-fragment.wxs
+|   `-- gpl.rtf
+|-- include
+|   `-- ...
+|-- lib
+|   |-- ...
+|   `-- ...
+`-- share
+    |-- ...
+    `-- ...

Added: trunk/WixInstaller/build.bat
==============================================================================
--- (empty file)
+++ trunk/WixInstaller/build.bat	Thu Jun 19 21:11:35 2008
@@ -0,0 +1,11 @@
+ echo off
+del *~
+del *.wixobj
+REM compute all the .wxs to .wixobj
+for %%f in (*.wxs) do candle.exe "%%f"
+
+REM Create gda-module.msm
+light.exe -out gda-module.msm gda-module.wixobj glib-fragment.wixobj gda-share.wixobj bdb.wixobj mdb.wixobj mysql.wixobj postgres.wixobj
+
+REM Create gda-sql.msi
+light.exe gda-sql.wixobj

Added: trunk/WixInstaller/clean.bat
==============================================================================
--- (empty file)
+++ trunk/WixInstaller/clean.bat	Thu Jun 19 21:11:35 2008
@@ -0,0 +1,7 @@
+ echo off
+echo Cleaning all computed files
+del *.wixobj
+del *~
+rem del *.msm
+del *.msi
+

Added: trunk/WixInstaller/gnomedb-module.wxs
==============================================================================
--- (empty file)
+++ trunk/WixInstaller/gnomedb-module.wxs	Thu Jun 19 21:11:35 2008
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>
+  <Module Id="gnomedb" Language="0" Version="$(var.VERSION)">
+
+    <Package Id="12daa4a1-f902-45af-b39c-5606657e9dcb" InstallerVersion="200"
+      Languages="1033" Manufacturer="GnomeDb" SummaryCodepage="1252" AdminImage="no" ShortNames="no" />
+
+      <Directory Id="TARGETDIR" Name="SourceDir">
+        <Directory Id="ProgramFilesFolder" Name="PFiles">
+          <Directory Id="GnomeDb" Name="GnomeDb">
+            <Directory Id="INSTALLDIR" Name="$(var.INSTALLDIR)">
+
+	      <!-- bin -->
+              <Directory Id="BINDIR" Name="bin">
+		<Component Id="execs" Guid="8353fe59-f653-48da-9282-0bc5440d053d">
+		  <File Id="gnomedb_properties.exe" Name="gnome-database-properties-4.0.exe" Source="../bin/gnome-database-properties-4.0.exe" Vital="yes">
+		    <Shortcut Id="gnomedb_properties.exe.short" Directory="ProgramMenuDir" Name="GnomeDb data sources" WorkingDirectory="BINDIR"/>
+		  </File>
+		  <File Id="gnome_db_browser.exe" Name="gnome-db-browser.exe" Source="../bin/gnome-db-browser.exe"/>
+		</Component>
+		
+		<Component Id="dlls" Guid="6b161f21-31bf-4b43-becf-2df42eb9ad83">
+		  <File Id="libgnomedb_.dll" Name="libgnomedb-4.0-4.dll" Source="../bin/libgnomedb-4.0-4.dll" Vital="yes"/>
+		  <File Id="libgnomedb_e.dll" Name="libgnomedb_extra-4.0-4.dll" Source="../bin/libgnomedb_extra-4.0-4.dll" Vital="yes"/>
+		</Component>
+		
+              </Directory>
+
+	      <!-- lib -->
+	      <Directory Id="lib" Name="lib">
+		<Directory Id="lib_gnomedb_4.0" Name="gnome-db-4.0">
+		  <Directory Id="PLUGINSDIR" Name="plugins">
+		    <Component Id="plugins" Guid="5106834d-1e47-42fa-9142-57c36aec7bd9">
+		      <File Id="gnome_db_plugins1" Name="libgnomedb_entry_builtin_plugins.dll" Source="../lib/gnome-db-4.0/plugins/libgnomedb_entry_builtin_plugins.dll"/>
+		    </Component>
+		  </Directory>
+		</Directory>
+              </Directory>
+
+            </Directory>
+          </Directory>
+        </Directory>
+
+	<Directory Id="ProgramMenuFolder" Name="Programs">
+	  <Directory Id="ProgramMenuDir" Name="GnomeDb"/>
+	</Directory>
+      </Directory>
+
+      <!-- Gtk -->
+      <ComponentRef Id="GTK_DLL"/> 
+      <ComponentRef Id="GTK_ETC_GTK"/>
+      <ComponentRef Id="GTK_ETC_PANGO"/>
+      <ComponentRef Id="GTK_LIB_GTK_ENGINES"/>
+      <ComponentRef Id="GTK_LIB_GTK_IMMODULES"/>
+      <ComponentRef Id="GNOMEDB_SHARE"/>
+      <ComponentRef Id="GNOMEDB_PIXMAPS_EXTRA"/>
+      <ComponentRef Id="GNOMEDB_PIXMAPS"/>
+  </Module>
+</Wix>

Added: trunk/WixInstaller/gnomedb-properties.wxs
==============================================================================
--- (empty file)
+++ trunk/WixInstaller/gnomedb-properties.wxs	Thu Jun 19 21:11:35 2008
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>
+
+  <Product Id="ac6291df-ca0b-4cfb-a7f1-bc007e589a45" Name="GnomeDb data sources" UpgradeCode="a9670e92-3b27-430c-a973-94095db062a9" Language="1033" Version="$(var.VERSION)" Manufacturer="GnomeDb">
+
+    <Package Manufacturer="GnomeDb" InstallerVersion="200" Compressed="yes" />
+
+    <Media Id="1" Cabinet="Sample.cab" EmbedCab="yes" DiskPrompt="CD-ROM #1" />
+    <Property Id="DiskPrompt" Value="GnomeDb install [1]" />
+
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="ProgramFilesFolder" Name="PFiles">
+        <Directory Id="GnomeDb" Name="GnomeDb">
+          <Directory Id="INSTALLDIR" Name="$(var.INSTALLDIR)">
+
+            <Merge Id="libgda.29ccc1c7-fd88-4da1-a5c8-d3203738cdeb" Language="1033" SourceFile="gda-module-$(var.VERSION).msm" DiskId="1" />
+            <Merge Id="gnomedb.12daa4a1-f902-45af-b39c-5606657e9dcb" Language="1033" SourceFile="gnomedb-module-$(var.VERSION).msm" DiskId="1" />
+
+          </Directory>
+        </Directory>
+      </Directory>
+    </Directory>
+
+    <Feature Id="GnomeDbModule" Display="hidden" Title="Core" Level="1">
+      <MergeRef Id="libgda.29ccc1c7-fd88-4da1-a5c8-d3203738cdeb" />
+      <MergeRef Id="gnomedb.12daa4a1-f902-45af-b39c-5606657e9dcb" />
+    </Feature>
+
+     <UIRef Id="WixUI_Minimal" />
+     <WixVariable Id="WixUILicenseRtf" Value="gpl.rtf" />
+
+  </Product>
+</Wix>

Added: trunk/WixInstaller/gnomedb-share.wxs
==============================================================================
--- (empty file)
+++ trunk/WixInstaller/gnomedb-share.wxs	Thu Jun 19 21:11:35 2008
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>
+  <Fragment>
+    <DirectoryRef Id="INSTALLDIR">
+      <Directory Id="directory0" Name="share">
+        <Directory Id="directory4" Name="gnome-db-4.0">
+          <Component Id="GNOMEDB_SHARE" DiskId="1" Guid="25fa7cee-44d6-4003-a708-7d3e71381c31">
+            <File Id="gnomedb_share1" Name="gnome-db-entry-filesel-spec.xml" Source="../share/gnome-db-4.0/gnome-db-entry-filesel-spec.xml" />
+            <File Id="gnomedb_share2" Name="gnome-db-entry-password.xml" Source="../share/gnome-db-4.0/gnome-db-entry-password.xml" />
+            <File Id="gnomedb_share3" Name="gnome-db-entry-pict-spec.xml" Source="../share/gnome-db-4.0/gnome-db-entry-pict-spec.xml" />
+            <File Id="gnomedb_share4" Name="gnome-db-entry-pict-spec_string.xml" Source="../share/gnome-db-4.0/gnome-db-entry-pict-spec_string.xml" />
+            <File Id="gnomedb_share5" Name="gnome-db-entry-string-number.xml" Source="../share/gnome-db-4.0/gnome-db-entry-string-number.xml" />
+            <File Id="gnomedb_share6" Name="gnome-db-entry-string-string.xml" Source="../share/gnome-db-4.0/gnome-db-entry-string-string.xml" />
+            <File Id="gnomedb_share7" Name="import_encodings.xml" Source="../share/gnome-db-4.0/import_encodings.xml" />
+            <File Id="gnomedb_share8" Name="server_operation.glade" Source="../share/gnome-db-4.0/server_operation.glade" />
+          </Component>
+        </Directory>
+
+
+        <Directory Id="pixmaps" Name="pixmaps">
+          <Directory Id="directory5" Name="gnome-db-4.0">
+            <Directory Id="extra" Name="extra">
+              <Component Id="GNOMEDB_PIXMAPS_EXTRA" DiskId="1" Guid="1c9e83a9-9985-4fc0-ab93-039628f67f07">
+		<File Id="gnomedb_pixmap1" Name="Aggregate.png" Source="../share/pixmaps/gnome-db-4.0/extra/Aggregate.png" />
+		<File Id="gnomedb_pixmap2" Name="Aggregates.png" Source="../share/pixmaps/gnome-db-4.0/extra/Aggregates.png" />
+		<File Id="gnomedb_pixmap3" Name="CheckConstraint.png" Source="../share/pixmaps/gnome-db-4.0/extra/CheckConstraint.png" />
+		<File Id="gnomedb_pixmap4" Name="Column.png" Source="../share/pixmaps/gnome-db-4.0/extra/Column.png" />
+		<File Id="gnomedb_pixmap5" Name="Columns.png" Source="../share/pixmaps/gnome-db-4.0/extra/Columns.png" />
+		<File Id="gnomedb_pixmap6" Name="Constraints.png" Source="../share/pixmaps/gnome-db-4.0/extra/Constraints.png" />
+		<File Id="gnomedb_pixmap7" Name="Databases.png" Source="../share/pixmaps/gnome-db-4.0/extra/Databases.png" />
+		<File Id="gnomedb_pixmap8" Name="Domain.png" Source="../share/pixmaps/gnome-db-4.0/extra/Domain.png" />
+		<File Id="gnomedb_pixmap9" Name="Domains.png" Source="../share/pixmaps/gnome-db-4.0/extra/Domains.png" />
+		<File Id="gnomedb_pixmap10" Name="ForeignKey.png" Source="../share/pixmaps/gnome-db-4.0/extra/ForeignKey.png" />
+		<File Id="gnomedb_pixmap11" Name="Function.png" Source="../share/pixmaps/gnome-db-4.0/extra/Function.png" />
+		<File Id="gnomedb_pixmap12" Name="Functions.png" Source="../share/pixmaps/gnome-db-4.0/extra/Functions.png" />
+		<File Id="gnomedb_pixmap13" Name="Index.png" Source="../share/pixmaps/gnome-db-4.0/extra/Index.png" />
+		<File Id="gnomedb_pixmap14" Name="Indexes.png" Source="../share/pixmaps/gnome-db-4.0/extra/Indexes.png" />
+		<File Id="gnomedb_pixmap15" Name="PrimaryKey.png" Source="../share/pixmaps/gnome-db-4.0/extra/PrimaryKey.png" />
+		<File Id="gnomedb_pixmap16" Name="Schema.png" Source="../share/pixmaps/gnome-db-4.0/extra/Schema.png" />
+		<File Id="gnomedb_pixmap17" Name="Schemas.png" Source="../share/pixmaps/gnome-db-4.0/extra/Schemas.png" />
+		<File Id="gnomedb_pixmap18" Name="Sequence.png" Source="../share/pixmaps/gnome-db-4.0/extra/Sequence.png" />
+		<File Id="gnomedb_pixmap19" Name="Sequences.png" Source="../share/pixmaps/gnome-db-4.0/extra/Sequences.png" />
+		<File Id="gnomedb_pixmap20" Name="Table.png" Source="../share/pixmaps/gnome-db-4.0/extra/Table.png" />
+		<File Id="gnomedb_pixmap21" Name="Tables.png" Source="../share/pixmaps/gnome-db-4.0/extra/Tables.png" />
+		<File Id="gnomedb_pixmap22" Name="Trigger.png" Source="../share/pixmaps/gnome-db-4.0/extra/Trigger.png" />
+		<File Id="gnomedb_pixmap23" Name="Triggers.png" Source="../share/pixmaps/gnome-db-4.0/extra/Triggers.png" />
+		<File Id="gnomedb_pixmap24" Name="Type.png" Source="../share/pixmaps/gnome-db-4.0/extra/Type.png" />
+		<File Id="gnomedb_pixmap25" Name="Types.png" Source="../share/pixmaps/gnome-db-4.0/extra/Types.png" />
+		<File Id="gnomedb_pixmap26" Name="UniqueConstraint.png" Source="../share/pixmaps/gnome-db-4.0/extra/UniqueConstraint.png" />
+		<File Id="gnomedb_pixmap27" Name="View.png" Source="../share/pixmaps/gnome-db-4.0/extra/View.png" />
+		<File Id="gnomedb_pixmap28" Name="Views.png" Source="../share/pixmaps/gnome-db-4.0/extra/Views.png" />
+              </Component>
+            </Directory>
+
+	    <Component Id="GNOMEDB_PIXMAPS" DiskId="1" Guid="7ca813cc-7b52-46d3-a2a5-89f1afad38f8">
+	      <File Id="gnomedb_pixmap100" Name="gnome-db-aggregates_16x16.png" Source="../share/pixmaps/gnome-db-4.0/gnome-db-aggregates_16x16.png" />
+	      <File Id="gnomedb_pixmap101" Name="gnome-db-aggregates_24x24.png" Source="../share/pixmaps/gnome-db-4.0/gnome-db-aggregates_24x24.png" />
+	      <File Id="gnomedb_pixmap102" Name="gnome-db-commit_24x24.png" Source="../share/pixmaps/gnome-db-4.0/gnome-db-commit_24x24.png" />
+	      <File Id="gnomedb_pixmap103" Name="gnome-db-connect_24x24.png" Source="../share/pixmaps/gnome-db-4.0/gnome-db-connect_24x24.png" />
+	      <File Id="gnomedb_pixmap104" Name="gnome-db-console_24x24.png" Source="../share/pixmaps/gnome-db-4.0/gnome-db-console_24x24.png" />
+	      <File Id="gnomedb_pixmap105" Name="gnome-db-console_48x48.png" Source="../share/pixmaps/gnome-db-4.0/gnome-db-console_48x48.png" />
+	      <File Id="gnomedb_pixmap106" Name="gnome-db-database_16x16.png" Source="../share/pixmaps/gnome-db-4.0/gnome-db-database_16x16.png" />
+	      <File Id="gnomedb_pixmap107" Name="gnome-db-database_24x24.png" Source="../share/pixmaps/gnome-db-4.0/gnome-db-database_24x24.png" />
+	      <File Id="gnomedb_pixmap108" Name="gnome-db-database_48x48.png" Source="../share/pixmaps/gnome-db-4.0/gnome-db-database_48x48.png" />
+	      <File Id="gnomedb_pixmap109" Name="gnome-db-designer_24x24.png" Source="../share/pixmaps/gnome-db-4.0/gnome-db-designer_24x24.png" />
+	      <File Id="gnomedb_pixmap110" Name="gnome-db-disconnect_24x24.png" Source="../share/pixmaps/gnome-db-4.0/gnome-db-disconnect_24x24.png" />
+	      <File Id="gnomedb_pixmap111" Name="gnome-db-field_16x16.png" Source="../share/pixmaps/gnome-db-4.0/gnome-db-field_16x16.png" />
+	      <File Id="gnomedb_pixmap112" Name="gnome-db-indexes_16x16.png" Source="../share/pixmaps/gnome-db-4.0/gnome-db-indexes_16x16.png" />
+	      <File Id="gnomedb_pixmap113" Name="gnome-db-no-transaction_24x24.png" Source="../share/pixmaps/gnome-db-4.0/gnome-db-no-transaction_24x24.png" />
+	      <File Id="gnomedb_pixmap114" Name="gnome-db-procedures_16x16.png" Source="../share/pixmaps/gnome-db-4.0/gnome-db-procedures_16x16.png" />
+	      <File Id="gnomedb_pixmap115" Name="gnome-db-procedures_24x24.png" Source="../share/pixmaps/gnome-db-4.0/gnome-db-procedures_24x24.png" />
+	      <File Id="gnomedb_pixmap116" Name="gnome-db-query_16x16.png" Source="../share/pixmaps/gnome-db-4.0/gnome-db-query_16x16.png" />
+	      <File Id="gnomedb_pixmap117" Name="gnome-db-query_24x24.png" Source="../share/pixmaps/gnome-db-4.0/gnome-db-query_24x24.png" />
+	      <File Id="gnomedb_pixmap118" Name="gnome-db-relations_16x16.png" Source="../share/pixmaps/gnome-db-4.0/gnome-db-relations_16x16.png" />
+	      <File Id="gnomedb_pixmap119" Name="gnome-db-relations_24x24.png" Source="../share/pixmaps/gnome-db-4.0/gnome-db-relations_24x24.png" />
+	      <File Id="gnomedb_pixmap120" Name="gnome-db-rollback_24x24.png" Source="../share/pixmaps/gnome-db-4.0/gnome-db-rollback_24x24.png" />
+	      <File Id="gnomedb_pixmap121" Name="gnome-db-sequences_16x16.png" Source="../share/pixmaps/gnome-db-4.0/gnome-db-sequences_16x16.png" />
+	      <File Id="gnomedb_pixmap122" Name="gnome-db-sequences_24x24.png" Source="../share/pixmaps/gnome-db-4.0/gnome-db-sequences_24x24.png" />
+	      <File Id="gnomedb_pixmap123" Name="gnome-db-sql_16x16.png" Source="../share/pixmaps/gnome-db-4.0/gnome-db-sql_16x16.png" />
+	      <File Id="gnomedb_pixmap124" Name="gnome-db-sql_24x24.png" Source="../share/pixmaps/gnome-db-4.0/gnome-db-sql_24x24.png" />
+	      <File Id="gnomedb_pixmap125" Name="gnome-db-table_16x16.png" Source="../share/pixmaps/gnome-db-4.0/gnome-db-table_16x16.png" />
+	      <File Id="gnomedb_pixmap126" Name="gnome-db-tables_16x16.png" Source="../share/pixmaps/gnome-db-4.0/gnome-db-tables_16x16.png" />
+	      <File Id="gnomedb_pixmap127" Name="gnome-db-tables_24x24.png" Source="../share/pixmaps/gnome-db-4.0/gnome-db-tables_24x24.png" />
+	      <File Id="gnomedb_pixmap128" Name="gnome-db-triggers_16x16.png" Source="../share/pixmaps/gnome-db-4.0/gnome-db-triggers_16x16.png" />
+	      <File Id="gnomedb_pixmap129" Name="gnome-db-types_16x16.png" Source="../share/pixmaps/gnome-db-4.0/gnome-db-types_16x16.png" />
+	      <File Id="gnomedb_pixmap130" Name="gnome-db-types_24x24.png" Source="../share/pixmaps/gnome-db-4.0/gnome-db-types_24x24.png" />
+	      <File Id="gnomedb_pixmap131" Name="gnome-db-views_16x16.png" Source="../share/pixmaps/gnome-db-4.0/gnome-db-views_16x16.png" />
+	      <File Id="gnomedb_pixmap132" Name="gnome-db-within-transaction_24x24.png" Source="../share/pixmaps/gnome-db-4.0/gnome-db-within-transaction_24x24.png" />
+            </Component>
+          </Directory>
+	</Directory>
+      </Directory>
+    </DirectoryRef>
+  </Fragment>
+</Wix>

Added: trunk/WixInstaller/gpl.rtf
==============================================================================
--- (empty file)
+++ trunk/WixInstaller/gpl.rtf	Thu Jun 19 21:11:35 2008
@@ -0,0 +1,342 @@
+{\rtf1\ansi\ansicpg1252\deff0\deflang1033{\fonttbl{\f0\fswiss\fcharset0 Arial;}}
+{\*\generator Msftedit 5.41.15.1507;}\viewkind4\uc1\pard\f0\fs20\tab\tab     GNU GENERAL PUBLIC LICENSE\par
+\tab\tab        Version 2, June 1991\par
+\par
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,\par
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\par
+ Everyone is permitted to copy and distribute verbatim copies\par
+ of this license document, but changing it is not allowed.\par
+\par
+\tab\tab\tab     Preamble\par
+\par
+  The licenses for most software are designed to take away your\par
+freedom to share and change it.  By contrast, the GNU General Public\par
+License is intended to guarantee your freedom to share and change free\par
+software--to make sure the software is free for all its users.  This\par
+General Public License applies to most of the Free Software\par
+Foundation's software and to any other program whose authors commit to\par
+using it.  (Some other Free Software Foundation software is covered by\par
+the GNU Lesser General Public License instead.)  You can apply it to\par
+your programs, too.\par
+\par
+  When we speak of free software, we are referring to freedom, not\par
+price.  Our General Public Licenses are designed to make sure that you\par
+have the freedom to distribute copies of free software (and charge for\par
+this service if you wish), that you receive source code or can get it\par
+if you want it, that you can change the software or use pieces of it\par
+in new free programs; and that you know you can do these things.\par
+\par
+  To protect your rights, we need to make restrictions that forbid\par
+anyone to deny you these rights or to ask you to surrender the rights.\par
+These restrictions translate to certain responsibilities for you if you\par
+distribute copies of the software, or if you modify it.\par
+\par
+  For example, if you distribute copies of such a program, whether\par
+gratis or for a fee, you must give the recipients all the rights that\par
+you have.  You must make sure that they, too, receive or can get the\par
+source code.  And you must show them these terms so they know their\par
+rights.\par
+\par
+  We protect your rights with two steps: (1) copyright the software, and\par
+(2) offer you this license which gives you legal permission to copy,\par
+distribute and/or modify the software.\par
+\par
+  Also, for each author's protection and ours, we want to make certain\par
+that everyone understands that there is no warranty for this free\par
+software.  If the software is modified by someone else and passed on, we\par
+want its recipients to know that what they have is not the original, so\par
+that any problems introduced by others will not reflect on the original\par
+authors' reputations.\par
+\par
+  Finally, any free program is threatened constantly by software\par
+patents.  We wish to avoid the danger that redistributors of a free\par
+program will individually obtain patent licenses, in effect making the\par
+program proprietary.  To prevent this, we have made it clear that any\par
+patent must be licensed for everyone's free use or not licensed at all.\par
+\par
+  The precise terms and conditions for copying, distribution and\par
+modification follow.\par
+\par
+\tab\tab     GNU GENERAL PUBLIC LICENSE\par
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\par
+\par
+  0. This License applies to any program or other work which contains\par
+a notice placed by the copyright holder saying it may be distributed\par
+under the terms of this General Public License.  The "Program", below,\par
+refers to any such program or work, and a "work based on the Program"\par
+means either the Program or any derivative work under copyright law:\par
+that is to say, a work containing the Program or a portion of it,\par
+either verbatim or with modifications and/or translated into another\par
+language.  (Hereinafter, translation is included without limitation in\par
+the term "modification".)  Each licensee is addressed as "you".\par
+\par
+Activities other than copying, distribution and modification are not\par
+covered by this License; they are outside its scope.  The act of\par
+running the Program is not restricted, and the output from the Program\par
+is covered only if its contents constitute a work based on the\par
+Program (independent of having been made by running the Program).\par
+Whether that is true depends on what the Program does.\par
+\par
+  1. You may copy and distribute verbatim copies of the Program's\par
+source code as you receive it, in any medium, provided that you\par
+conspicuously and appropriately publish on each copy an appropriate\par
+copyright notice and disclaimer of warranty; keep intact all the\par
+notices that refer to this License and to the absence of any warranty;\par
+and give any other recipients of the Program a copy of this License\par
+along with the Program.\par
+\par
+You may charge a fee for the physical act of transferring a copy, and\par
+you may at your option offer warranty protection in exchange for a fee.\par
+\par
+  2. You may modify your copy or copies of the Program or any portion\par
+of it, thus forming a work based on the Program, and copy and\par
+distribute such modifications or work under the terms of Section 1\par
+above, provided that you also meet all of these conditions:\par
+\par
+    a) You must cause the modified files to carry prominent notices\par
+    stating that you changed the files and the date of any change.\par
+\par
+    b) You must cause any work that you distribute or publish, that in\par
+    whole or in part contains or is derived from the Program or any\par
+    part thereof, to be licensed as a whole at no charge to all third\par
+    parties under the terms of this License.\par
+\par
+    c) If the modified program normally reads commands interactively\par
+    when run, you must cause it, when started running for such\par
+    interactive use in the most ordinary way, to print or display an\par
+    announcement including an appropriate copyright notice and a\par
+    notice that there is no warranty (or else, saying that you provide\par
+    a warranty) and that users may redistribute the program under\par
+    these conditions, and telling the user how to view a copy of this\par
+    License.  (Exception: if the Program itself is interactive but\par
+    does not normally print such an announcement, your work based on\par
+    the Program is not required to print an announcement.)\par
+\par
+These requirements apply to the modified work as a whole.  If\par
+identifiable sections of that work are not derived from the Program,\par
+and can be reasonably considered independent and separate works in\par
+themselves, then this License, and its terms, do not apply to those\par
+sections when you distribute them as separate works.  But when you\par
+distribute the same sections as part of a whole which is a work based\par
+on the Program, the distribution of the whole must be on the terms of\par
+this License, whose permissions for other licensees extend to the\par
+entire whole, and thus to each and every part regardless of who wrote it.\par
+\par
+Thus, it is not the intent of this section to claim rights or contest\par
+your rights to work written entirely by you; rather, the intent is to\par
+exercise the right to control the distribution of derivative or\par
+collective works based on the Program.\par
+\par
+In addition, mere aggregation of another work not based on the Program\par
+with the Program (or with a work based on the Program) on a volume of\par
+a storage or distribution medium does not bring the other work under\par
+the scope of this License.\par
+\par
+  3. You may copy and distribute the Program (or a work based on it,\par
+under Section 2) in object code or executable form under the terms of\par
+Sections 1 and 2 above provided that you also do one of the following:\par
+\par
+    a) Accompany it with the complete corresponding machine-readable\par
+    source code, which must be distributed under the terms of Sections\par
+    1 and 2 above on a medium customarily used for software interchange; or,\par
+\par
+    b) Accompany it with a written offer, valid for at least three\par
+    years, to give any third party, for a charge no more than your\par
+    cost of physically performing source distribution, a complete\par
+    machine-readable copy of the corresponding source code, to be\par
+    distributed under the terms of Sections 1 and 2 above on a medium\par
+    customarily used for software interchange; or,\par
+\par
+    c) Accompany it with the information you received as to the offer\par
+    to distribute corresponding source code.  (This alternative is\par
+    allowed only for noncommercial distribution and only if you\par
+    received the program in object code or executable form with such\par
+    an offer, in accord with Subsection b above.)\par
+\par
+The source code for a work means the preferred form of the work for\par
+making modifications to it.  For an executable work, complete source\par
+code means all the source code for all modules it contains, plus any\par
+associated interface definition files, plus the scripts used to\par
+control compilation and installation of the executable.  However, as a\par
+special exception, the source code distributed need not include\par
+anything that is normally distributed (in either source or binary\par
+form) with the major components (compiler, kernel, and so on) of the\par
+operating system on which the executable runs, unless that component\par
+itself accompanies the executable.\par
+\par
+If distribution of executable or object code is made by offering\par
+access to copy from a designated place, then offering equivalent\par
+access to copy the source code from the same place counts as\par
+distribution of the source code, even though third parties are not\par
+compelled to copy the source along with the object code.\par
+\par
+  4. You may not copy, modify, sublicense, or distribute the Program\par
+except as expressly provided under this License.  Any attempt\par
+otherwise to copy, modify, sublicense or distribute the Program is\par
+void, and will automatically terminate your rights under this License.\par
+However, parties who have received copies, or rights, from you under\par
+this License will not have their licenses terminated so long as such\par
+parties remain in full compliance.\par
+\par
+  5. You are not required to accept this License, since you have not\par
+signed it.  However, nothing else grants you permission to modify or\par
+distribute the Program or its derivative works.  These actions are\par
+prohibited by law if you do not accept this License.  Therefore, by\par
+modifying or distributing the Program (or any work based on the\par
+Program), you indicate your acceptance of this License to do so, and\par
+all its terms and conditions for copying, distributing or modifying\par
+the Program or works based on it.\par
+\par
+  6. Each time you redistribute the Program (or any work based on the\par
+Program), the recipient automatically receives a license from the\par
+original licensor to copy, distribute or modify the Program subject to\par
+these terms and conditions.  You may not impose any further\par
+restrictions on the recipients' exercise of the rights granted herein.\par
+You are not responsible for enforcing compliance by third parties to\par
+this License.\par
+\par
+  7. If, as a consequence of a court judgment or allegation of patent\par
+infringement or for any other reason (not limited to patent issues),\par
+conditions are imposed on you (whether by court order, agreement or\par
+otherwise) that contradict the conditions of this License, they do not\par
+excuse you from the conditions of this License.  If you cannot\par
+distribute so as to satisfy simultaneously your obligations under this\par
+License and any other pertinent obligations, then as a consequence you\par
+may not distribute the Program at all.  For example, if a patent\par
+license would not permit royalty-free redistribution of the Program by\par
+all those who receive copies directly or indirectly through you, then\par
+the only way you could satisfy both it and this License would be to\par
+refrain entirely from distribution of the Program.\par
+\par
+If any portion of this section is held invalid or unenforceable under\par
+any particular circumstance, the balance of the section is intended to\par
+apply and the section as a whole is intended to apply in other\par
+circumstances.\par
+\par
+It is not the purpose of this section to induce you to infringe any\par
+patents or other property right claims or to contest validity of any\par
+such claims; this section has the sole purpose of protecting the\par
+integrity of the free software distribution system, which is\par
+implemented by public license practices.  Many people have made\par
+generous contributions to the wide range of software distributed\par
+through that system in reliance on consistent application of that\par
+system; it is up to the author/donor to decide if he or she is willing\par
+to distribute software through any other system and a licensee cannot\par
+impose that choice.\par
+\par
+This section is intended to make thoroughly clear what is believed to\par
+be a consequence of the rest of this License.\par
+\par
+  8. If the distribution and/or use of the Program is restricted in\par
+certain countries either by patents or by copyrighted interfaces, the\par
+original copyright holder who places the Program under this License\par
+may add an explicit geographical distribution limitation excluding\par
+those countries, so that distribution is permitted only in or among\par
+countries not thus excluded.  In such case, this License incorporates\par
+the limitation as if written in the body of this License.\par
+\par
+  9. The Free Software Foundation may publish revised and/or new versions\par
+of the General Public License from time to time.  Such new versions will\par
+be similar in spirit to the present version, but may differ in detail to\par
+address new problems or concerns.\par
+\par
+Each version is given a distinguishing version number.  If the Program\par
+specifies a version number of this License which applies to it and "any\par
+later version", you have the option of following the terms and conditions\par
+either of that version or of any later version published by the Free\par
+Software Foundation.  If the Program does not specify a version number of\par
+this License, you may choose any version ever published by the Free Software\par
+Foundation.\par
+\par
+  10. If you wish to incorporate parts of the Program into other free\par
+programs whose distribution conditions are different, write to the author\par
+to ask for permission.  For software which is copyrighted by the Free\par
+Software Foundation, write to the Free Software Foundation; we sometimes\par
+make exceptions for this.  Our decision will be guided by the two goals\par
+of preserving the free status of all derivatives of our free software and\par
+of promoting the sharing and reuse of software generally.\par
+\par
+\tab\tab\tab     NO WARRANTY\par
+\par
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY\par
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN\par
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES\par
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED\par
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\par
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS\par
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE\par
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,\par
+REPAIR OR CORRECTION.\par
+\par
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\par
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR\par
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,\par
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING\par
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED\par
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY\par
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER\par
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE\par
+POSSIBILITY OF SUCH DAMAGES.\par
+\par
+\tab\tab      END OF TERMS AND CONDITIONS\par
+\par
+\tab     How to Apply These Terms to Your New Programs\par
+\par
+  If you develop a new program, and you want it to be of the greatest\par
+possible use to the public, the best way to achieve this is to make it\par
+free software which everyone can redistribute and change under these terms.\par
+\par
+  To do so, attach the following notices to the program.  It is safest\par
+to attach them to the start of each source file to most effectively\par
+convey the exclusion of warranty; and each file should have at least\par
+the "copyright" line and a pointer to where the full notice is found.\par
+\par
+    <one line to give the program's name and a brief idea of what it does.>\par
+    Copyright (C) <year>  <name of author>\par
+\par
+    This program is free software; you can redistribute it and/or modify\par
+    it under the terms of the GNU General Public License as published by\par
+    the Free Software Foundation; either version 2 of the License, or\par
+    (at your option) any later version.\par
+\par
+    This program is distributed in the hope that it will be useful,\par
+    but WITHOUT ANY WARRANTY; without even the implied warranty of\par
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\par
+    GNU General Public License for more details.\par
+\par
+    You should have received a copy of the GNU General Public License along\par
+    with this program; if not, write to the Free Software Foundation, Inc.,\par
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\par
+\par
+Also add information on how to contact you by electronic and paper mail.\par
+\par
+If the program is interactive, make it output a short notice like this\par
+when it starts in an interactive mode:\par
+\par
+    Gnomovision version 69, Copyright (C) year name of author\par
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\par
+    This is free software, and you are welcome to redistribute it\par
+    under certain conditions; type `show c' for details.\par
+\par
+The hypothetical commands `show w' and `show c' should show the appropriate\par
+parts of the General Public License.  Of course, the commands you use may\par
+be called something other than `show w' and `show c'; they could even be\par
+mouse-clicks or menu items--whatever suits your program.\par
+\par
+You should also get your employer (if you work as a programmer) or your\par
+school, if any, to sign a "copyright disclaimer" for the program, if\par
+necessary.  Here is a sample; alter the names:\par
+\par
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program\par
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.\par
+\par
+  <signature of Ty Coon>, 1 April 1989\par
+  Ty Coon, President of Vice\par
+\par
+This General Public License does not permit incorporating your program into\par
+proprietary programs.  If your program is a subroutine library, you may\par
+consider it more useful to permit linking proprietary applications with the\par
+library.  If this is what you want to do, use the GNU Lesser General\par
+Public License instead of this License.\par
+}
+
\ No newline at end of file

Added: trunk/WixInstaller/gtk-fragment.wxs
==============================================================================
--- (empty file)
+++ trunk/WixInstaller/gtk-fragment.wxs	Thu Jun 19 21:11:35 2008
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>
+  <Fragment>
+    <DirectoryRef Id="INSTALLDIR">
+      <Directory Id="gtk_bin" Name="bin">
+        <Component Id="GTK_DLL" Guid="3b02484e-4f95-41ed-bfd0-b3b27fa22178">
+	  <File Id="gtk_file0" DiskId="1" Name="jpeg62.dll" Source="../depend/gtk/bin/jpeg62.dll" />
+	  <File Id="gtk_file1" DiskId="1" Name="libatk-1.0-0.dll" Source="../depend/gtk/bin/libatk-1.0-0.dll" />
+	  <File Id="gtk_file2" DiskId="1" Name="libcairo-2.dll" Source="../depend/gtk/bin/libcairo-2.dll" />
+	  <File Id="gtk_file3" DiskId="1" Name="libgdk_pixbuf-2.0-0.dll" Source="../depend/gtk/bin/libgdk_pixbuf-2.0-0.dll" />
+	  <File Id="gtk_file4" DiskId="1" Name="libgdk-win32-2.0-0.dll" Source="../depend/gtk/bin/libgdk-win32-2.0-0.dll" />
+	  <File Id="gtk_file5" DiskId="1" Name="libgtk-win32-2.0-0.dll" Source="../depend/gtk/bin/libgtk-win32-2.0-0.dll" />
+	  <File Id="gtk_file6" DiskId="1" Name="libpango-1.0-0.dll" Source="../depend/gtk/bin/libpango-1.0-0.dll" />
+	  <File Id="gtk_file7" DiskId="1" Name="libpangocairo-1.0-0.dll" Source="../depend/gtk/bin/libpangocairo-1.0-0.dll" />
+	  <File Id="gtk_file8" DiskId="1" Name="libpangowin32-1.0-0.dll" Source="../depend/gtk/bin/libpangowin32-1.0-0.dll" />
+	  <File Id="gtk_file9" DiskId="1" Name="libpng12-0.dll" Source="../depend/gtk/bin/libpng12-0.dll" />
+	  <File Id="gtk_file10" DiskId="1" Name="libtiff3.dll" Source="../depend/gtk/bin/libtiff3.dll" />
+        </Component>
+      </Directory>
+
+      <Directory Id="gtk_etc" Name="etc">
+	<Directory Id="gtk_etc_gtk" Name="gtk-2.0">
+	  <Component Id="GTK_ETC_GTK" Guid="69db1ac0-62a2-4520-91e4-1a7615357c8a">
+	    <File Id="gtk_file100" DiskId="1" Name="gdk-pixbuf.loaders" Source="../depend/gtk/etc/gtk-2.0/gdk-pixbuf.loaders" />
+	    <File Id="gtk_file101" DiskId="1" Name="gtk.immodules" Source="../depend/gtk/etc/gtk-2.0/gtk.immodules" />
+          </Component>
+	</Directory>
+
+	<Directory Id="gtk_etc_pango" Name="pango">
+	  <Component Id="GTK_ETC_PANGO" Guid="02d86e14-82e8-4eb8-864f-c9ab30dc0f47">
+	    <File Id="gtk_file200" DiskId="1" Name="pango.modules" Source="../depend/gtk/etc/pango/pango.modules" />
+	    <!--<File Id="gtk_file201" DiskId="1" Name="pango.aliases" Source="../depend/gtk/etc/pango/pango.aliases" />-->
+          </Component>
+	</Directory>
+      </Directory>
+
+      <Directory Id="gtk_lib" Name="lib">
+	<Directory Id="gtk_lib_gtk" Name="gtk-2.0">
+	  <Directory Id="gtk_lib_gtk_vers" Name="2.10.0">
+	    <Directory Id="gtk_lib_gtk_vers_engines" Name="engines">
+	      <Component Id="GTK_LIB_GTK_ENGINES" Guid="343913a9-21e4-46fd-b9f0-7b3f89fb6722">
+		<File Id="gtk_file300" DiskId="1" Name="libwimp.dll" Source="../depend/gtk/lib/gtk-2.0/2.10.0/engines/libwimp.dll" />
+		<File Id="gtk_file301" DiskId="1" Name="libpixmap.dll" Source="../depend/gtk/lib/gtk-2.0/2.10.0/engines/libpixmap.dll" />
+              </Component>
+	    </Directory>
+
+	    <Directory Id="gtk_lib_gtk_vers_immodules" Name="immodules">
+	      <Component Id="GTK_LIB_GTK_IMMODULES" Guid="42ef41c8-6658-433a-ba67-170fe74090b0">
+		<File Id="gtk_file400" DiskId="1" Name="im-am-et.dll" Source="../depend/gtk/lib/gtk-2.0/2.10.0/immodules/im-am-et.dll" />
+		<File Id="gtk_file401" DiskId="1" Name="im-cedilla.dll" Source="../depend/gtk/lib/gtk-2.0/2.10.0/immodules/im-cedilla.dll" />
+		<File Id="gtk_file402" DiskId="1" Name="im-cyrillic-translit.dll" Source="../depend/gtk/lib/gtk-2.0/2.10.0/immodules/im-cyrillic-translit.dll" />
+		<File Id="gtk_file403" DiskId="1" Name="im-ime.dll" Source="../depend/gtk/lib/gtk-2.0/2.10.0/immodules/im-ime.dll" />
+		<File Id="gtk_file404" DiskId="1" Name="im-inuktitut.dll" Source="../depend/gtk/lib/gtk-2.0/2.10.0/immodules/im-inuktitut.dll" />
+		<File Id="gtk_file405" DiskId="1" Name="im-ipa.dll" Source="../depend/gtk/lib/gtk-2.0/2.10.0/immodules/im-ipa.dll" />
+		<File Id="gtk_file406" DiskId="1" Name="im-multipress.dll" Source="../depend/gtk/lib/gtk-2.0/2.10.0/immodules/im-multipress.dll" />
+		<File Id="gtk_file407" DiskId="1" Name="im-thai.dll" Source="../depend/gtk/lib/gtk-2.0/2.10.0/immodules/im-thai.dll" />
+		<File Id="gtk_file408" DiskId="1" Name="im-ti-er.dll" Source="../depend/gtk/lib/gtk-2.0/2.10.0/immodules/im-ti-er.dll" />
+		<File Id="gtk_file409" DiskId="1" Name="im-ti-et.dll" Source="../depend/gtk/lib/gtk-2.0/2.10.0/immodules/im-ti-et.dll" />
+		<File Id="gtk_file410" DiskId="1" Name="im-viqr.dll" Source="../depend/gtk/lib/gtk-2.0/2.10.0/immodules/im-viqr.dll" />
+              </Component>
+	    </Directory>
+
+	  </Directory>
+	</Directory>
+
+      </Directory>
+    </DirectoryRef>
+  </Fragment>
+</Wix>

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Jun 19 21:11:35 2008
@@ -40,7 +40,8 @@
 AC_SUBST(GNOMEDB_REVISION)
 AC_SUBST(GNOMEDB_AGE)
 
-AC_PROG_INTLTOOL
+AC_PROG_INTLTOOL([0.35.5])
+AC_SUBST(INTLTOOL_XML_RULE)
 
 AC_DEFINE_UNQUOTED(GNOME_DB_EXPLICIT_TRANSLATION_DOMAIN, "libgnomedb-$GNOMEDB_ABI_MAJOR_VERSION.$GNOMEDB_ABI_MINOR_VERSION")
 

Modified: trunk/libgnomedb/data-entries/Makefile.am
==============================================================================
--- trunk/libgnomedb/data-entries/Makefile.am	(original)
+++ trunk/libgnomedb/data-entries/Makefile.am	Thu Jun 19 21:11:35 2008
@@ -63,9 +63,9 @@
 	gnome-db-entry-string-string.xml.in \
 	gnome-db-entry-string-number.xml.in
 
-xml_DATA = $(xml_in_files:.xml.in=.xml)
-
 @INTLTOOL_XML_RULE@
 
+xml_DATA = $(xml_in_files:.xml.in=.xml)
+
 EXTRA_DIST = $(xml_in_files) marshal.list
 DISTCLEANFILES = $(xml_DATA)
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]