[Pkg-e-commits] [SCM] D-Bus integration for EFL based applications branch, upstream-vcs, updated. de96e02c71c95d629bfde702b223060254b81ef7

Sat May 24 16:10:46 UTC 2008

The following commit has been merged in the upstream-vcs branch:
commit e7cc9c206651dabaaebb8f64d09b3ca8a79a96b0
Author: kaethorn <kaethorn>
Date:   Mon Apr 28 15:09:13 2008 +0000

    Merge with Debian files from PkgE.

diff --git a/debian/changelog.in b/debian/changelog.in
index d41185d..97eb7b7 100644
--- a/debian/changelog.in
+++ b/debian/changelog.in
@@ -1,6 +1,6 @@
-e-dbus (@VERSION at -1) unstable; urgency=low
+edbus (@VERSION at -1) unstable; urgency=low
 
   * CVS snapshot.
 
- -- E17 Debian Team <debian at edevelop.org>  Sun, 24 Jun 2007 09:55:42 +0000
+ -- Falko Schmidt <falko at alphagemini.org>  Mon, 28 Apr 2008 15:53:27 +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 c5839e2..86f81f0 100644
--- a/debian/control
+++ b/debian/control
@@ -1,39 +1,28 @@
-Source: e-dbus
+Source: edbus
 Section: libs
 Priority: optional
-Maintainer: E17 Debian Team <debian at edevelop.org>
-Build-Depends: cdbs, debhelper (>= 5), libecore0-dev, libewl0-dev, libdbus-1-dev, libefreet0-dev
-Standards-Version: 3.7.2
+Maintainer: Falko Schmidt <falko at alphagemini.org>
+Build-Depends: debhelper (>= 6), cdbs, libecore-dev, libdbus-1-dev, libevas-dev
+Standards-Version: 3.7.3
+Homepage: http://www.enlightenment.org
 
-Package: libe-dbus0
+Package: libedbus-dev
+Section: libdevel
 Architecture: any
-Depends: ${shlibs:Depends}, libecore0, libefreet0, libdbus-1-3
-Provides: libe-dbus
-Recommends: libe-dbus0-bin | libe-dbus-bin
-Description: enlightenment interface to dbus
- e-dbus implements some basic convenience wrappers around dbus
- to ease integrating dbus with EFL based applications.
+Depends: libedbus0 (= ${binary:Version}), libdbus-1-dev
+Replaces: libe-dbus0-dev
+Description: D-Bus and HAL wrapper libraries for use with the EFL - Development files
+ Wrappers around D-Bus to ease integrating D-Bus with EFL based applications.
  .
- This package contains the e_dbus library.
+ This packages contains headers and static libraries for libedbus, libehal and
+ libenotify
 
-Package: libe-dbus0-dev
-Section: devel
-Architecture: any
-Depends: ${shlibs:Depends}, libe-dbus0-dev, libecore0-dev, libefreet0-dev, libdbus-1-dev
-Provides: libe-dbus-dev
-Description: enlightenment interface to dbus - develpment files
- e-dbus implements some basic convenience wrappers around dbus
- to ease integrating dbus with EFL based applications.
- .
- This package contains the e_dbus headers and static libraries.
-
-Package: libe-dbus0-bin
+Package: libedbus0
 Architecture: any
 Depends: ${shlibs:Depends}
-Provides: libe-dbus-bin
-Description: enlightenment interface to dbus - helper applications
- e-dbus implements some basic convenience wrappers around dbus
- to ease integrating dbus with EFL based applications.
- .
- This package contains the e_dbus helper applications e_dbus_hal and
- e_dbus_nm.
+Replaces: libe-dbus0
+Description: D-Bus and HAL wrapper libraries for use with the EFL
+ This package contains:
+ - libedbus0 and libehal0 : D-Bus and HAL-related wrappers to ease integrating
+   D-Bus and HAL with EFL-based applications
+ - libenotify0 : provides an EFL-based notification support
diff --git a/debian/copyright b/debian/copyright
index 23d7a89..4ee41bb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,37 +1,49 @@
-This package was debianized by E17 Debian Team <debian at edevelop.org> on
-Sun, 24 Jun 2007 09:55:42 +0000.
+This package was debianized by Falko Schmidt <falko at alphagemini.org> on
+Mon, 28 Apr 2008 16:04:35 +0000.
 
-It was downloaded from the e17/proto/entrance_edit_gui module of the
-enlightenment CVS tree. For more information, see:
+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/cvs.html
 
-Upstream Author(s): Brian Mattern <rephorm at rephorm.com>
+Upstream Author: Brian Mattern <rephorm at rephorm.com>
 
 Copyright: 
 
-Copyright (C) 2007 Brian Mattern
+  Copyright (C) 2007 Brian Mattern and various contributor
 
 License:
 
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted under the terms of the BSD License.
-
-    THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-    ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-    SUCH DAMAGE.
-
-On Debian systems, the complete text of the BSD License can be 
-found in `/usr/share/common-licenses/BSD'.
-
-
-The Debian packaging is (C) 2007, E17 Debian Team <debian at edevelop.org> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+  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 and its Copyright notices. In addition publicly
+  documented acknowledgment must be given that this software has been used if no
+  source code of this software is made available publicly. This includes
+  acknowledgments in either Copyright notices, Manuals, Publicity and Marketing
+  documents or any documentation provided with any product containing this
+  software. This License does not apply to any software that links to the
+  libraries provided by this software (statically or dynamically), but only to
+  the software provided.
+
+  Please see the COPYING.PLAIN for a plain-english explanation of this notice
+  and it's intent.
+
+  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/libe-dbus0-dev.install b/debian/libedbus-dev.install
similarity index 61%
copy from debian/libe-dbus0-dev.install
copy to debian/libedbus-dev.install
index efd2d2b..9af979d 100644
--- a/debian/libe-dbus0-dev.install
+++ b/debian/libedbus-dev.install
@@ -1,5 +1,4 @@
-debian/tmp/usr/lib/*.la
 debian/tmp/usr/lib/*.a
 debian/tmp/usr/lib/*.so
-debian/tmp/usr/include/*.h
+debian/tmp/usr/include/*
 debian/tmp/usr/lib/pkgconfig/*.pc
diff --git a/debian/libe-dbus0.install b/debian/libedbus0.install
similarity index 100%
copy from debian/libe-dbus0.install
copy to debian/libedbus0.install
diff --git a/debian/rules b/debian/rules
index 0eaa958..378c8aa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
-debian/stamp-autotools-files:
-	./autogen.sh --prefix=/usr
-	touch debian/stamp-autotools-files
+DEB_MAKE_CLEAN_TARGET := clean
+
+clean::
+	./autogen.sh --prefix=/usr $(DEB_CONFIGURE_EXTRA_FLAGS)

-- 
D-Bus integration for EFL based applications

