[maemo-commits] [maemo-commits] r9554 - in projects/haf/trunk/hildon-fm: . debian hildon-fm

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2007-02-02 11:37:36 +0200 (Fri, 02 Feb 2007)
New Revision: 9554

Modified:
   projects/haf/trunk/hildon-fm/ChangeLog
   projects/haf/trunk/hildon-fm/configure.ac
   projects/haf/trunk/hildon-fm/debian/changelog
   projects/haf/trunk/hildon-fm/hildon-fm/Makefile.am
Log:
	Released 2.6
	
	* hildon-fm/Makefile.am (hildonincludeinstdir): Install headers
	into <hildon/...> instead of <hildion-widgets/...>.


Modified: projects/haf/trunk/hildon-fm/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-fm/ChangeLog	2007-02-02 09:31:10 UTC (rev 9553)
+++ projects/haf/trunk/hildon-fm/ChangeLog	2007-02-02 09:37:36 UTC (rev 9554)
@@ -1,3 +1,10 @@
+2007-02-02  Marius Vollmer  <marius.vollmer at nokia.com>
+
+	Released 2.6
+	
+	* hildon-fm/Makefile.am (hildonincludeinstdir): Install headers
+	into <hildon/...> instead of <hildion-widgets/...>.
+
 2007-02-01  Marius Vollmer  <marius.vollmer at nokia.com>
 
         Released 2.5

Modified: projects/haf/trunk/hildon-fm/configure.ac
===================================================================
--- projects/haf/trunk/hildon-fm/configure.ac	2007-02-02 09:31:10 UTC (rev 9553)
+++ projects/haf/trunk/hildon-fm/configure.ac	2007-02-02 09:37:36 UTC (rev 9554)
@@ -1,5 +1,5 @@
 AC_INIT(Makefile.am)
-AM_INIT_AUTOMAKE(libhildonfm, 2.5)
+AM_INIT_AUTOMAKE(libhildonfm, 2.6)
 AM_CONFIG_HEADER(config.h)
 
 AC_CANONICAL_HOST

Modified: projects/haf/trunk/hildon-fm/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-fm/debian/changelog	2007-02-02 09:31:10 UTC (rev 9553)
+++ projects/haf/trunk/hildon-fm/debian/changelog	2007-02-02 09:37:36 UTC (rev 9554)
@@ -1,3 +1,9 @@
+libhildonfm (2.6-1) unstable; urgency=low
+
+  * Move header files to new <hildon/...> location.
+
+ -- Marius Vollmer <marius.vollmer at nokia.com>  Fri,  2 Feb 2007 11:33:49 +0200
+
 libhildonfm (2.5-1) unstable; urgency=low
 
   * Don't have libhildonfm2 conflict/replace hildon-libs0 and hildon-lgpl0.

Modified: projects/haf/trunk/hildon-fm/hildon-fm/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/Makefile.am	2007-02-02 09:31:10 UTC (rev 9553)
+++ projects/haf/trunk/hildon-fm/hildon-fm/Makefile.am	2007-02-02 09:37:36 UTC (rev 9554)
@@ -54,8 +54,8 @@
 	$(hildonfm_built_headers)		\
 	$(hildonfm_built_cfiles)
 
-hildonwidgetsincludeinstdir=$(includedir)/hildon-fm/hildon-widgets
-hildonwidgetsincludeinst_DATA = \
+hildonincludeinstdir=$(includedir)/hildon-fm/hildon
+hildonincludeinst_DATA = \
 	hildon-file-selection.h \
 	hildon-file-system-model.h \
 	hildon-file-chooser-dialog.h \
@@ -64,7 +64,7 @@
 	hildon-file-details-dialog.h
 
 
-headers_to_scan_for_enums = $(hildonwidgetsincludeinst_DATA)
+headers_to_scan_for_enums = $(hildonincludeinst_DATA)
  
 # Generate the enums source code, with glib-mkenums:
 # This is based on the same Makefile.am stuff in pango: