[prev in list] [next in list] [prev in thread] [next in thread] 

List:       enlightenment-devel
Subject:    [E-devel] Re: [PATCH] ... to debianize eet and evas2 (and bugfix)
From:       Jens Taprogge <ln () idg ! rwth-aachen ! de>
Date:       2002-08-11 16:30:41
[Download RAW message or body]

Title should say it all. The debianizing is heavyly based on ljlanes work
on other e packages.

The most tricky part is the reordering of the gcc include options in
evas2. Otherwise unsing --prefix=/usr causes trouble since it will look
in /usr/include before it checks /usr/include/freetype2. IMHO this
should probably go into CVS.

I hope the patches are useful to someone.

Jens

["evas2_debian.patch" (text/plain)]

diff -urN evas2/debian/changelog evas2_debian/debian/changelog
--- evas2/debian/changelog	Thu Jan  1 01:00:00 1970
+++ evas2_debian/debian/changelog	Sat Aug 10 18:51:31 2002
@@ -0,0 +1,5 @@
+evas (1.0.0-pre4-cvs20020810) unstable; urgency=low
+
+  * a cvs build of evas2
+
+ -- Jens Taprogge <jens.taprogge@post.rwth-aachen.de>  Wed,  8 May 2002 15:15:16 \
                +0200
diff -urN evas2/debian/control evas2_debian/debian/control
--- evas2/debian/control	Thu Jan  1 01:00:00 1970
+++ evas2_debian/debian/control	Sat Aug 10 18:18:23 2002
@@ -0,0 +1,23 @@
+Source: evas
+Section: libs
+Priority: optional
+Build-Depends: xlibs-dev, xlibmesa-dev, libttf-dev, libimlib2-dev, debhelper (>=2.0)
+Standards-Version: 3.5.6.0
+
+Package: libevas1
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Conflicts: libevas0
+Description: enlightenment advanced canvas library.
+
+Package: libevas1-dev
+Section: devel
+Architecture: any
+Depends: libevas1 (= ${Source-Version}), libc6-dev
+Conflicts: libevas0-dev
+Description: development files for evas 
+ Headers and static libraries required to develop against evas. This version
+ in incompatible with the one found in the libevas0{,-dev} packages.
+
+
diff -urN evas2/debian/copyright evas2_debian/debian/copyright
--- evas2/debian/copyright	Thu Jan  1 01:00:00 1970
+++ evas2_debian/debian/copyright	Sat Aug 10 18:50:05 2002
@@ -0,0 +1,27 @@
+This package was debianized by Jens Taprogge 
+<jens.taprogge@post.rwth-aachen.de> on Sat Aug 10 18:46:32 CEST 2002.
+
+The source code was downloaded from the enlightenment CVS repository.
+
+    cvs.enlightenment.sourceforge.net:/cvsroot/enlightenment/evas2
+
+Copyright (C) 2000 Carsten Haitzler and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+  
+The above copyright notice and this permission notice shall be included in
+all copies of the Software, its documentation and marketing & publicity 
+materials, and acknowledgment shall be given in the documentation, materials
+and software packages that this Software was used.
+   
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff -urN evas2/debian/libevas1.postinst evas2_debian/debian/libevas1.postinst
--- evas2/debian/libevas1.postinst	Thu Jan  1 01:00:00 1970
+++ evas2_debian/debian/libevas1.postinst	Sat Aug 10 18:10:24 2002
@@ -0,0 +1,8 @@
+#!/bin/sh -e
+
+if test "$1" = "configure"; then
+  ldconfig
+fi
+
+#DEBHELPER#
+
diff -urN evas2/debian/rules evas2_debian/debian/rules
--- evas2/debian/rules	Thu Jan  1 01:00:00 1970
+++ evas2_debian/debian/rules	Sat Aug 10 15:57:18 2002
@@ -0,0 +1,78 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+export DH_COMPAT=2
+
+cfg:=--prefix=/usr --datadir=/usr/share \
+--enable-software-x11 \
+--enable-image-loader-png \
+--enable-image-loader-jpeg \
+--enable-cpu-p2-only \
+--enable-cpu-mmx \
+--enable-cpu-sse \
+--enable-cpu-c \
+--enable-scale-smooth \
+--enable-scale-sample \
+--enable-convert-8-rgb-332 \
+--enable-convert-8-rgb-666 \
+--enable-convert-8-rgb-232 \
+--enable-convert-8-rgb-222 \
+--enable-convert-8-rgb-221 \
+--enable-convert-8-rgb-121 \
+--enable-convert-8-rgb-111 \
+--enable-convert-16-rgb-565 \
+--enable-convert-16-rgb-555 \
+--enable-convert-16-rgb-rot-0 \
+--enable-convert-32-rgb-8888 \
+--enable-convert-32-bgr-8888 \
+--enable-convert-32-rgb-rot-0
+
+INSTALL=/usr/bin/install
+package=libevas1
+
+build: build-stamp
+build-stamp:
+	dh_testdir
+	test -x autogen.sh && ./autogen.sh $(cfg) || ./configure $(cfg)
+	$(MAKE) CFLAGS="-O9 -mpentiumpro -march=pentiumpro -mcpu=pentiumpro"
+	touch build-stamp
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+	-$(MAKE) distclean
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/$(package)
+	
+	$(INSTALL) -d debian/$(package)-dev/usr/lib \
+		      debian/$(package)-dev/usr/bin
+	mv debian/$(package)/usr/include debian/$(package)-dev/usr/
+	mv debian/$(package)/usr/bin/evas-config debian/$(package)-dev/usr/bin
+
+binary-indep: build install
+
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installdocs AUTHORS README
+	dh_installchangelogs
+	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
diff -urN evas2/src/lib/canvas/Makefile.am evas2_debian/src/lib/canvas/Makefile.am
--- evas2/src/lib/canvas/Makefile.am	Wed Jul  3 09:28:11 2002
+++ evas2_debian/src/lib/canvas/Makefile.am	Sat Aug 10 18:05:25 2002
@@ -10,9 +10,9 @@
                        -I. \
 		       -I$(top_srcdir)/src/lib \
 		       -I$(top_srcdir)/src/lib/include \
