[Pkg-e-commits] [SCM] Enlightenment DR17 file chunk reading/writing library branch, upstream-vcs, updated. 67bc060f7c13fcbcf46c1ecbfdb92e8529574b9b

kaethorn kaethorn at alioth.debian.org
Tue Apr 29 15:56:52 UTC 2008 

The following commit has been merged in the upstream-vcs branch:
commit 67bc060f7c13fcbcf46c1ecbfdb92e8529574b9b
Author: kaethorn <kaethorn>
Date:   Mon Apr 28 15:03:53 2008 +0000

    Merge with Debian files from PkgE.

diff --git a/debian/changelog.in b/debian/changelog.in
index 75b443a..37c09ac 100644
--- a/debian/changelog.in
+++ b/debian/changelog.in
@@ -2,5 +2,4 @@ eet (@VERSION at -1) unstable; urgency=low
 
   * a CVS snapshot release.
 
- -- E17 Debian Team <debian at edevelop.org>  Tue,  7 Mar 2006 13:30:15 +0000
-
+ -- Falko Schmidt <falko at alphagemini.org>  Fri,  4 Apr 2008 15:13:56 +0000
diff --git a/debian/compat b/debian/compat
index b8626c4..1e8b314 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+6
diff --git a/debian/control b/debian/control
index 62d40d8..1a4527a 100644
--- a/debian/control
+++ b/debian/control
@@ -1,26 +1,46 @@
 Source: eet
 Section: libs
 Priority: optional
-Maintainer: E17 Debian Team <debian at edevelop.org>
-Build-Depends: debhelper (>> 4.2.0), cdbs (>= 0.4.23-1.1), automake1.7 | automaken, libtool, zlib1g-dev, libjpeg62-dev
-Standards-Version: 3.6.2.2
+Maintainer: Falko Schmidt <falko at alphagemini.org>
+Build-Depends: debhelper (>= 6), cdbs, zlib1g-dev, libjpeg62-dev, doxygen
+Standards-Version: 3.7.3
+Homepage: http://www.enlightenment.org
 
-Package: libeet0-dev
+Package: libeet-dev
 Section: libdevel
 Architecture: any
 Depends: libeet0 (= ${Source-Version}), zlib1g-dev, libjpeg-dev
-Provides: libeet-dev
-Conflicts: libeet-dev
-Description: Enlightenment file chunk reading/writing library development files
- This package contains headers and static libraries for development with
+Provides: libeet0-dev
+Conflicts: libeet0-dev
+Description: Enlightenment DR17 file chunk reading/writing library development files
+ Eet is a tiny library designed to write an arbitary set of chunks of data to a
+ file and optionally compress each chunk (very much like a zip file) and allow
+ fast random-access reading of the file later on. It does not do zip as zip
+ itself has more complexity than we need, and it was much simpler to implement
+ this once here.
+ .
+ This package contains headers and static libraries for development with libeet.
+ libeet.
+
+Package: libeet-doc
+Section: doc
+Architecture: all
+Enhances: libeet-dev
+Description: libeet0 API documentation
+ Eet is a tiny library designed to write an arbitary set of chunks of data to a
+ file and optionally compress each chunk (very much like a zip file) and allow
+ fast random-access reading of the file later on. It does not do zip as zip
+ itself has more complexity than we need, and it was much simpler to implement
+ this once here.
+ .
+ This package contains documentation (html and manpages) for development with
  libeet.
 
 Package: libeet0
-Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
 Provides: libeet
-Description: Enlightenment file chunk reading/writing library
+Description: Enlightenment DR17 file chunk reading/writing library
  Eet is a tiny library designed to write an arbitary set of chunks of data to a
  file and optionally compress each chunk (very much like a zip file) and allow
  fast random-access reading of the file later on. It does not do zip as zip
@@ -28,3 +48,33 @@ Description: Enlightenment file chunk reading/writing library
  this once here.
  .
  It's small, fast, and does a job. It's heavily commented and fully documented.
+
+Package: libeet-bin
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Enlightenment DR17 file chunk reading/writing utility
+ Eet is a tiny library designed to write an arbitary set of chunks of data to a
+ file and optionally compress each chunk (very much like a zip file) and allow
+ fast random-access reading of the file later on. It does not do zip as zip
+ itself has more complexity than we need, and it was much simpler to implement
+ this once here.
+ .
+ This package contains eet, an utility that allows you to extract, insert,
+ encode and decode config blobs created with libeet.
+
+Package: libeet-dbg
+Architecture: any
+Section: libdevel
+Priority: extra
+Depends: libeet0 (= ${binary:Version})
+Description: Enlightenment DR17 file chunk reading/writing library - debug symbols
+ Eet is a tiny library designed to write an arbitary set of chunks of data to a
+ file and optionally compress each chunk (very much like a zip file) and allow
+ fast random-access reading of the file later on. It does not do zip as zip
+ itself has more complexity than we need, and it was much simpler to implement
+ this once here
+ .
+ This package contains unstripped shared libraries. It is provided primarily
+ to provide a backtrace with names in a debugger, this makes it somewhat easier
+ to interpret core dumps. The libraries are installed in /usr/lib/debug and
+ are automatically used by gdb.
diff --git a/debian/copyright b/debian/copyright
index c198498..7dc25b6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,32 +1,41 @@
-This package was debianized by E17 Debian Team <debian at edevelop.org> on
-Thu,  3 Oct 2002 12:08:24 +0200.
+This package was debianized by Falko Schmidt <falko at alphagemini.org> on
+Fri,  4 Apr 2008 12:23:41 +0000.
 
 The source is downloaded from the e17/libs/eet module of the enlightenment CVS 
 tree. For more information, see:
 
