Bump to 0.4.1HAL_0_4_BRANCH_POINTHAL_0_4_1

Take FIGURE_FILES and EXTRA_DIST outside the conditional
    DOCBOOK_DOCS_ENABLED so 'make distcheck' passes

10 files changed, 26 insertions, 21 deletions

diff --git a/ChangeLog b/ChangeLog
index 30ad85b3..6158dc72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2004-11-01  David Zeuthen  <davidz@redhat.com>
 
+	* configure.in: Bump to 0.4.1
+
+	* doc/spec/Makefile.am: Take FIGURE_FILES and EXTRA_DIST outside the
+	conditional DOCBOOK_DOCS_ENABLED so 'make distcheck' passes
+
+2004-11-01  David Zeuthen  <davidz@redhat.com>
+
 	* tools/device-manager/hal-device-manager.in: New file; append
 	path to where we install so we don't need a symlink to /usr/share.
 	Fixes issue with SELinux strict policy (RH Bug #134845)
diff --git a/configure.in b/configure.in
index b3245570..5f90043e 100644
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,8 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)
-AC_INIT(hal, 0.4.0, david@fubar.dk)
-AM_INIT_AUTOMAKE(hal, 0.4.0)
+AC_INIT(hal, 0.4.1, david@fubar.dk)
+AM_INIT_AUTOMAKE(hal, 0.4.1)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 
diff --git a/doc/spec/Makefile.am b/doc/spec/Makefile.am
index 52adef46..4219e4d7 100644
--- a/doc/spec/Makefile.am
+++ b/doc/spec/Makefile.am
@@ -1,5 +1,4 @@
 
-if DOCBOOK_DOCS_ENABLED
 
 FIGURE_FILES =                        	\
 	hal-arch.png                  	\
@@ -9,6 +8,7 @@ FIGURE_FILES =                        	\
 	hal-fdi-example3.png      	\
 	hal-linux26.png	
 
+if DOCBOOK_DOCS_ENABLED
 
 htmldocdir = $(datadir)/doc/hal-$(VERSION)/spec
 htmldoc_DATA = hal-spec.html $(FIGURE_FILES)
@@ -16,16 +16,16 @@ htmldoc_DATA = hal-spec.html $(FIGURE_FILES)
 hal-spec.html : hal-spec.xml $(FIGURE_FILES)
 	$(DOCBOOK) --nochunks hal-spec.xml -o .
 
-EXTRA_DIST = hal-spec.html       \
-	     hal-spec.xml.in     \
-	     example-manager.py	 \
-	     hal-arch.dia	 \
-	     hal-linux26.dia     \
-	     $(FIGURE_FILES)
-
 clean-local:
 	rm -f *~
 	rm -f hal-spec.html hal-spec.xml
 
 
 endif # DOCBOOK_DOCS_ENABLED
+
+EXTRA_DIST = hal-spec.html       \
+	     hal-spec.xml.in     \
+	     example-manager.py	 \
+	     hal-arch.dia	 \
+	     hal-linux26.dia     \
+	     $(FIGURE_FILES)
diff --git a/po/da.po b/po/da.po
index 093665c1..fed81041 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 18:59-0400\n"
+"POT-Creation-Date: 2004-11-01 18:06-0500\n"
 "PO-Revision-Date: 2004-09-22 23:26+0200\n"
 "Last-Translator: David Zeuthen <davidz@redhat.com>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
diff --git a/po/de.po b/po/de.po
index ad45c382..266765a6 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 18:59-0400\n"
+"POT-Creation-Date: 2004-11-01 18:06-0500\n"
 "PO-Revision-Date: 2004-09-22 23:26+0200\n"
 "Last-Translator: Kay Sievers <kay.sievers@vrfy.org>\n"
 "Language-Team: \n"
diff --git a/po/fr.po b/po/fr.po
index 1060e4d0..3fb4de56 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: essai\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 18:59-0400\n"
+"POT-Creation-Date: 2004-11-01 18:06-0500\n"
 "PO-Revision-Date: 2004-09-24 20:55+0200\n"
 "Last-Translator: Jérôme Lodewyck <jerome.lodewyck@normalesup.org>\n"
 "Language-Team: Français <fr@li.org>\n"
diff --git a/po/hu.po b/po/hu.po
index cade266b..139dac54 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 18:59-0400\n"
+"POT-Creation-Date: 2004-11-01 18:06-0500\n"
 "PO-Revision-Date: 2004-10-15 12:50+0200\n"
 "Last-Translator: Laszlo Dvornik <dvornik@gnome.hu>\n"
 "Language-Team: Hungarian <gnome@gnome.hu>\n"
diff --git a/po/nl.po b/po/nl.po
index 08dfd576..487c59ec 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HAL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 18:59-0400\n"
+"POT-Creation-Date: 2004-11-01 18:06-0500\n"
 "PO-Revision-Date: 2004-09-26 21:00+0200\n"
 "Last-Translator: Reinout van Schouwen <reinout@cs.vu.nl>\n"
 "Language-Team: Dutch <vertaling@nl.linux.org>\n"
diff --git a/po/pt.po b/po/pt.po
index 240b21cb..028e71ab 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-14 18:59-0400\n"
+"POT-Creation-Date: 2004-11-01 18:06-0500\n"
 "PO-Revision-Date: 2004-10-19 13:12+0100\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: Portuguese <kde-i18n-pt@kdeorg>\n"
@@ -132,5 +132,3 @@ msgstr "Média Amovível %s"
 #, c-format
 msgid "%s Media"
 msgstr "Média %s"
-
-
diff --git a/po/ru.po b/po/ru.po
index 58de1bef..f00d9e22 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-27 18:42+0200\n"
+"POT-Creation-Date: 2004-11-01 18:06-0500\n"
 "PO-Revision-Date: 2004-10-14 20:29+0300\n"
 "Last-Translator: Leonid Kanter <leon@asplinux.ru>\n"
 "Language-Team:  <ru@li.org>\n"
@@ -15,7 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: libhal-storage/libhal-storage.c:288
 #, c-format
@@ -134,4 +135,3 @@ msgstr "Съемный носитель %s"
 #, c-format
 msgid "%s Media"
 msgstr "Носитель %s"
-