- Created Makefile.am in ./data and ./pixmaps directories

   - Modified ./configure.in and ./Makefile.am to work with these Makefiles
   - Moved glabels.desktop to ./data directory

- Changed version to 1.92.0 in ./configure.in

- Added page-sizes.paper to ./data -- it seems to be less hassle to maintain
  a local paper size database.

git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@259 f5e0f49d-192f-0410-a22d-a8d8700d0965

diff --git a/glabels2/data/Makefile.am b/glabels2/data/Makefile.am
new file mode 100644 (file)
index 0000000..42bd9a5
--- /dev/null
+++ b/glabels2/data/Makefile.am
@@ -0,0 +1,24 @@
+## Process this file with automake to produce Makefile.in
+
+desktopdir      = $(datadir)/applications
+desktop_in_files = glabels.desktop.in
+desktop_DATA    = $(desktop_in_files:.desktop.in=.desktop)
+@INTLTOOL_DESKTOP_RULE@
+
+runtime_files = \
+       page-sizes.paper \
+       predefined-labels.template
+
+EXTRA_DIST = \
+       $(desktop_DATA) \
+       $(runtime_files)
+
+configdir=$(datadir)/glabels
+install-data-local:
+         $(mkinstalldirs) $(configdir); \
+         for file in $(runtime_files); do \
+           if test -f $$file; then \
+             $(INSTALL_DATA) $$file $(configdir); \
+           fi \
+         done
+

diff --git a/glabels2/data/glabels.desktop.in b/glabels2/data/glabels.desktop.in
new file mode 100644 (file)
index 0000000..0459cb1
--- /dev/null
+++ b/glabels2/data/glabels.desktop.in
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=gLabels
+Name[ja]=gLabels
+Comment=Create Labels & Business Cards
+Comment[ja]=¥é¥Ù¥ë¤È¥Ó¥¸¥Í¥¹¥«¡¼¥É¤ÎºîÀ®¥×¥í¥°¥é¥à
+Exec=glabels
+Icon=glabels/glabels-icon.png
+Terminal=0
+Type=Application

diff --git a/glabels2/data/page-sizes.paper b/glabels2/data/page-sizes.paper
new file mode 100644 (file)
index 0000000..2df4fc5
--- /dev/null
+++ b/glabels2/data/page-sizes.paper
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<GLabels-paper-sizes>
+
+  <!-- Most popular -->
+  <Paper-size id="US-Letter"    _name="US Letter"    width="8.5in" height="11in"/>
+  <Paper-size id="A4"           _name="A4"           width="210mm" height="297mm"/>
+
+  <!-- Other US paper sizes -->
+  <Paper-size id="US-Legal"     _name="US Legal"     width="8.5in" height="14in"/>
+  <Paper-size id="US-Executive" _name="US Executive" width="8.5in" height="11in"/>
+
+  <!-- Other ISO A series sizes -->
+  <Paper-size id="A0"           _name="A0"           width="841mm" height="1189mm"/>
+  <Paper-size id="A1"           _name="A1"           width="594mm" height="841mm"/>
+  <Paper-size id="A2"           _name="A2"           width="420mm" height="594mm"/>
+  <Paper-size id="A3"           _name="A3"           width="297mm" height="420mm"/>
+  <Paper-size id="A5"           _name="A5"           width="148mm" height="210mm"/>
+  <Paper-size id="A6"           _name="A6"           width="105mm" height="148mm"/>
+  <Paper-size id="A7"           _name="A7"           width="74mm"  height="105mm"/>
+  <Paper-size id="A8"           _name="A8"           width="52mm"  height="74mm"/>
+  <Paper-size id="A9"           _name="A9"           width="37mm"  height="52mm"/>
+  <Paper-size id="A10"          _name="A10"          width="26mm"  height="37mm"/>
+
+  <!-- ISO B series sizes -->
+  <Paper-size id="B0"           _name="B0"           width="1000mm" height="1414mm"/>
+  <Paper-size id="B1"           _name="B1"           width="707mm"  height="1000mm"/>
+  <Paper-size id="B2"           _name="B2"           width="500mm"  height="707mm"/>
+  <Paper-size id="B3"           _name="B3"           width="353mm"  height="500mm"/>
+  <Paper-size id="B4"           _name="B4"           width="250mm"  height="353mm"/>
+  <Paper-size id="B5"           _name="B5"           width="176mm"  height="250mm"/>
+  <Paper-size id="B6"           _name="B6"           width="125mm"  height="176mm"/>
+  <Paper-size id="B7"           _name="B7"           width="88mm"   height="125mm"/>
+  <Paper-size id="B8"           _name="B8"           width="62mm"   height="88mm"/>
+  <Paper-size id="B9"           _name="B9"           width="44mm"   height="62mm"/>
+  <Paper-size id="B10"          _name="B10"          width="31mm"   height="44mm"/>
+
+</GLabels-paper-sizes>

diff --git a/glabels2/pixmaps/Makefile.am b/glabels2/pixmaps/Makefile.am
new file mode 100644 (file)
index 0000000..6f322fd
--- /dev/null
+++ b/glabels2/pixmaps/Makefile.am
@@ -0,0 +1,10 @@
+## Process this file with automake to produce Makefile.in
+
+glabels_pixmapsdir = $(datadir)/pixmaps/glabels
+
+glabels_pixmaps_DATA = \
+       glabels-icon.png        \
+       glabels-logo.png        \
+       glabels-about-logo.png
+
+EXTRA_DIST = $(glabels_pixmaps_DATA)