-		       -I$(includedir) \
+		       @freetype_cflags@ @x_cflags@ @DIRECTFB_CFLAGS@ \
                        -I/usr/local/include \
-		       @freetype_cflags@ @x_cflags@ @DIRECTFB_CFLAGS@
+		       -I$(includedir)
 
 noinst_LTLIBRARIES   = libevas_canvas.la
 libevas_canvas_la_SOURCES  = \
diff -urN evas2/src/lib/data/Makefile.am evas2_debian/src/lib/data/Makefile.am
--- evas2/src/lib/data/Makefile.am	Wed Jun 19 07:07:13 2002
+++ evas2_debian/src/lib/data/Makefile.am	Sat Aug 10 18:04:38 2002
@@ -10,9 +10,9 @@
                        -I. \
 		       -I$(top_srcdir)/src/lib \
 		       -I$(top_srcdir)/src/lib/include \
-		       -I$(includedir) \
+		       @freetype_cflags@ \
                        -I/usr/local/include \
-		       @freetype_cflags@
+		       -I$(includedir)
 
 noinst_LTLIBRARIES      = libevas_data.la
 libevas_data_la_SOURCES  = \
diff -urN evas2/src/lib/engines/common/Makefile.am \
                evas2_debian/src/lib/engines/common/Makefile.am
--- evas2/src/lib/engines/common/Makefile.am	Thu Jul  4 09:33:06 2002
+++ evas2_debian/src/lib/engines/common/Makefile.am	Sat Aug 10 18:06:18 2002
@@ -10,9 +10,9 @@
                        -I. \
 		       -I$(top_srcdir)/src/lib \
 		       -I$(top_srcdir)/src/lib/include \
