Enlightenment CVS committal

Author  : swielinga
Project : e17
Module  : libs/etox

Dir     : e17/libs/etox/debian


Modified Files:
        Makefile.am changelog control rules 
Added Files:
        libetox0-dev.files libetox0.files 
Removed Files:
        libetox0.postinst 


Log Message:
Updated most of the debian packaging. Everything I have missed is out of date,
not important or not working.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/debian/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Makefile.am 14 Feb 2001 20:18:06 -0000      1.1
+++ Makefile.am 26 Aug 2003 13:59:05 -0000      1.2
@@ -2,5 +2,6 @@
 changelog \
 control \
 copyright \
-libetox0.postinst \
+libetox0.files \
+libetox0-dev.files \
 rules
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/debian/changelog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- changelog   31 Oct 2001 21:39:50 -0000      1.5
+++ changelog   26 Aug 2003 13:59:05 -0000      1.6
@@ -1,5 +1,5 @@
-etox (0.0.1-0cvs2001103001) unstable; urgency=low
+etox (0.0.1-0cvs20030826) unstable; urgency=low
 
   * a CVS release
   
- -- Laurence J. Lane <[EMAIL PROTECTED]>  Tue, 30 Oct 2001 13:32:28 +0000
+ -- Sytse Wielinga <[EMAIL PROTECTED]>  Tue, 26 Aug 2003 13:34:34 +0200
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/debian/control,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- control     13 Dec 2001 05:40:59 -0000      1.5
+++ control     26 Aug 2003 13:59:05 -0000      1.6
@@ -1,22 +1,26 @@
 Source: etox
 Section: libs
 Priority: optional
-Maintainer: Laurence J. Lane <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 3.0)
-Standards-Version: 3.2.1.0
+Maintainer: Sytse Wielinga <[EMAIL PROTECTED]>
+Build-Depends: libedb1-dev, libevas2-dev, libestyle0-dev, debhelper (>= 3.0)
+Standards-Version: 3.6.1.0
 
 Package: libetox0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
-Description: etox description
- etox extended description
+Description: Evas-based text layout library
+ This library is used within Enlightenment DR 0.17 for text layout. It's usable
+ within Evas-based programs for showing multiple lines of text, possibly
+ obstructed and styled with libestyle.
  
 Package: libetox0-dev
 Architecture: any
 Section: devel
 Architecture: any
-Depends: libetox0 (= ${Source-Version})
+Depends: libetox0 (= ${Source-Version}), libc6-dev | libc-dev, libedb1-dev, 
libevas2-dev, libestyle0-dev
+Provides: libetox-dev
+Conflicts: libetox-dev
 Description: libetox0 headers, static libraries and documentation
- Headers, static libraries and documentation for Imlib2.
+ Headers, static libraries and documentation for libetox0.
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/debian/rules,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- rules       14 Jan 2003 18:42:44 -0000      1.7
+++ rules       26 Aug 2003 13:59:06 -0000      1.8
@@ -1,35 +1,48 @@
 #!/usr/bin/make -f
 # Sample debian/rules that uses debhelper. 
-# GNU copyright 1997 by Joey Hess.
-#
-# This version is for a hypothetical package that builds an
-# architecture-dependant package, as well as an architecture-independent
-# package.
+# GNU copyright 1997 to 1999 by Joey Hess.
 
 # Uncomment this to turn on verbose mode. 
 #export DH_VERBOSE=1
 
+
 # This is the debhelper compatability version to use.
-export DH_COMPAT=2
+export DH_COMPAT=3
+
+
+CFLAGS ?= -Wall -g
 
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
+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
+INSTALL=/usr/bin/install -p
+CONFIGUREOPTS = --prefix=/usr --build=$(DEB_BUILD_GNU_TYPE) 
--host=$(DEB_HOST_GNU_TYPE)
 package=libetox0
 
 configure: configure-stamp
 configure-stamp:
-       ./autogen.sh --prefix=/usr || ./configure --prefix=/usr
-       touch configure-stamp
+       dh_testdir
 
+       test -x autogen.sh && ./autogen.sh $(CONFIGUREOPTS) || ./configure 
$(CONFIGUREOPTS)
+
+       touch configure-stamp
 
 build: configure build-stamp
 build-stamp:
        dh_testdir
 
-
-       SUBDIRS=src $(MAKE) 
+       $(MAKE) SUBDIRS=src
 
        touch build-stamp
 
@@ -38,43 +51,35 @@
        rm -f build-stamp configure-stamp
 
        -$(MAKE) distclean
-       -rm -f configure-stamp build-stamp
 
        dh_clean
 
-install: DH_OPTIONS=
 install: build 
        dh_testdir
        dh_testroot
        dh_clean -k
        dh_installdirs
 
-       $(MAKE) install DESTDIR=$(CURDIR)/debian/$(package)/
-       $(INSTALL) -d debian/$(package)-dev/usr/lib
-       mv debian/$(package)/usr/include debian/$(package)-dev/usr
-       mv debian/$(package)/usr/lib/*.so debian/$(package)/usr/lib/*.la \
-          debian/$(package)/usr/lib/*.a debian/$(package)-dev/usr/lib/
+       $(MAKE) install SUBDIRS=src DESTDIR=$(CURDIR)/debian/tmp
 
 binary-indep:
 
-# Build architecture-dependent files here.
-# Pass -a to all debhelper commands in this target to reduce clutter.
-binary-arch: DH_OPTIONS=-a
 binary-arch: build install
-       # Need this version of debhelper for DH_OPTIONS to work.
        dh_testdir
        dh_testroot
        dh_installdocs AUTHORS README
        dh_installchangelogs
-#      dh_strip
+       dh_movefiles
+       dh_link
+       dh_strip
        dh_compress
        dh_fixperms
-       dh_installdeb
        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
+.PHONY: build clean binary-indep binary-arch binary install configure




-------------------------------------------------------
This SF.net email is sponsored by: VM Ware
With VMware you can run multiple operating systems on a single machine.
WITHOUT REBOOTING! Mix Linux / Windows / Novell virtual machines
at the same time. Free trial click here:http://www.vmware.com/wl/offer/358/0
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to