dependency and package content cleanups.

split up edje0-bin into edje0-bin and edje0-debug.
move rules to CDBS.

SVN revision: 21682

diff --git a/legacy/edje/debian/control b/legacy/edje/debian/control
index 6fb3ea5c24ef367ba4253d4d8f1b7e6141213008..97bf454c5b55b2052dafa180c130034a467e4f83 100644 (file)
--- a/legacy/edje/debian/control
+++ b/legacy/edje/debian/control
@@ -2,13 +2,13 @@ Source: edje
 Section: libs
 Priority: optional
 Maintainer: Sytse Wielinga <s.b.wielinga@student.utwente.nl>
-Build-Depends: libeet-dev, libecore-dev, libevas-dev, libembryo-dev, debhelper (>> 4.0.0), automake-1.7 | automaken, libtool
+Build-Depends: libeet0-dev, libecore0-dev, libevas0-dev, libembryo0-dev, debhelper (>> 4.0.0), automake-1.7 | automaken, libtool
 Standards-Version: 3.6.1.0
 
 Package: edje0-bin
 Architecture: any
 Section: graphics
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, libedje0 (= ${Source-Version})
 Provides: edje-bin
 Description: Various binaries for use with libedje.
  This package contains the following binaries:
@@ -22,6 +22,18 @@ Description: Various binaries for use with libedje.
  compressed and scalable themes. It is the theming engine behind
  Enlightenment DR 0.17.
 
+Package: edje0-debug
+Architecture: any
+Section: graphics
+Depends: ${shlibs:Depends}, libedje0 (= ${Source-Version}), edje0-bin
+Provides: edje-debug
+Description: Various binaries for use with libedje.
+ This package contains the edje test binaries.
+ .
+ Edje is a graphical layout and animation library for animated resizable,
+ compressed and scalable themes. It is the theming engine behind
+ Enlightenment DR 0.17.
+
 Package: libedje0
 Architecture: any
 Section: libs
@@ -37,7 +49,7 @@ Package: libedje0-dev
 Architecture: any
 Section: devel
 Architecture: any
-Depends: libedje0 (= ${Source-Version}), libc6-dev | libc-dev, libeet-dev, libecore-dev, libevas-dev, libembryo-dev
+Depends: libedje0 (= ${Source-Version}), libc6-dev | libc-dev, libeet0-dev, libecore0-dev, libevas0-dev, libembryo0-dev
 Provides: libedje-dev
 Description: libedje0 headers, static libraries and documentation
  This package provides headers, shared libraries and documentation for Edje.