+		       @freetype_cflags@ \
 		       -I$(includedir) \
-                       -I/usr/local/include \
-		       @freetype_cflags@
+                       -I/usr/local/include
 
 noinst_LTLIBRARIES      = libevas_engine_common.la
 libevas_engine_common_la_SOURCES  = \
diff -urN evas2/src/lib/engines/directfb/Makefile.am \
                evas2_debian/src/lib/engines/directfb/Makefile.am
--- evas2/src/lib/engines/directfb/Makefile.am	Tue Jul 30 08:38:55 2002
+++ evas2_debian/src/lib/engines/directfb/Makefile.am	Sat Aug 10 18:06:00 2002
@@ -10,10 +10,10 @@
                        -I. \
 		       -I$(top_srcdir)/src/lib \
 		       -I$(top_srcdir)/src/lib/include \
-		       -I$(includedir) \
+		       @DIRECTFB_CFLAGS@ \
+		       @freetype_cflags@ \
                        -I/usr/local/include \
-		       @DIRECTFB_CFLAGS@\
-		       @freetype_cflags@
+		       -I$(includedir)
 
 if BUILD_ENGINE_DIRECTFB
 
diff -urN evas2/src/lib/engines/fb/Makefile.am \
                evas2_debian/src/lib/engines/fb/Makefile.am
--- evas2/src/lib/engines/fb/Makefile.am	Tue Jul 30 08:38:55 2002
+++ evas2_debian/src/lib/engines/fb/Makefile.am	Sat Aug 10 18:06:56 2002
@@ -10,9 +10,9 @@
                        -I. \
 		       -I$(top_srcdir)/src/lib \
 		       -I$(top_srcdir)/src/lib/include \
+		       @freetype_cflags@ \
 		       -I$(includedir) \
-                       -I/usr/local/include \
-		       @freetype_cflags@
+                       -I/usr/local/include
 
 if BUILD_ENGINE_FB
 
diff -urN evas2/src/lib/engines/software_x11/Makefile.am \
                evas2_debian/src/lib/engines/software_x11/Makefile.am
--- evas2/src/lib/engines/software_x11/Makefile.am	Tue Jul 30 08:38:55 2002
+++ evas2_debian/src/lib/engines/software_x11/Makefile.am	Sat Aug 10 18:06:40 2002
@@ -10,9 +10,9 @@
                        -I. \
 		       -I$(top_srcdir)/src/lib \
 		       -I$(top_srcdir)/src/lib/include \
+		       @freetype_cflags@ @x_cflags@ \
 		       -I$(includedir) \
-                       -I/usr/local/include \
-		       @freetype_cflags@ @x_cflags@
+                       -I/usr/local/include
 
 if BUILD_ENGINE_SOFTWARE_X11
 
diff -urN evas2/src/lib/file/Makefile.am evas2_debian/src/lib/file/Makefile.am
--- evas2/src/lib/file/Makefile.am	Sat Jul  6 01:35:33 2002
+++ evas2_debian/src/lib/file/Makefile.am	Sat Aug 10 18:05:04 2002
@@ -10,9 +10,9 @@
                        -I. \
 		       -I$(top_srcdir)/src/lib \
 		       -I$(top_srcdir)/src/lib/include \
-		       -I$(includedir) \
+		       @freetype_cflags@ \
                        -I/usr/local/include \
-		       @freetype_cflags@
+		       -I$(includedir)
 
 noinst_LTLIBRARIES      = libevas_file.la
 libevas_file_la_SOURCES  = \


["eet_debian.patch" (text/plain)]

diff -urN eet/configure eet_debian/configure
--- eet/configure	Sat Aug 10 12:12:34 2002
+++ eet_debian/configure	Sat Aug 10 18:43:10 2002
@@ -127,6 +127,10 @@
   
 if [ -n "$INSTALL" ]; then
   # install
