Enlightenment CVS committal

Author  : shadoi
Project : e17
Module  : libs/ecore

Dir     : e17/libs/ecore/debian


Modified Files:
        control libecore0.install rules 


Log Message:

* Use CDBS for debian/rules
* Add "| xlibs-static-dev" for stable to build-deps
* Remove the test bin from -dev (duplication)


===================================================================
RCS file: /cvs/e/e17/libs/ecore/debian/control,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- control     29 Mar 2006 16:21:37 -0000      1.15
+++ control     29 Mar 2006 16:56:01 -0000      1.16
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: E17 Debian Team <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 4.0.0), libedb1-dev, libeet0-dev, libevas0-dev, 
libssl-dev, libfreetype6-dev, libdirectfb-dev, libxcursor-dev, automake1.7 | 
automaken, libtool, libxss-dev
+Build-Depends: debhelper (>> 4.0.0), libedb1-dev, libeet0-dev, libevas0-dev, 
libssl-dev, libfreetype6-dev, libdirectfb-dev, libxcursor-dev, automake1.7 | 
automaken, libtool, libxss-dev | xlibs-static-dev
 Standards-Version: 3.6.1.0
 
 Package: libecore0
===================================================================
RCS file: /cvs/e/e17/libs/ecore/debian/libecore0.install,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- libecore0.install   10 Mar 2005 15:19:34 -0000      1.1
+++ libecore0.install   29 Mar 2006 16:56:01 -0000      1.2
@@ -1,6 +1,4 @@
 usr/lib/lib*.so.*
 usr/lib/ecore*.so
-usr/share/ecore/fonts/*.ttf
-usr/share/ecore/fonts/fonts.alias
-usr/share/ecore/fonts/fonts.dir
+usr/share/ecore/fonts/*
 usr/share/ecore/pointers/*.png
===================================================================
RCS file: /cvs/e/e17/libs/ecore/debian/rules,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- rules       10 Mar 2005 15:19:34 -0000      1.9
+++ rules       29 Mar 2006 16:56:01 -0000      1.10
@@ -1,88 +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 --build=$(DEB_BUILD_GNU_TYPE) 
--host=$(DEB_HOST_GNU_TYPE)
-package=libecore0
-
-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
-       -rm -f configure-stamp build-stamp
-
-       dh_clean
-
-install: build 
-       dh_testdir
-       dh_testroot
-       dh_clean -k
-       dh_installdirs
-
-       $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/
-
-# 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 AUTHORS README
-       dh_installchangelogs
-       dh_install --sourcedir=debian/tmp --list-missing
-       dh_strip
-       dh_compress
-       dh_fixperms
-       dh_installdeb
-       dh_makeshlibs
-       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 
--disable-ecore-dfb --disable-ecore-evas-dfb; fi




-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to