diff --git a/legacy/edje/debian/edje0-bin.install b/legacy/edje/debian/edje0-bin.install
index 25d2ed30f66ea7965644d018f8e24750b0889c37..bf11225eb8f8e3c451947dac9b95643db3d93262 100644 (file)
--- a/legacy/edje/debian/edje0-bin.install
+++ b/legacy/edje/debian/edje0-bin.install
@@ -1,13 +1,6 @@
-usr/bin/edje_cc
-usr/bin/edje_ls
-usr/bin/edje_decc
-usr/bin/edje_recc
-usr/bin/edje
-usr/share/edje/data/src/*.edc
-usr/share/edje/data/images/*.png
-usr/share/edje/data/*.sh
-usr/share/edje/data/test/fonts/*.alias
-usr/share/edje/data/test/fonts/*.ttf
-usr/share/edje/data/test/fonts/*.dir
-usr/share/edje/data/test/images/*.png
-usr/share/edje/data/template/*
+debian/tmp/usr/bin/edje_cc
+debian/tmp/usr/bin/edje_ls
+debian/tmp/usr/bin/edje_decc
+debian/tmp/usr/bin/edje_recc
+debian/tmp/usr/bin/edje
+debian/tmp/usr/share/edje/data/template/*

diff --git a/legacy/edje/debian/edje0-debug.install b/legacy/edje/debian/edje0-debug.install
new file mode 100644 (file)
index 0000000..ad2beb4
--- /dev/null
+++ b/legacy/edje/debian/edje0-debug.install
@@ -0,0 +1,8 @@
+debian/tmp/usr/bin/*test
+debian/tmp/usr/share/edje/data/e_logo.sh
+debian/tmp/usr/share/edje/data/src/*.edc
+debian/tmp/usr/share/edje/data/images/*.png
+debian/tmp/usr/share/edje/data/test/fonts/*.alias
+debian/tmp/usr/share/edje/data/test/fonts/*.ttf
+debian/tmp/usr/share/edje/data/test/fonts/*.dir
+debian/tmp/usr/share/edje/data/test/images/*.png

diff --git a/legacy/edje/debian/libedje0-dev.install b/legacy/edje/debian/libedje0-dev.install
index 48c5f3258be09fe3784d09676c5128cd2630972b..e2a3a75f2887c54eed50cefcbeaeba585ed28b08 100644 (file)
--- a/legacy/edje/debian/libedje0-dev.install
+++ b/legacy/edje/debian/libedje0-dev.install
@@ -1,7 +1,5 @@
-usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/*.la
-usr/share/aclocal/*
-usr/bin/*-config
-/usr/lib/pkgconfig/*
+debian/tmp/usr/include/*
+debian/tmp/usr/lib/lib*.a
+debian/tmp/usr/lib/*.la
+debian/tmp/usr/bin/*-config
+debian/tmp/usr/lib/pkgconfig/*

diff --git a/legacy/edje/debian/libedje0.install b/legacy/edje/debian/libedje0.install
index 6dc9520eb796bb85b560cbc261d9a3d0b3c22d8f..073f460688db81dbf886f03d3ef9ff9a92ce2050 100644 (file)
--- a/legacy/edje/debian/libedje0.install
+++ b/legacy/edje/debian/libedje0.install
@@ -1,2 +1,2 @@
-usr/lib/lib*.so.*
-usr/share/edje/include/edje.inc
+debian/tmp/usr/lib/lib*.so.*
+debian/tmp/usr/share/edje/include/edje.inc

diff --git a/legacy/edje/debian/rules b/legacy/edje/debian/rules
index 8c0d9744f1dbb0e90bafe09f6fcb1b5779d38e72..4c04d658bdd8e357542865150bd98bd4c83e686f 100644 (file)
--- a/legacy/edje/debian/rules
+++ b/legacy/edje/debian/rules
@@ -1,87 +1,11 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+# Simple debian/rules rewrote for cdbs
 
-# 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
 
-# This is the debhelper compatability version to use.
-export DH_COMPAT=4
+DEB_MAKE_CLEAN_TARGET := clean
 
-
-CFLAGS ?= -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-       CFLAGS += -O0
-else
-       CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-       INSTALL_PROGRAM += -s
-endif
-
-# 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)
-
-INSTALL=/usr/bin/install -p
-CONFIGUREOPTS = --prefix=/usr --with-vim=/usr/share/vim/addons --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
-package=libedje0
-
-configure: configure-stamp
-configure-stamp:
-       dh_testdir
-
-       test -x autogen.sh && ./autogen.sh $(CONFIGUREOPTS) || ./configure $(CONFIGUREOPTS)
-
-       touch configure-stamp
-
-build: configure build-stamp
-build-stamp:
-       dh_testdir
-
-       $(MAKE)
-
-       touch build-stamp
-
-clean:
-       dh_testdir
-       rm -f build-stamp configure-stamp
-
-       -$(MAKE) distclean
-
-       dh_clean
-
-install: build 
-       dh_testdir
-       dh_testroot
-       dh_clean -k
-       dh_installdirs
-
-       $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-       chmod 755 $(CURDIR)/debian/tmp/usr/share/edje/data/e_logo.sh
-       chmod 755 $(CURDIR)/debian/tmp/usr/share/edje/data/template/build_theme.sh
-
-binary-indep: build install
-
-binary-arch: build install
-       dh_testdir
-       dh_testroot
-       dh_installdocs AUTHORS README
-       dh_installchangelogs
-       dh_install --sourcedir=debian/tmp --list-missing
-       dh_link
-       dh_strip
-       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 configure
+clean::
+       if [ -f $(CURDIR)/../../snapshot ]; then ./autogen.sh --prefix=/usr; fi