+
+  if [ -n "$DESTDIR" ] ; then
+    PREFIX=$DESTDIR/$PREFIX
+  fi
   
   echo "Installing..."
   install -d $PREFIX"/lib"
diff -urN eet/debian/changelog eet_debian/debian/changelog
--- eet/debian/changelog	Thu Jan  1 01:00:00 1970
+++ eet_debian/debian/changelog	Sat Aug 10 18:51:41 2002
@@ -0,0 +1,5 @@
+eet (0.0.0-cvs20020810) unstable; urgency=low
+
+  * a cvs build of eet
+
+ -- Jens Taprogge <jens.taprogge@post.rwth-aachen.de>  Wed,  8 May 2002 15:15:16 +0200
diff -urN eet/debian/control eet_debian/debian/control
--- eet/debian/control	Thu Jan  1 01:00:00 1970
+++ eet_debian/debian/control	Sat Aug 10 18:40:43 2002
@@ -0,0 +1,19 @@
+Source: eet
+Section: libs
+Priority: optional
+Build-Depends: zlib1g-dev, debhelper (>=2.0)
+Standards-Version: 3.5.6.0
+
+Package: libeet0
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: EET. E file chunk reading/writing library
+
+Package: libeet0-dev
+Section: devel
+Architecture: any
+Depends: libeet0 (= ${Source-Version}), libc6-dev
+Description: development files for EET.
+
+
diff -urN eet/debian/copyright eet_debian/debian/copyright
--- eet/debian/copyright	Thu Jan  1 01:00:00 1970
+++ eet_debian/debian/copyright	Sat Aug 10 18:49:19 2002
@@ -0,0 +1,27 @@
+This package was debianized by Jens Taprogge 
+<jens.taprogge@post.rwth-aachen.de> on Sat Aug 10 18:46:32 CEST 2002.
+
+The source code was downloaded from the enlightenment CVS repository.
+
+    cvs.enlightenment.sourceforge.net:/cvsroot/enlightenment/eet
+
+Copyright (C) 2000 Carsten Haitzler and various contributors (see AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+  
+The above copyright notice and this permission notice shall be included in
+all copies of the Software, its documentation and marketing & publicity 
+materials, and acknowledgment shall be given in the documentation, materials
+and software packages that this Software was used.
+   
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff -urN eet/debian/libeet0.postinst eet_debian/debian/libeet0.postinst
--- eet/debian/libeet0.postinst	Thu Jan  1 01:00:00 1970
+++ eet_debian/debian/libeet0.postinst	Sat Aug 10 18:10:24 2002
@@ -0,0 +1,8 @@
+#!/bin/sh -e
+
+if test "$1" = "configure"; then
+  ldconfig
+fi
+
+#DEBHELPER#
+
diff -urN eet/debian/rules eet_debian/debian/rules
--- eet/debian/rules	Thu Jan  1 01:00:00 1970
+++ eet_debian/debian/rules	Sat Aug 10 18:42:07 2002
@@ -0,0 +1,55 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+export DH_COMPAT=2
+
+cfg:=--prefix=/usr
+INSTALL=/usr/bin/install
+package=libeet0
+
+build: build-stamp
+build-stamp:
+	dh_testdir
+	./configure $(cfg)
+	./make
+	touch build-stamp
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+	-./make clean
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	DESTDIR=$(CURDIR)/debian/$(package) ./make install
+	
+	$(INSTALL) -d debian/$(package)-dev/usr/lib \
+		      debian/$(package)-dev/usr/bin
+	mv debian/$(package)/usr/include debian/$(package)-dev/usr/
+	mv debian/$(package)/usr/bin/eet-config debian/$(package)-dev/usr/bin
+
+binary-indep: build install
+
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installdocs AUTHORS README
+	dh_installchangelogs
+	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


-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic