Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/ebits

Dir     : e17/libs/ebits/debian


Modified Files:
        .cvsignore Makefile.am changelog control copyright rules 
Added Files:
        libebits0-dev.files libebits0.files 
Removed Files:
        libebits0.postinst 


Log Message:
More SPLIT merging fun. This time ebits is the lucky candidate.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ebits/debian/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- .cvsignore  14 Feb 2001 19:57:57 -0000      1.1
+++ .cvsignore  14 Jan 2003 19:10:37 -0000      1.2
@@ -1,2 +1,9 @@
 Makefile
 Makefile.in
+files
+libebits0
+libebits0-dev
+libebits0.postinst.debhelper
+libebits0.postrm.debhelper
+libebits0.substvars
+tmp
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ebits/debian/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Makefile.am 14 Feb 2001 19:57:57 -0000      1.1
+++ Makefile.am 14 Jan 2003 19:10:44 -0000      1.2
@@ -2,5 +2,6 @@
 changelog \
 control \
 copyright \
-libebits0.postinst \
+libebits0-dev.files \
+libebits0.files \
 rules
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ebits/debian/changelog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- changelog   31 Oct 2001 21:39:50 -0000      1.3
+++ changelog   14 Jan 2003 19:10:51 -0000      1.4
@@ -1,5 +1,5 @@
-ebits (0.0.2-0cvs2001103001) unstable; urgency=low
+ebits (1.0.2-0cvs20021006) unstable; urgency=low
 
   * a CVS release
   
- -- Laurence J. Lane <[EMAIL PROTECTED]>  Tue, 30 Oct 2001 13:26:29 +0000
+ -- Sytse Wielinga <[EMAIL PROTECTED]>  Sun,  6 Oct 2002 13:41:28 +0200
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ebits/debian/control,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- control     13 Dec 2001 05:40:58 -0000      1.3
+++ control     14 Jan 2003 19:11:00 -0000      1.4
@@ -1,9 +1,10 @@
 Source: ebits
 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: debhelper (>= 3.0), libedb1-dev | libedb-dev,
+               libevas2-dev | libevas-dev
+Standards-Version: 3.5.7.0
 
 Package: libebits0
 Architecture: any
@@ -16,6 +17,9 @@
 Architecture: any
 Section: devel
 Architecture: any
-Depends: libebits0 (= ${Source-Version})
+Depends: libebits0 (= ${Source-Version}), libevas2-dev | libevas-dev
+Conflicts: libebits-dev
+Replaces: libebits-dev
+Provides: libebits-dev
 Description: ebits headers, static libraries and documentation
  Headers, static libraries and documentation for Imlib2.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ebits/debian/copyright,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- copyright   24 Dec 2002 14:19:56 -0000      1.2
+++ copyright   14 Jan 2003 19:11:09 -0000      1.3
@@ -1,5 +1,5 @@
-This package was debianized by Laurence J. Lane <[EMAIL PROTECTED]> on
-Sat, 28 Oct 2000 17:56:46 -0400.
+This package was debianized Sytse Wielinga <[EMAIL PROTECTED]> on
+Sun,  6 Oct 2002 13:41:28 +0200
 
 The source code is from the e17/libs/ebits module of the enlightenment CVS
 tree. For more information, see:
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ebits/debian/rules,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- rules       15 Mar 2002 00:18:24 -0000      1.3
+++ rules       14 Jan 2003 19:12:02 -0000      1.4
@@ -1,32 +1,39 @@
 #!/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
 
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
+# 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)
+
+cfg:=--prefix=/usr --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+       CFLAGS += -g
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+       INSTALL_PROGRAM += -s
+endif
 
-INSTALL=/usr/bin/install
-package=libebits0
 
 configure: configure-stamp
 configure-stamp:
-       ./autogen.sh --prefix=/usr || ./configure --prefix=/usr
+       dh_testdir
+       test -x autogen.sh && ./autogen.sh $(cfg) || ./configure $(cfg)
        touch configure-stamp
 
-build: configure build-stamp
-build-stamp:
-       dh_testdir
 
+build: build-stamp
+build-stamp: configure-stamp
+       dh_testdir
 
        $(MAKE) 
 
@@ -37,47 +44,37 @@
        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)/
+       $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+
+binary-indep: build install
 
-       $(INSTALL) -d debian/$(package)-dev/usr/lib
-       mv debian/$(package)/usr/include debian/$(package)/usr/bin \
-          debian/$(package)-dev/usr
-       mv debian/$(package)/usr/lib/libebits.so \
-          debian/$(package)/usr/lib/libebits.la \
-          debian/$(package)/usr/lib/libebits.a debian/$(package)-dev/usr/lib/
-
-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_movefiles
+
        dh_installdocs AUTHORS README
+       dh_undocumented -plibebits0-dev ebits-config.1
        dh_installchangelogs
+       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: Take your first step towards giving 
your online business a competitive advantage. Test-drive a Thawte SSL 
certificate - our easy online guide will show you how. Click here to get 
started: http://ads.sourceforge.net/cgi-bin/redirect.pl?thaw0027en
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to