2008-10-02 Claudio Saavedra <csaavedra@igalia.com>

* debian/compat: Set to 5
	* debian/control: Update dependencies.
	* debian/libhildon1-dbg.install: Remove.
	* debian/libhildon1-dev.install: Update according to cdbs paths.
	* debian/libhildon1.install: Update according to cdbs paths.
	* debian/rules: Switch to cdbs.

diff --git a/ChangeLog b/ChangeLog
index 49e955e..34e9790 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-10-02  Claudio Saavedra  <csaavedra@igalia.com>
+
+       * debian/compat: Set to 5
+       * debian/control: Update dependencies.
+       * debian/libhildon1-dbg.install: Remove.
+       * debian/libhildon1-dev.install: Update according to cdbs paths.
+       * debian/libhildon1.install: Update according to cdbs paths.
+       * debian/rules: Switch to cdbs.
+
 2008-10-01  Alberto Garcia  <agarcia@igalia.com>
 
        * src/hildon-app-menu.c (hildon_app_menu_repack_filters):

diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..7ed6ff8
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+5

diff --git a/debian/control b/debian/control
index 346447a..48887d5 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,13 @@ Source: libhildon
 Section: x11
 Priority: optional
 Maintainer: Claudio Saavedra <csaavedra@igalia.com>
-Build-Depends: debhelper (>= 4.0.0), pkg-config, libgtk2.0-dev (>= 2:2.12.9-0osso3), libcanberra-dev, libxi-dev, libxt-dev, libpng12-dev, libgconf2-dev, gtk-doc-tools, libgtk2.0-doc, libglib2.0-doc
+Build-Depends: debhelper (>= 5), cdbs, libgtk2.0-dev (>= 2:2.12.9-0osso3), libcanberra-dev, libxi-dev, libxt-dev, libpng12-dev, libgconf2-dev, gtk-doc-tools, libgtk2.0-doc, libglib2.0-doc
 Standards-Version: 3.6.0
 
 Package: libhildon1-dev
 Section: devel
 Architecture: any
-Depends: libhildon1 (= ${Source-Version}), libgtk2.0-dev (>= 2:2.12.9-0osso3), libgconf2-dev, libcanberra-dev
+Depends: libhildon1 (= ${binary:Version}), pkg-config, libgtk2.0-dev (>= 2:2.12.9-0osso3), libgconf2-dev, libcanberra-dev
 Description: Hildon libraries development files
 
 Package: libhildon1
@@ -20,6 +20,6 @@ Description: Hildon libraries
 Package: libhildon1-dbg
 Section: libdevel
 Architecture: any
-Depends: libhildon1 (= ${Source-Version})
+Depends: libhildon1 (= ${binary:Version})
 Description: Debug symbols for hildon libraries
 

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

diff --git a/debian/libhildon1-dev.install b/debian/libhildon1-dev.install
index e6171ae..9831148 100644 (file)
--- a/debian/libhildon1-dev.install
+++ b/debian/libhildon1-dev.install
@@ -1,4 +1,4 @@
-usr/include
-usr/lib/*.so
-usr/lib/pkgconfig
-usr/share/gtk-doc/html
+debian/tmp/usr/lib/*.so
+debian/tmp/usr/lib/pkgconfig/
+debian/tmp/usr/include/
+debian/tmp/usr/share/gtk-doc/html/

diff --git a/debian/libhildon1.install b/debian/libhildon1.install
index 093956b..79bbe2f 100644 (file)
--- a/debian/libhildon1.install
+++ b/debian/libhildon1.install
@@ -1 +1 @@
-usr/lib/*.so.*
+debian/tmp/usr/lib/*.so.*

diff --git a/debian/rules b/debian/rules
index 30ef0dc..b940211 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,140 +1,11 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/utils.mk
 
-SOURCE_DIR=$(CURDIR)
+DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-O1 -Wl,--as-needed"
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-gtk-doc
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-       CFLAGS += -O0
-else
-       CFLAGS += -O2
-endif
-
-# Use soft-float and thumb mode if it enabled. 
-ifneq (,$(findstring thumb,$(DEB_BUILD_OPTIONS)))
-       CFLAGS += -mthumb
-endif
-
-ifeq (,$(findstring nodocs,$(DEB_BUILD_OPTIONS)))
-ENABLE_GTK_DOC = --enable-gtk-doc
-else
-ENABLE_GTK_DOC = --disable-gtk-doc
-endif
-
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-       INSTALL_PROGRAM += -s
-endif
-
-# shared library versions, option 1
-# version=0.0.0 
-# major=0
-# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
-version=`ls src/.libs/lib*.so.* | \
-awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-
-major=`ls src/.libs/lib*.so.* | \
-awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
-
-config.status: $(SOURCE_DIR)/configure
-       dh_testdir
-#      Add here commands to configure the package.
-       CFLAGS="$(CFLAGS)" ./configure              \
-               --host=$(DEB_HOST_GNU_TYPE)          \
-               --build=$(DEB_BUILD_GNU_TYPE)        \
-               --prefix=/usr                        \
-               --mandir=\$${prefix}/share/man       \
-               --infodir=\$${prefix}/share/info     \
-               --with-doc-dir=\$${prefix}/share/doc \
-               --disable-dependency-tracking        \
-              $(ENABLE_GTK_DOC)
-
-$(SOURCE_DIR)/configure:
-       AUTOGEN_SUBDIR_MODE=1 NOCONFIGURE=yes $(SOURCE_DIR)/autogen.sh
-
-
-build: build-stamp
-build-stamp:  config.status
-       dh_testdir
-#      Add here commands to compile the package.
-       $(MAKE)
-       touch build-stamp
-
-clean:
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp 
-       rm -rf debian/build
-#      Add here commands to clean up after the build process.
-       -$(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-       cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-       cp -f /usr/share/misc/config.guess config.guess
-endif
-       dh_clean 
-
-
-install: build
-       dh_testdir
-       dh_testroot
-       dh_clean -k 
-       dh_installdirs
-
-#      Add here commands to install the package into debian/build
-       $(MAKE) install DESTDIR=$(CURDIR)/debian/build
-
-       ln -s -f libhildon-1.so $(CURDIR)/debian/build/usr/lib/libhildon_1.so 
-       ln -s -f libhildon-1.so.0 $(CURDIR)/debian/build/usr/lib/libhildon_1.so.0
-       ln -s -f libhildon-1.so.0.0.0 $(CURDIR)/debian/build/usr/lib/libhildon_1.so.0.0.0 
-
-#      for the -dbg package
-       rm -rf $(CURDIR)/debian/build/usr/lib/debug
-       -mkdir -p $(CURDIR)/debian/build/usr/lib/debug
-       -cp -vd $(CURDIR)/debian/build/usr/lib/lib*.so* $(CURDIR)/debian/build/usr/lib/debug
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-       dh_testdir
-       dh_testroot
-       dh_installdocs NEWS
-       dh_installchangelogs ChangeLog
-#      dh_installexamples
-       @if [ -d debian/build/usr/share/gtk-doc ]; then         \
-         echo "Installing gtk-doc" ;                           \
-         dh_install --sourcedir=debian/build -v ;              \
-       else                                                    \
-         echo "Skipping gtk-doc" ;                             \
-         dh_install --sourcedir=debian/build -v -Xgtk-doc ;    \
-       fi
-       dh_installman
-       dh_link
-       dh_strip --dbg-package="libhildon1"
-       dh_compress
-       dh_fixperms
-       dh_makeshlibs
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+makebuilddir::
+       AUTOGEN_SUBDIR_MODE=1 NOCONFIGURE=yes ./autogen.sh