[Pkg-e-commits] [SCM] Enlightenment DR17 graphical layout and animation library branch, upstream-vcs, updated. f5b4e4555670cc3b4a24802eb44d7d47c379bee4

kaethorn kaethorn at alioth.debian.org
Fri May 23 22:08:38 UTC 2008


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

    Merge with Debian files from PkgE.

diff --git a/debian/changelog.in b/debian/changelog.in
index 4accd1a..aab92de 100644
--- a/debian/changelog.in
+++ b/debian/changelog.in
@@ -2,5 +2,5 @@ edje (@VERSION at -1) unstable; urgency=low
 
   * a CVS snapshot release.
 
- -- E17 Debian Team <debian at edevelop.org>  Sun, 02 Apr 2006 18:07:55 +0900
+ -- Falko Schmidt <falko at alphagemini.org>  Mon, 28 Apr 2008 15:54:13 +0000
 
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..1e8b314
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+6
diff --git a/debian/control b/debian/control
index 41ace8f..841d05e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,46 +1,73 @@
 Source: edje
 Section: libs
 Priority: optional
-Maintainer: E17 Debian Team <debian at edevelop.org>
-Suggests: edje0-bin
-Build-Depends: debhelper (>> 4.0.0), cdbs (>= 0.4.3-1.1),  automake1.7 | automaken, libtool, pkg-config, libeet-dev, libecore-dev, libevas-dev, libembryo-dev
-Standards-Version: 3.7.2
+Maintainer: Falko Schmidt <falko at alphagemini.org>
+Build-Depends: debhelper (>= 6), cdbs, libeet-dev, libevas-dev, libecore-dev,
+ libembryo-dev, doxygen
+Standards-Version: 3.7.3
+Homepage: http://www.enlightenment.org
 
-Package: edje0-bin
+Package: libedje-bin
 Architecture: any
-Section: graphics
-Depends: ${shlibs:Depends}, libedje0 (= ${Source-Version}), embryo-bin, libevas-loader-png, libevas-loader-jpeg, libevas-engine-buffer
-Provides: edje-bin
-Description: Various binaries for use with Edje
+Section: devel
+Depends: ${shlibs:Depends}, libembryo-bin, libevas-engines 
+Provides: libedje0-bin
+Description: Various binaries for use with libedje
  Edje is a graphical layout and animation library for animated resizable,
  compressed and scalable themes. It is the theming engine behind
  Enlightenment DR 0.17.
+ .
  This package contains the following binaries:
-  - edje: View and test compiled edje files.
   - edje_cc: Compiles EDC files.
   - edje_decc: Used to decompile compiled edje files.
   - edje_recc: A convenience script to recompile EDC files.
-  - edje_ls: Lists the contents of a compiled EDC file.
 
 Package: libedje0
 Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, libevas-loader-eet
+Depends: ${shlibs:Depends}
 Provides: libedje
-Suggests: edje-bin (= ${Source-Version})
+Suggests: libedje-bin (= ${binary:Version})
 Description: Graphical layout and animation library
  Edje is a graphical layout and animation library for animated resizable,
  compressed and scalable themes. It is the theming engine behind
  Enlightenment DR 0.17.
+
+Package: libedje-doc
+Architecture: all
+Section: doc
+Enhances: libedje-dev
+Provides: libedje0-doc
+Description: libedje0 development documentation
+ Edje is a graphical layout and animation library for animated resizable,
+ compressed and scalable themes. It is the theming engine behind
+ Enlightenment DR 0.17.
+ .
+ This package provides development documentation for Edje.
  
-Package: libedje0-dev
+Package: libedje-dev
+Architecture: any
+Section: libdevel
+Depends: libedje0 (= ${binary:Version}), libeet-dev, libecore-dev, libevas-dev, libembryo-dev, pkg-config
+Provides: libedje0-dev
+Description: libedje headers and static libraries
+ Edje is a graphical layout and animation library for animated resizable,
+ compressed and scalable themes. It is the theming engine behind
+ Enlightenment DR 0.17.
+ .
+ This package provides headers and shared libraries for Edje.
+
+Package: libedje-dbg
 Architecture: any
 Section: libdevel
-Suggests: edje0-bin
-Depends: libedje0 (= ${Source-Version}), libeet-dev, libecore-dev, libevas-dev, libembryo-dev
-Provides: libedje-dev
-Description: Edje headers, static libraries and documentation
+Priority: extra
+Depends: libedje0 (= ${binary:Version})
+Provides: libedje0-dbg
+Description: Graphical layout and animation library
  Edje is a graphical layout and animation library for animated resizable,
  compressed and scalable themes. It is the theming engine behind
  Enlightenment DR 0.17.
- This package provides headers, shared libraries and documentation for Edje.
+ .
+ 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 6e1daec..600a6e5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,32 +1,42 @@
-This package was debianized by Laurence J. Lane <ljlane at debian.org> on
-Sat, 28 Oct 2000 17:56:46 -0400.
+This package was debianized by Falko Schmidt <falko at alphagemini.org> on
+Sat, 20 Apr 2008 22:50:45 +0000.
 
 The source code is from the e17/libs/edje module of the enlightenment CVS
 tree. For more information, see:
 
- http://www.enlightenment.org/cvs.html
+ http://www.enlightenment.org
  
-Upstream Author: Carsten Haitzler <raster at rasterman.com>
+Upstream Authors:
+	
+	Carsten Haitzler <raster at rasterman.com>
 
 Copyright:
 
