diff --git a/debian/control b/debian/control index 53667c495..64548ceaa 100644 --- a/debian/control +++ b/debian/control @@ -2,15 +2,15 @@ Source: enlightenment Section: x11 Priority: optional Maintainer: E17 Debian Team -Build-Depends: libevas0-dev, libecore0-dev, libeet0-dev, libedje0-dev, edje0-bin, libembryo0-dev, xlibs-dev, automake1.7 | automaken, libtool, debhelper (>= 4.0) -Standards-Version: 3.5.7.0 +Build-Depends: libevas-dev, libecore-dev, libeet-dev, libedje-dev, edje-bin, libembryo-dev, xlibs-dev, automake1.7 | automaken, libtool, debhelper (>= 4.0) +Standards-Version: 3.6.2.2 Package: enlightenment Architecture: any Section: x11 -Recommends: libevas0-engine-xrender +Recommends: libevas-engine-xrender Suggests: entrance -Depends: ${shlibs:Depends}, libe, enlightenment-data (>= 0.16.999), libevas0, libecore0, libecore0-con, libecore0-evas, libecore0-file, libecore0-ipc, libecore0-job, libecore0-txt, libecore0-x, libeet0, libembryo0, embryo0-bin, edje0-bin, libedje0, libevas0-loader-eet, libevas0-loader-jpeg, libevas0-loader-png, libevas0-saver-eet, libevas0-saver-jpeg, libevas0-saver-png, libevas0-engine-buffer, libevas0-engine-software-x11 +Depends: ${shlibs:Depends}, libe, enlightenment-data (>= 0.16.999), libevas, libecore, libecore-con, libecore-evas, libecore-file, libecore-ipc, libecore-job, libecore-txt, libecore-x, libeet, libembryo, embryo-bin, edje-bin, libedje, libevas-loader-eet, libevas-loader-jpeg, libevas-loader-png, libevas-saver-eet, libevas-saver-jpeg, libevas-saver-png, libevas-engine-buffer, libevas-engine-software-x11 Description: Enlightenment themes, etc. Enlightenment is an advanced window manager for X11. Unique features include: a fully animated background, nice drop shadows @@ -40,7 +40,7 @@ Package: libe-dev Architecture: any Section: devel Architecture: any -Depends: libc6-dev | libc-dev, libevas0-dev, libecore0-dev, libeet0-dev, libembryo0-dev, libedje0-dev +Depends: libc6-dev | libc-dev, libevas-dev, libecore-dev, libeet-dev, libembryo-dev, libedje-dev Conflicts: libenlightenment-dev Description: Enlightenment headers, static libraries and documentation Headers, static libraries and documentation for enlightenment. diff --git a/debian/enlightenment-data.install b/debian/enlightenment-data.install index aa3eddc67..11e6d0f63 100644 --- a/debian/enlightenment-data.install +++ b/debian/enlightenment-data.install @@ -1,3 +1,2 @@ -usr/share/enlightenment/data/icons/*.edj -usr/share/enlightenment/data/themes/*.edj -usr/share/enlightenment/data/init/*.edj +debian/tmp/usr/share/enlightenment/data/themes/*.edj +debian/tmp/usr/share/enlightenment/data/init/*.edj diff --git a/debian/enlightenment.install b/debian/enlightenment.install index 1ed010a3d..3c38974a0 100644 --- a/debian/enlightenment.install +++ b/debian/enlightenment.install @@ -1,15 +1,15 @@ -usr/bin/enlightenment -usr/bin/enlightenment_eapp -usr/bin/enlightenment_eapp_cache_gen -usr/bin/enlightenment_imc -usr/bin/enlightenment_remote -usr/bin/enlightenment_start -usr/lib/enlightenment/modules/* -usr/lib/enlightenment/preload/* -usr/share/enlightenment/doc/* -usr/share/enlightenment/data/input_methods/* -usr/share/enlightenment/data/fonts/* -usr/share/enlightenment/data/images/* -usr/share/enlightenment/data/other/* -usr/share/locale -usr/share/xsessions +debian/tmp/usr/bin/enlightenment +debian/tmp/usr/bin/enlightenment_eapp +debian/tmp/usr/bin/enlightenment_eapp_cache_gen +debian/tmp/usr/bin/enlightenment_imc +debian/tmp/usr/bin/enlightenment_remote +debian/tmp/usr/bin/enlightenment_start +debian/tmp/usr/lib/enlightenment/modules/* +debian/tmp/usr/lib/enlightenment/preload/* +debian/tmp/usr/share/enlightenment/doc/* +debian/tmp/usr/share/enlightenment/data/input_methods/* +debian/tmp/usr/share/enlightenment/data/fonts/* +debian/tmp/usr/share/enlightenment/data/images/* +debian/tmp/usr/share/enlightenment/data/other/* +debian/tmp/usr/share/locale +debian/tmp/usr/share/xsessions diff --git a/debian/libe-dev.install b/debian/libe-dev.install index 3d667443d..96cdf354e 100644 --- a/debian/libe-dev.install +++ b/debian/libe-dev.install @@ -1,3 +1,3 @@ -usr/bin/enlightenment-config -usr/include/*.h -usr/include/enlightenment/*.h +debian/tmp/usr/bin/enlightenment-config +debian/tmp/usr/include/*.h +debian/tmp/usr/include/enlightenment/*.h diff --git a/debian/libe.install b/debian/libe.install index 3cac443ac..965fda4c6 100644 --- a/debian/libe.install +++ b/debian/libe.install @@ -1 +1 @@ -usr/lib/libe* +debian/tmp/usr/lib/libe* diff --git a/debian/rules b/debian/rules index aa12c6f4c..2ae22e66b 100644 --- a/debian/rules +++ b/debian/rules @@ -1,74 +1,11 @@ #!/usr/bin/make -f -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. +# Rewrote debian/rules to use 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 -# 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 - -INSTALL=/usr/bin/install -p -CONFIGUREOPTS = --prefix=/usr --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) -package=enlightenment - -configure: configure-stamp -configure-stamp: - test -x autogen.sh && ./autogen.sh $(CONFIGUREOPTS) || ./configure $(CONFIGUREOPTS) - touch configure-stamp - -build: build-stamp -build-stamp: configure-stamp - dh_testdir - $(MAKE) - touch build-stamp - -clean: - dh_testdir - rm -f build-stamp configure-stamp - - -mv debian/changelog debian/changelog.saved - -$(MAKE) distclean - -mv debian/changelog.saved debian/changelog - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/ - - #$(INSTALL) -d debian/$(package)-dev/usr/share/doc/$(package)-dev/html - -binary-indep: build install - -binary-arch: build install - dh_testdir - dh_testroot - dh_install --sourcedir=debian/tmp --list-missing - - dh_installdocs AUTHORS README - dh_installchangelogs - 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 +