2008-12-16 Alberto Garcia <agarcia@igalia.com>

* debian/changelog
	* debian/libhildon1-examples.install
	* debian/rules
	* examples/Makefile.am:
	Use dh_install to install all examples.
	Use DEB_SRCDIR instead of defining SOURCE_DIR

diff --git a/ChangeLog b/ChangeLog
index 52d1931..3b710c3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-12-16  Alberto Garcia  <agarcia@igalia.com>
+
+       * debian/changelog
+       * debian/libhildon1-examples.install
+       * debian/rules
+       * examples/Makefile.am:
+       Use dh_install to install all examples.
+       Use DEB_SRCDIR instead of defining SOURCE_DIR
+
 2008-12-16  Claudio Saavedra  <csaavedra@igalia.com>
 
        * configure.ac: post release version bump.

diff --git a/debian/changelog b/debian/changelog
index eca7a63..9db706e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 libhildon (2.1.33-1~unreleased) unstable; urgency=low
 
   * unreleased
+  * Use dh_install to install all examples.
+  * Use DEB_SRCDIR instead of defining SOURCE_DIR
 
  -- Claudio Saavedra <csaavedra@igalia.com>  Tue, 16 Dec 2008 13:25:38 +0100
 

diff --git a/debian/libhildon1-examples.install b/debian/libhildon1-examples.install
index cf9c4fe..8cd3c10 100644 (file)
--- a/debian/libhildon1-examples.install
+++ b/debian/libhildon1-examples.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/share/doc/libhildon1-examples/examples
-
+examples/*.c usr/share/doc/libhildon1-examples/examples
+examples/Makefile.static usr/share/doc/libhildon1-examples/examples

diff --git a/debian/rules b/debian/rules
index 1df653b..878939c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -8,13 +8,12 @@ DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-O1 -Wl,--as-needed" PKG_CONFIG_PATH=/u
 DEB_CONFIGURE_EXTRA_FLAGS := --enable-gtk-doc --enable-maintainer-mode
 DEB_COMPRESS_EXCLUDE := .c
 
-SOURCE_DIR=$(CURDIR)
+config.status: $(DEB_SRCDIR)/configure
 
-config.status: $(SOURCE_DIR)/configure
+$(DEB_SRCDIR)/configure:
+       AUTOGEN_SUBDIR_MODE=1 NOCONFIGURE=yes $(DEB_SRCDIR)/autogen.sh
 
-$(SOURCE_DIR)/configure:
-       AUTOGEN_SUBDIR_MODE=1 NOCONFIGURE=yes $(SOURCE_DIR)/autogen.sh
-
-common-binary-indep::
-       sed -i 's_"hildon.h"_<hildon/hildon.h>_' $(DEB_DESTDIR)/usr/share/doc/libhildon1-examples/examples/*.c
-       mv $(DEB_DESTDIR)/usr/share/doc/libhildon1-examples/examples/Makefile.static $(DEB_DESTDIR)/usr/share/doc/libhildon1-examples/examples/Makefile
+binary-post-install/libhildon1-examples::
+       ( cd $(DEB_SRCDIR)/debian/libhildon1-examples/usr/share/doc/libhildon1-examples/examples && \
+       sed -i 's_"hildon.h"_<hildon/hildon.h>_' *.c && \
+       mv Makefile.static Makefile )

diff --git a/examples/Makefile.am b/examples/Makefile.am
index 48afc54..72d1b3e 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -442,67 +442,3 @@ hildon_progress_indicator_example_CFLAGS   = $(HILDON_OBJ_CFLAGS)                  \
 hildon_progress_indicator_example_SOURCES      = hildon-progress-indicator-example.c
 
 endif
-
-examplesdir                             = $(datadir)/doc/libhildon1-examples/examples
-examples_DATA                          = Makefile.static                               \
-                                         hildon-window-example.c                       \
-                                         hildon-banner-example.c                       \
-                                         hildon-banner-long-example.c                  \
-                                         hildon-caption-example.c                      \
-                                         hildon-weekday-picker-example.c               \
-                                         hildon-sort-dialog-example.c                  \
-                                         hildon-controlbar-example.c                   \
-                                         hildon-note-example.c                         \
-                                         hildon-time-picker-example.c                  \
-                                         hildon-color-chooser-example.c                \
-                                         hildon-color-button-example.c                 \
-                                         hildon-login-dialog-example.c                 \
-                                         hildon-time-editor-example.c                  \
-                                         hildon-icon-sizes-example.c                   \
-                                         hildon-insensitive-example.c                  \
-                                         hildon-get-password-dialog-example.c          \
-                                         hildon-set-password-dialog-example.c          \
-                                         hildon-window-menu-example.c                  \
-                                         hildon-window-cmn-menu-example.c              \
-                                         hildon-vvolumebar-example.c                   \
-                                         hildon-toolbar-example.c                      \
-                                         hildon-code-dialog-example.c                  \
-                                         hildon-hvolumebar-example.c                   \
-                                         hildon-hvolumebar-insensitive-example.c       \
-                                         hildon-hvolumebar-insensitive-map-example.c   \
-                                         hildon-lookup-example.c                       \
-                                         hildon-number-editor-example.c                \
-                                         hildon-scrolled-window-example.c              \
-                                         hildon-color-pop-example.c                    \
-                                         hildon-thumb-scrollbar-example.c              \
-                                         hildon-date-editor-example.c                  \
-                                         hildon-bread-crumb-trail-example.c            \
-                                         hildon-finger-example.c                       \
-                                         hildon-seekbar-example.c                      \
-                                         hildon-find-toolbar-example.c                 \
-                                         hildon-edit-toolbar-example.c                 \
-                                         hildon-wizard-dialog-example.c                \
-                                         hildon-hvolumebar-timer-example.c             \
-                                         hildon-toolbar-seekbar-example.c              \
-                                         hildon-pannable-area-tree-view-example.c      \
-                                         hildon-pannable-area-scroll-jump-example.c    \
-                                         hildon-pannable-area-buttons-scroll-example.c \
-                                         hildon-pannable-area-gesture-signals-example.c\
-                                         hildon-pannable-area-touch-list-example.c     \
-                                         hildon-pannable-area-touch-grid-example.c     \
-                                         hildon-logical-color-example.c                \
-                                         hildon-app-menu-example.c                     \
-                                         hildon-stackable-window-example.c             \
-                                         hildon-entry-example.c                        \
-                                         hildon-text-view-example.c                    \
-                                         hildon-button-example.c                       \
-                                         hildon-dialog-example.c                       \
-                                         hildon-date-button-example.c                  \
-                                         hildon-picker-button-example.c                \
-                                         hildon-picker-button-multicolumn-example.c    \
-                                         hildon-time-button-example.c                  \
-                                         hildon-check-button-example.c                 \
-                                         hildon-touch-selector-example.c               \
-                                         hildon-touch-selector-multi-cells-example.c   \
-                                         hildon-touch-selector-entry-example.c         \
-                                          hildon-progress-indicator-example.c