[Pkg-e-commits] [SCM] Enlightenment DR17 support for freedesktop.org specs branch, master, updated. debian/0.5.0.050+svn20081114-1-304-g8ad0199
Albin Tonnerre
albin.tonnerre at gmail.com
Mon Mar 23 23:27:48 UTC 2009
The following commit has been merged in the master branch:
commit 8ad01993b874840b72fb2b2fd1ae6a49afd1149f
Author: Albin Tonnerre <albin.tonnerre at gmail.com>
Date: Tue Mar 24 00:01:46 2009 +0100
Fix signedness issue preventing menus from working correctly on some architectures
diff --git a/debian/changelog b/debian/changelog
index 7c01cd5..76b41cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+efreet (0.5.0.050+svn20090203-2) UNRELEASED; urgency=low
+
+ * Add debian/patches/04_fix_signedness_issues.diff:
+ - Cherry-pick from SVN rev. 39610 (Closes: #514018)
+ * Bump Standards-Version to 3.8.1, no change required
+ * Name properly the shlibs file
+ * Include efreet-trash.pc in libefreet-dev
+ * make the packaging copyright point to /usr/share/common-licenses/GPL-2
+ instead of /GPL
+
+ -- Albin Tonnerre <albin.tonnerre at gmail.com> Mon, 23 Mar 2009 23:57:53 +0100
+
efreet (0.5.0.050+svn20090203-1) experimental; urgency=low
* New SVN snapshot
diff --git a/debian/control b/debian/control
index e00ea43..5ee9794 100644
--- a/debian/control
+++ b/debian/control
@@ -1,11 +1,11 @@
Source: efreet
Section: libs
Priority: optional
-Maintainer: Debian Pkg-e Team <pkg-e-devel at lists.alioth.debian.org>
+Maintainer: Debian Pkg-e Team <pkg-e-devel at lists.alioth.debian.org>
Uploaders: Albin Tonnerre <albin.tonnerre at gmail.com>,
Xavier Oswald <x.oswald at free.fr>, Jan Lübbe <jluebbe at debian.org>
Build-Depends: debhelper (>= 6), cdbs, libecore-dev (>= 0.9.9.050+svn20081201), libeina-dev (>= 0.0.1~svn20090128), doxygen, graphviz
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
Vcs-Git: git://git.debian.org/pkg-e/libs/efreet.git
Vcs-Browser: http://git.debian.org/?p=pkg-e/libs/efreet.git
Homepage: http://www.enlightenment.org
diff --git a/debian/copyright b/debian/copyright
index 35234aa..8ef0cfc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -38,4 +38,4 @@ 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'.
+and is licensed under the GPL2, see `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/libefreet-0.5.0.050a.shlibs b/debian/libefreet-0.5.0.050a.shlibs
new file mode 100644
index 0000000..086699e
--- /dev/null
+++ b/debian/libefreet-0.5.0.050a.shlibs
@@ -0,0 +1,3 @@
+libefreet 0.5.0.050a libefreet-0.5.0.050a (>= 0.5.0.050+svn20090203)
+libefreet_mime 0 libefreet-0.5.0.050a
+libefreet_trash 0 libefreet-0.5.0.050a
diff --git a/debian/libefreet-0.9.9.050a.shlibs b/debian/libefreet-0.9.9.050a.shlibs
deleted file mode 100644
index dc622ea..0000000
--- a/debian/libefreet-0.9.9.050a.shlibs
+++ /dev/null
@@ -1,3 +0,0 @@
-libefreet 0.9.9.050a libefreet-0.9.9.050a (>= 0.5.0.050+svn20090203)
-libefreet_mime 0 libefreet-0.9.9.050a
-libefreet_trash 0 libefreet-0.9.9.050a
diff --git a/debian/libefreet-dev.install b/debian/libefreet-dev.install
index 3ab9978..cd99c74 100644
--- a/debian/libefreet-dev.install
+++ b/debian/libefreet-dev.install
@@ -1,6 +1,7 @@
debian/tmp/usr/include/efreet/*.h
debian/tmp/usr/lib/pkgconfig/efreet.pc
debian/tmp/usr/lib/pkgconfig/efreet-mime.pc
+debian/tmp/usr/lib/pkgconfig/efreet-trash.pc
debian/tmp/usr/lib/libefreet.a
debian/tmp/usr/lib/libefreet_mime.a
debian/tmp/usr/lib/libefreet_trash.a
diff --git a/debian/patches/04_fix_signedness_issues.diff b/debian/patches/04_fix_signedness_issues.diff
new file mode 100644
index 0000000..6b76717
--- /dev/null
+++ b/debian/patches/04_fix_signedness_issues.diff
@@ -0,0 +1,38 @@
+diff --git a/src/lib/efreet_menu.c b/src/lib/efreet_menu.c
+index 35994fb..b8d0fef 100644
+--- a/src/lib/efreet_menu.c
++++ b/src/lib/efreet_menu.c
+@@ -61,11 +61,11 @@ struct Efreet_Menu_Internal
+
+ Ecore_List *layout; /**< This menus layout */
+ Ecore_List *default_layout; /**< Default layout */
+- char show_empty; /**< Whether to show empty menus */
+- char in_line; /**< Whether this meny can be inlined */
+- char inline_limit; /**< Number of elements which triggers inline */
+- char inline_header; /**< Whether we should use the header name when this menu is inlined */
+- char inline_alias; /**< Whether we should use the menu name when inlining */
++ signed char show_empty; /**< Whether to show empty menus */
++ signed char in_line; /**< Whether this meny can be inlined */
++ signed char inline_limit; /**< Number of elements which triggers inline */
++ signed char inline_header; /**< Whether we should use the header name when this menu is inlined */
++ signed char inline_alias; /**< Whether we should use the menu name when inlining */
+
+ unsigned char seen_allocated:1; /**< have we set the only_unallocated */
+ unsigned char only_unallocated:1; /**< Show only unallocated .desktops */
+@@ -184,11 +184,11 @@ struct Efreet_Menu_Layout
+ char *name; /**< The name of the element */
+
+ /* The items below are for Menuname Layout elements */
+- char show_empty; /**< Whether to show empty menus */
+- char in_line; /**< Whether this meny can be inlined */
+- char inline_limit; /**< Number of elements which triggers inline */
+- char inline_header; /**< Whether we should use the header name when this menu is inlined */
+- char inline_alias; /**< Whether we should use the menu name when inlining */
++ signed char show_empty; /**< Whether to show empty menus */
++ signed char in_line; /**< Whether this meny can be inlined */
++ signed char inline_limit; /**< Number of elements which triggers inline */
++ signed char inline_header; /**< Whether we should use the header name when this menu is inlined */
++ signed char inline_alias; /**< Whether we should use the menu name when inlining */
+ };
+
+ /**
--
Enlightenment DR17 support for freedesktop.org specs
More information about the Pkg-e-commits
mailing list