-  http://www.enlightenment.org/cvs.html
+  http://www.enlightenment.org
 
 Upstream Authors: Enlightenment team <enlightenment-devel at lists.sourceforge.net>
 
 Copyright:
 
-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.
+  Copyright (C) 2000 Carsten Haitzler and various contributors (see AUTHORS)
+
+License:
+
+  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.
+
+On Debian systems, the complete text of the BSD License can be found
+in `/usr/share/common-licenses/BSD'.
+
+The Debian packaging is:
+  (C) 2006 2007,Debian Pkg-e Team <pkg-e-devel at lists.alioth.debian.org>
+  and is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
diff --git a/debian/eet.1 b/debian/eet.1
new file mode 100644
index 0000000..2abe11c
--- /dev/null
+++ b/debian/eet.1
@@ -0,0 +1,50 @@
+.TH EET 1 "November 4, 2007" eet
+.SH NAME
+eet \- Small tool to handle eet files.
+.SH SYNOPSIS
+.B eet
+.RI -l " FILE.EET"
+.br
+.B eet
+.RI -r " FILE.EET KEY"
+.br
+.B eet
+.RI "-x|-d" " FILE.EET KEY OUT-FILE"
+.br
+.B eet
+.RI "-i|-e" " FILE.EET KEY IN-FILE COMPRESS"
+.br
+.SH DESCRIPTION
+This manual page documents briefly the
+.B eet
+command
+.PP
+\fBeet\fP is a program that can extract, import, delete, list, decode and encode data from eet files.
+.SH OPTIONS
+.TP
+.B \-l
+List all keys in FILE.EET.
+.TP
+.B \-r
+Remove KEY in FILE.EET.
+.TP
+.B \-x
+Extract data stored in KEY in FILE.EET and write to OUT-FILE
+.TP
+.B \-d
+Extract and decode data stored in KEY in FILE.EET and write to OUT-FILE
+.TP
+.B \-i
+Insert data to KEY in FILE.EET from IN-FILE and if COMPRESS is 1, compress it
+.TP
+.B \-e
+Insert and encode to KEY in FILE.EET from IN-FILE and if COMPRESS is 1, compress it
+.SH BUGS
+To report a bug, please visit \fIhttp://bugs.enlightenment.org/\fR
+.SH AUTHOR
+.TP
+eet was written by the Enlightenment Development Team
+.I http://web.enlightenment.org
+.PP
+This manual page was written by Albin Tonnerre <albin.tonnerre at gmail.com>,
+for the Debian project (but may be used by others).
diff --git a/debian/libeet-bin.install b/debian/libeet-bin.install
new file mode 100644
index 0000000..3399d7b
--- /dev/null
+++ b/debian/libeet-bin.install
@@ -0,0 +1 @@
+debian/tmp/usr/bin/eet
diff --git a/debian/libeet0-dev.install b/debian/libeet-dev.install
similarity index 80%
copy from debian/libeet0-dev.install
copy to debian/libeet-dev.install
index d33fb9b..4a70bfa 100644
--- a/debian/libeet0-dev.install
+++ b/debian/libeet-dev.install
@@ -2,4 +2,3 @@ debian/tmp/usr/lib/pkgconfig/*
 debian/tmp/usr/include/*
 debian/tmp/usr/lib/lib*.a
 debian/tmp/usr/lib/lib*.so
-debian/tmp/usr/lib/lib*.la
diff --git a/debian/libeet-doc.dirs b/debian/libeet-doc.dirs
new file mode 100644
index 0000000..a110659
--- /dev/null
+++ b/debian/libeet-doc.dirs
@@ -0,0 +1 @@
+usr/share/doc/libeet-doc
diff --git a/debian/libeet-doc.doc-base b/debian/libeet-doc.doc-base
new file mode 100644
index 0000000..2d1ef1f
--- /dev/null
+++ b/debian/libeet-doc.doc-base
@@ -0,0 +1,10 @@
+Document: eet
+Title: Eet Guide
+Author: Carsten Haitzler
+Abstract: This document describes Eet API
+ and provides sample C code.
+Section: Programming/C
+
+Format: HTML
+Index: /usr/share/doc/libeet-doc/html/index.html
+Files: /usr/share/doc/libeet-doc/html/*.html
diff --git a/debian/rules b/debian/rules
index 83ae281..3833157 100644
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,22 @@
 #!/usr/bin/make -f
-# Rewrote debian/rules to use cdbs.
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
+DEB_INSTALL_MANPAGES_libeet-doc := $(DEB_SRCDIR)/doc/man/man3/*.3
+DEB_INSTALL_MANPAGES_libeet-bin := $(DEB_SRCDIR)/debian/eet.1
+DEB_DH_STRIP_ARGS := --dbg-package=libeet-dbg
+DEB_CONFIGURE_EXTRA_FLAGS := --disable-rpath
 DEB_MAKE_CLEAN_TARGET := clean
 
+build/libeet-doc::
+	cd $(DEB_SRCDIR) && ./gendoc
+
+install/libeet-doc::
+	cp -R $(DEB_SRCDIR)/doc/html debian/libeet-doc/usr/share/doc/libeet-doc/
+	rm $(DEB_SRCDIR)/doc/man/man3/todo.3
+
 clean::
-        if [ -f $(CURDIR)/../../snapshot ]; then ./autogen.sh --prefix=/usr; fi
-	
+	rm -rf $(DEB_SRCDIR)/doc/html $(DEB_SRCDIR)/doc/latex $(DEB_SRCDIR)/doc/man
+	rm -rf $(DEB_SRCDIR)/eet_docs.tar.gz*
+	./autogen.sh --prefix=/usr $(DEB_CONFIGURE_EXTRA_FLAGS)

-- 
Enlightenment DR17 file chunk reading/writing library

More information about the Pkg-e-commits mailing list