gnome-specimen r55 - in branches/import-from-bzr: . data glade

[wbolster svn gnome org]

Author: wbolster
Date: Tue Jun 17 18:52:46 2008
New Revision: 55
URL: http://svn.gnome.org/viewvc/gnome-specimen?rev=55&view=rev

Log:
* Merged glade dir into data dir


Added:
   branches/import-from-bzr/data/gnome-specimen.glade
      - copied, changed from r54, /branches/import-from-bzr/glade/gnome-specimen.glade
Removed:
   branches/import-from-bzr/glade/gnome-specimen.glade
Modified:
   branches/import-from-bzr/   (props changed)
   branches/import-from-bzr/data/Makefile.am

Modified: branches/import-from-bzr/data/Makefile.am
==============================================================================
--- branches/import-from-bzr/data/Makefile.am	(original)
+++ branches/import-from-bzr/data/Makefile.am	Tue Jun 17 18:52:46 2008
@@ -1,11 +1,15 @@
- INTLTOOL_DESKTOP_RULE@
+gladedir   = $(pkgdatadir)/glade
+glade_DATA = gnome-specimen.glade
 
+ INTLTOOL_DESKTOP_RULE@
 desktop_in_files = gnome-specimen.desktop.in.in
 desktopdir = $(datadir)/applications
 desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
 
 EXTRA_DIST = \
-$(desktop_in_files)
+	$(desktop_in_files) \
+	$(glade_DATA)
+
 
 DISTCLEANFILES = \
-$(desktop_DATA)
+	$(desktop_DATA)

Copied: branches/import-from-bzr/data/gnome-specimen.glade (from r54, /branches/import-from-bzr/glade/gnome-specimen.glade)
==============================================================================