Updating deps, making hildon0 a hildon1. Fixing a dash expansion problem.

diff --git a/ChangeLog.2 b/ChangeLog.2
index 0a99116..2a99d08 100644 (file)
--- a/ChangeLog.2
+++ b/ChangeLog.2
@@ -1,5 +1,17 @@
 2007-01-22  Michael Dominic Kostrzewa  <michael.kostrzewa@nokia.com> 
 
+       * debian/libhildon1-dbg.install:
+       * debian/libhildon1-dev.docs:
+       * debian/libhildon1-dev.install:
+       * debian/libhildon1.install:
+       * configure.ac:
+       * debian/control:
+       * debian/rules: Updating deps, making hildon0 a hildon1.
+
+       * pkgconfig/hildon.pc.in: Fixing a dash expansion problem.
+
+2007-01-22  Michael Dominic Kostrzewa  <michael.kostrzewa@nokia.com> 
+
        * debian/libhildon0-dbg.install:
        * debian/libhildon0-dev.docs:
        * debian/libhildon0-dev.install:

diff --git a/configure.ac b/configure.ac
index db28510..660720a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -20,9 +20,9 @@ AC_PROG_AWK
 
 AC_HEADER_STDC
 
-GTK_VERSION=2.6.10
+GTK_VERSION=2.10
 
-PKG_CHECK_MODULES(GTK, gtk+-2.0)
+PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.10)
 AC_SUBST(GTK_LIBS)
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_VERSION)
@@ -96,7 +96,7 @@ AC_ARG_WITH(asserts,
          no)  BUILD_WITH_ASSERTS=no ;;
          *)   AC_MSG_ERROR(bad value ${withval} for --with-asserts) ;;
      esac],
-     [BUILD_WITH_ASSERTS=yes])
+     [BUILD_WITH_ASSERTS=no])
 
 # just print out our status
 if test x$BUILD_WITH_ASSERTS = xyes; then

diff --git a/debian/control b/debian/control
index ac4b65a..cf9002d 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,24 +2,24 @@ Source: libhildon
 Section: x11
 Priority: optional
 Maintainer: Michael Dominic Kostrzewa <michael.kostrzewa@nokia.com>
-Build-Depends: debhelper (>= 4.0.0), pkg-config, libgtk2.0-dev (>= 2:2.6.10-1.osso4), osso-esd-dev, libxi-dev, libxt-dev, libpng12-dev, libgconf2-dev, gtk-doc-tools
+Build-Depends: debhelper (>= 4.0.0), pkg-config, libgtk2.0-dev (>= 2:2.10), osso-esd-dev, libxi-dev, libxt-dev, libpng12-dev, libgconf2-dev, gtk-doc-tools
 Standards-Version: 3.6.0
 
-Package: libhildon0-dev
+Package: libhildon1-dev
 Section: devel
 Architecture: any
-Depends: libhildon0 (= ${Source-Version}), libgtk2.0-dev (>= 2:2.6.10-1.osso4), osso-esd-dev, libgconf2-dev
+Depends: libhildon1 (= ${Source-Version}), libgtk2.0-dev (>= 2:2.10), osso-esd-dev, libgconf2-dev
 Description: Hildon libraries development files
 
-Package: libhildon0
+Package: libhildon1
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, osso-sounds-ui
 Description: Hildon libraries
 
-Package: libhildon0-dbg
+Package: libhildon1-dbg
 Section: libdevel
 Architecture: any
-Depends: libhildon0 (= ${Source-Version})
+Depends: libhildon1 (= ${Source-Version})
 Description: Debug symbols for hildon libraries
 

diff --git a/debian/libhildon0-dbg.install b/debian/libhildon0-dbg.install
deleted file mode 100644 (file)
index cddaee0..0000000
--- a/debian/libhildon0-dbg.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/debug/*

diff --git a/debian/libhildon0-dev.docs b/debian/libhildon0-dev.docs
deleted file mode 100644 (file)
index 52e24a4..0000000
--- a/debian/libhildon0-dev.docs
+++ /dev/null
@@ -1 +0,0 @@
-debian/build/usr/share/gtk-doc/html

diff --git a/debian/libhildon0-dev.install b/debian/libhildon0-dev.install
deleted file mode 100644 (file)
index 9d4598d..0000000
--- a/debian/libhildon0-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/include
-usr/lib/*.so
-usr/lib/pkgconfig

diff --git a/debian/libhildon0.install b/debian/libhildon0.install
deleted file mode 100644 (file)
index 093956b..0000000
--- a/debian/libhildon0.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*.so.*

diff --git a/debian/libhildon1-dbg.install b/debian/libhildon1-dbg.install
new file mode 100644 (file)
index 0000000..cddaee0
--- /dev/null
+++ b/debian/libhildon1-dbg.install
@@ -0,0 +1 @@
+usr/lib/debug/*

diff --git a/debian/libhildon1-dev.docs b/debian/libhildon1-dev.docs
new file mode 100644 (file)
index 0000000..52e24a4
--- /dev/null
+++ b/debian/libhildon1-dev.docs
@@ -0,0 +1 @@
+debian/build/usr/share/gtk-doc/html

diff --git a/debian/libhildon1-dev.install b/debian/libhildon1-dev.install
new file mode 100644 (file)
index 0000000..9d4598d
--- /dev/null
+++ b/debian/libhildon1-dev.install
@@ -0,0 +1,3 @@
+usr/include
+usr/lib/*.so
+usr/lib/pkgconfig

diff --git a/debian/libhildon1.install b/debian/libhildon1.install
new file mode 100644 (file)
index 0000000..093956b
--- /dev/null
+++ b/debian/libhildon1.install
@@ -0,0 +1 @@
+usr/lib/*.so.*

diff --git a/debian/rules b/debian/rules
index b0dfb48..1e17396 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -113,7 +113,7 @@ binary-arch: build install
        dh_install --sourcedir=debian/build -v
        dh_installman
        dh_link
-       dh_strip --dbg-package="hildon0"
+       dh_strip --dbg-package="libhildon1"
        dh_compress
        dh_fixperms
        dh_makeshlibs -V

diff --git a/pkgconfig/hildon.pc.in b/pkgconfig/hildon.pc.in
index 9c7e0c3..5f2d771 100644 (file)
--- a/pkgconfig/hildon.pc.in
+++ b/pkgconfig/hildon.pc.in
@@ -7,5 +7,5 @@ Name: hildon
 Description: Hildon widgets library
 Requires: gtk+-2.0 >= @GTK_VERSION@
 Version: @VERSION@
-Libs: -L${libdir} -lhildon-@PACKAGE_VERSION_MAJOR@
+Libs: -L${libdir} -lhildon_@PACKAGE_VERSION_MAJOR@
 Cflags: -I${includedir}