2008-10-23 Alejandro Pinheiro <apinheiro@igalia.com>

* debian/control: Change libhildon1-examples dependency from libhildon1
	to libhildon1-dev
	* debian/libhildon1-examples.install
	* debian/rules
	* Makefile.am: Modified the final install directory for the examples on
	package libhildon1-examples
	* Makefile.static: Update clean target in order to remove all the binary
	examples

	Changes suggested by Claudio after review new libhildon1-examples package

diff --git a/ChangeLog b/ChangeLog
index 6bfccc5..d52c658 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2008-10-23  Alejandro Pinheiro  <apinheiro@igalia.com>
+
+       * debian/control: Change libhildon1-examples dependency from libhildon1
+       to libhildon1-dev
+       * debian/libhildon1-examples.install
+       * debian/rules
+       * Makefile.am: Modified the final install directory for the examples on
+       package libhildon1-examples
+       * Makefile.static: Update clean target in order to remove all the binary
+       examples
+
+       Changes suggested by Claudio after review new libhildon1-examples package
+
 2008-10-23  Claudio Saavedra  <csaavedra@igalia.com>
 
        * src/hildon-touch-selector-entry.c: Fix some gtk-doc warnings.

diff --git a/debian/control b/debian/control
index 29065cf..54b3f94 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,7 @@ Description: Debug symbols for hildon libraries
 Package: libhildon1-examples
 Section: doc
 Architecture: all
-Depends: libhildon1 (= ${binary:Version})
+Depends: libhildon1-dev (= ${binary:Version})
 Description: Examples source file for hildon libraries
 
 Package: libhildon1-doc

diff --git a/debian/libhildon1-examples.install b/debian/libhildon1-examples.install
index dbbcdb4..cf9c4fe 100644 (file)
--- a/debian/libhildon1-examples.install
+++ b/debian/libhildon1-examples.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/share/doc/libhildon1/examples
+debian/tmp/usr/share/doc/libhildon1-examples/examples
 

diff --git a/debian/rules b/debian/rules
index a351d61..ad9bcb8 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -16,5 +16,5 @@ $(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/*.c
-       mv $(DEB_DESTDIR)/usr/share/doc/libhildon1/examples/Makefile.static $(DEB_DESTDIR)/usr/share/doc/libhildon1/examples/Makefile
+       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

diff --git a/examples/Makefile.am b/examples/Makefile.am
index 98420ae..7af58b8 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -364,7 +364,7 @@ hildon_touch_selector_entry_example_SOURCES = hildon-touch-selector-entry-exampl
 
 endif
 
-examplesdir                             = $(datadir)/doc/libhildon1/examples
+examplesdir                             = $(datadir)/doc/libhildon1-examples/examples
 examples_DATA                          = Makefile.static                               \
                                          hildon-window-example.c                       \
                                          hildon-banner-example.c                       \

diff --git a/examples/Makefile.static b/examples/Makefile.static
index bfb5092..155afec 100644 (file)
--- a/examples/Makefile.static
+++ b/examples/Makefile.static
@@ -13,4 +13,5 @@ all: $(EXAMPLES)
 
 clean:
        rm -f *example
+       rm -f *example-[1-9]