E CVS: libs/imlib2_loaders swielinga

[<enl...@li...>]

Enlightenment CVS committal

Author  : swielinga
Project : e17
Module  : libs/imlib2_loaders

Dir     : e17/libs/imlib2_loaders/debian


Modified Files:
	changelog control rules 


Log Message:
Big overhaul of a lot of the debian packages

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/imlib2_loaders/debian/changelog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- changelog	4 Jan 2003 12:45:25 -0000	1.4
+++ changelog	21 Aug 2003 16:21:11 -0000	1.5
@@ -1,5 +1,5 @@
-imlib2-loaders (1.0.5-0cvs20020104) unstable; urgency=low
+imlib2-loaders (1.0.5-0cvs20030821) unstable; urgency=low
 
   * a CVS release
   
- -- Sytse Wielinga <s.b...@st...>  Sat,  4 Jan 2003 13:26:21 +0100
+ -- Sytse Wielinga <s.b...@st...>  Thu, 21 Aug 2003 18:18:04 +0200
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/imlib2_loaders/debian/control,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- control	4 Jan 2003 12:45:25 -0000	1.3
+++ control	21 Aug 2003 16:21:11 -0000	1.4
@@ -1,8 +1,8 @@
 Source: imlib2-loaders
 Section: libs
 Priority: optional
-Maintainer: Laurence J. Lane <lj...@de...>
-Build-Depends: debhelper (>= 3.0), libimlib2-dev, libedb1-dev, libeet0-dev
+Maintainer: Sytse Wielinga <s.b...@st...>
+Build-Depends: debhelper (>> 4.0.0), libimlib2-dev, libedb1-dev, libeet0-dev
 Standards-Version: 3.5.8.0
 
 Package: imlib2-loaders
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/imlib2_loaders/debian/rules,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- rules	15 Mar 2002 00:18:25 -0000	1.3
+++ rules	21 Aug 2003 16:21:11 -0000	1.4
@@ -10,24 +10,30 @@
 #export DH_VERBOSE=1
 
 # This is the debhelper compatability version to use.
-export DH_COMPAT=2
+export DH_COMPAT=4
 
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
 
-INSTALL=/usr/bin/install
+# 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=imlib2-loaders
 
 configure: configure-stamp
 configure-stamp:
-	./autogen.sh --prefix=/usr || ./configure --prefix=/usr
+	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
@@ -37,11 +43,9 @@
 	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
@@ -50,13 +54,9 @@
 
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/$(package)/
 
-binary-indep:
+binary-indep: build install
 
-# 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
@@ -64,13 +64,12 @@
 	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