-Copyright (C) 2000 Carsten Haitzler and various contributors (see AUTHORS)
+	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.
+  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/edje_cc.1 b/debian/edje_cc.1
new file mode 100644
index 0000000..62f8685
--- /dev/null
+++ b/debian/edje_cc.1
@@ -0,0 +1,47 @@
+.TH EDJE_CC 1 "Jan 29, 2007" "0.5.0.042" "The edje compiler"
+.SH NAME
+edje_cc - an edje compiler
+.SH SYNOPSIS
+.B edje_cc
+.RI [\| OPTIONS \|]
+.B input_file.edc
+.RI [\| output_file.edj \|]
+.SH DESCRIPTION
+edje_cc is a compiler for edje files
+.SH EXAMPLES
+edje_cc -v file.edc
+.SH OPTIONS
+.BI \-id " \|image/directory
+Add a directory to look in for relative path images
+.P
+.BI \-fd " \|font/directory
+Add a directory to look in for relative path fonts
+.P
+.B \-v
+Verbose output
+.P
+.B \-no\-lossy
+Do NOT allow images to be lossy
+.P
+.B \-no\-comp
+Do NOT allow images to be stored with lossless compression
+.P
+.B \-no\-raw
+Do NOT allow images to be stored with zero compression (raw)
+.P
+.BI \-min\-quality " \|VAL
+Do NOT allow lossy images with quality < VAL (0-100)
+.P
+.BI \-max\-quality " \|VAL
+Do NOT allow lossy images with quality > VAL (0-100)
+.P
+.BI \-Ddefine_val= " \|to
+CPP style define to define input macro definitions to the .edc source
+.SH SEE ALSO
+edje_decc(1)
+.BR
+edje_recc(1)
+.SH BUGS
+Please reports bugs to the Pkg-E Team <pkg-e-devel at lists.alioth.debian.org>
+.SH AUTHOR
+This man page was written by Ronald Claveau for the Debian GNU/Linux system (but may  be  used by others).
diff --git a/debian/edje_decc.1 b/debian/edje_decc.1
new file mode 100644
index 0000000..d79785a
--- /dev/null
+++ b/debian/edje_decc.1
@@ -0,0 +1,16 @@
+.TH EDJE_DECC 1 "Jan 30, 2007" "0.5.0.042" "The edje decompiler"
+.SH NAME
+edje_decc \- an edje decompiler
+.SH SYNOPSIS
+.B edje_decc
+.B input_file.edj
+.SH DESCRIPTION
+edje_decc is a decompiler for edje files.
+.SH SEE ALSO
+edje_cc(1)
+.BR
+edje_recc(1)
+.SH BUGS
+Please reports bugs to the Pkg-E Team <pkg-e-devel at lists.alioth.debian.org>
+.SH AUTHOR
+This man page was written by Ronald Claveau for the Debian GNU/Linux system (but may  be  used by others).
diff --git a/debian/edje_recc.1 b/debian/edje_recc.1
new file mode 100644
index 0000000..985118d
--- /dev/null
+++ b/debian/edje_recc.1
@@ -0,0 +1,37 @@
+.TH EDJE_RECC 1 "Jan 30, 2007" "0.5.0.042" "The edje recompiler"
+.SH NAME
+edje_recc \- an edje recompiler
+.SH SYNOPSIS
+.B edje_recc
+.RI [\| OPTIONS \|]
+.B input_file.edj
+.SH DESCRIPTION
+edje_recc is a recompiler for edje files.
+.SH EXAMPLES
+edje_recc -v file.edj
+.SH OPTIONS
+.B -v
+Verbose output
+.P
+.B -no-lossy
+Do NOT allow images to be lossy
+.P
+.B -no-comp
+Do NOT allow images to be stored with lossless compression
+.P
+.B -no-raw
+Do NOT allow images to be stored with zero compression (raw)
+.P
+.BI -min-quality " \|VAL
+Do NOT allow lossy images with quality < VAL (0-100)
+.P
+.BI -max-quality " \|VAL
+Do NOT allow lossy images with quality > VAL (0-100)
+.SH SEE ALSO
+edje_cc(1)
+.BR
+edje_decc(1)
+.SH BUGS
+Please reports bugs to the Pkg-E Team <pkg-e-devel at lists.alioth.debian.org>
+.SH AUTHOR
+This man page was written by Ronald Claveau for the Debian GNU/Linux system (but may  be  used by others).
diff --git a/debian/edje0-bin.install b/debian/libedje-bin.install
similarity index 100%
copy from debian/edje0-bin.install
copy to debian/libedje-bin.install
diff --git a/debian/libedje-bin.manpages b/debian/libedje-bin.manpages
new file mode 100644
index 0000000..e2b8466
--- /dev/null
+++ b/debian/libedje-bin.manpages
@@ -0,0 +1 @@
+debian/edje_*.1
diff --git a/debian/libedje0-dev.install b/debian/libedje-dev.install
similarity index 81%
copy from debian/libedje0-dev.install
copy to debian/libedje-dev.install
index e31bfe7..0794b58 100644
--- a/debian/libedje0-dev.install
+++ b/debian/libedje-dev.install
@@ -1,5 +1,4 @@
 debian/tmp/usr/include/*
 debian/tmp/usr/lib/*.a
 debian/tmp/usr/lib/*.so
-debian/tmp/usr/lib/*.la
 debian/tmp/usr/lib/pkgconfig/*
diff --git a/debian/libedje-doc.dirs b/debian/libedje-doc.dirs
new file mode 100644
index 0000000..419b09b
--- /dev/null
+++ b/debian/libedje-doc.dirs
@@ -0,0 +1 @@
+usr/share/doc/libedje-doc
diff --git a/debian/libedje-doc.doc-base b/debian/libedje-doc.doc-base
new file mode 100644
index 0000000..5e51436
--- /dev/null
+++ b/debian/libedje-doc.doc-base
@@ -0,0 +1,10 @@
+Document: edje
+Title: Edje Guide
+Author: Carsten Haitzler
+Abstract: This document describes Edje API
+ and provides sample C code.
+Section: Programming/C
+
+Format: HTML
+Index: /usr/share/doc/libedje-doc/html/index.html
+Files: /usr/share/doc/libedje-doc/html/*.html
diff --git a/debian/rules b/debian/rules
index b35dea7..dda320f 100644
--- a/debian/rules
+++ b/debian/rules
@@ -3,5 +3,19 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
+#DEB_INSTALL_MANPAGES_libedje-doc := $(DEB_SRCDIR)/doc/man/man3/*.3
+DEB_DH_STRIP_ARGS := --dbg-package=libedje-dbg
+DEB_CONFIGURE_EXTRA_FLAGS := --disable-rpath
+
+build/libedje-doc::
+	cd $(DEB_SRCDIR) && doxygen
+
+install/libedje-doc::
+	cp -R $(DEB_SRCDIR)/doc/html debian/libedje-doc/usr/share/doc/libedje-doc/
+
 clean::
-	./autogen.sh --prefix=/usr
+	rm -rf $(DEB_SRCDIR)/doc/html $(DEB_SRCDIR)/doc/latex $(DEB_SRCDIR)/doc/man
+	mkdir -p $(DEB_SRCDIR)/doc/html
+	cp $(DEB_SRCDIR)/doc/img/*.png $(DEB_SRCDIR)/doc/html/
+	cp $(DEB_SRCDIR)/doc/img/*.gif $(DEB_SRCDIR)/doc/html/
+	./autogen.sh --prefix=/usr $(DEB_CONFIGURE_EXTRA_FLAGS)

-- 
Enlightenment DR17 graphical layout and animation library



More information about the Pkg-e-commits mailing list