[Pkg-e-commits] [SCM] Enlightenment 17 branch, master, updated. debian/0.16.999.050+svn20081207-1-7819-gf844bd9

[Albin Tonnerre]

The following commit has been merged in the master branch:
commit c33460d6849c3407bcd4bff08e2862d454ab5749
Author: Albin Tonnerre <albin.tonnerre at gmail.com>
Date:   Fri Jun 19 16:53:23 2009 +0200

    new upstream snapshot

diff --git a/debian/changelog b/debian/changelog
index 221e18b..7c7a5d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+e17 (0.16.999.061-1) UNRELEASED; urgency=low
+
+  * New upstream snapshot
+  * Drop 03_config_panel_category_list_is_not_an_ilist.diff, applied upstream
+
+ -- Albin Tonnerre <albin.tonnerre at gmail.com>  Fri, 19 Jun 2009 16:52:16 +0200
+
 e17 (0.16.999.060-1) experimental; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index d4d7991..e03bb3d 100644
--- a/debian/control
+++ b/debian/control
@@ -5,9 +5,9 @@ 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, libeet-dev (>= 1.0.1),
- libedje-dev (>= 0.9.9.060), libefreet-dev (>= 0.5.0.060),
- libecore-dev (>= 0.9.9.060), libedbus-dev (>= 0.5.0.060),
- libevas-dev (>= 0.9.9.060), libeina-dev (>= 0.0.2.060),
+ libedje-dev (>= 0.9.9.061), libefreet-dev (>= 0.5.0.061),
+ libecore-dev (>= 0.9.9.061), libedbus-dev (>= 0.5.0.061),
+ libevas-dev (>= 0.9.9.061), libeina-dev (>= 0.0.2.060),
  libasound2-dev, libxext-dev, libeet-bin, libpam0g-dev
 Standards-Version: 3.8.1
 Vcs-Git: git://git.debian.org/pkg-e/apps/e.git
@@ -16,7 +16,7 @@ Homepage: http://www.enlightenment.org
 
 Package: e17
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, e17-data (= ${source:Version}), libevas-engines, libedje-bin
+Depends: ${misc:Depends}, ${shlibs:Depends}, e17-data (= ${source:Version}), libevas-engine-software-x11, libedje-bin
 Conflicts: enlightenment
 Provides: x-window-manager
 Description: The Enlightenment DR17 Window Manager
@@ -58,9 +58,9 @@ Package: efl-dev
 Architecture: any
 Section: devel
 Depends: ${misc:Depends}, libeet-dev (>= 1.0.1),
- libedje-dev (>= 0.9.9.060), libefreet-dev (>= 0.5.0.060),
- libecore-dev (>= 0.9.9.060), libedbus-dev (>= 0.5.0.060),
- libevas-dev (>= 0.9.9.060), libeina-dev (>= 0.0.2.060)
+ libedje-dev (>= 0.9.9.061), libefreet-dev (>= 0.5.0.061),
+ libecore-dev (>= 0.9.9.061), libedbus-dev (>= 0.5.0.061),
+ libevas-dev (>= 0.9.9.061), libeina-dev (>= 0.0.2.060)
 Description: EFL headers, static libraries and documentation
  Enlightenment is an advanced window manager for X11. Unique
  features include: a fully animated background, nice drop shadows
diff --git a/debian/patches/02_fix_default_config_for_upgrades.diff b/debian/patches/02_fix_default_config_for_upgrades.diff
index c548517..f0cc129 100644
--- a/debian/patches/02_fix_default_config_for_upgrades.diff
+++ b/debian/patches/02_fix_default_config_for_upgrades.diff
@@ -59,4 +59,6 @@ index 68fe2b8..4de2e16 100644
 +      value "is_main" int: 0;
 +    }
 +  }
+   value "mode.presentation" uchar: 0;
+   value "mode.offline" uchar: 0;  
  }
diff --git a/debian/patches/03_config_panel_category_list_is_not_an_ilist.diff b/debian/patches/03_config_panel_category_list_is_not_an_ilist.diff
deleted file mode 100644
index 706d661..0000000
--- a/debian/patches/03_config_panel_category_list_is_not_an_ilist.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: src/modules/conf/e_conf.c
-===================================================================
---- src/modules/conf/e_conf.c	(revision 40507)
-+++ src/modules/conf/e_conf.c	(revision 40508)
-@@ -514,8 +514,8 @@
- 
-    if (!(eco = data)) return 1;
-    if (!eco->cat_list) return 1;
--   sel = e_widget_ilist_selected_get(eco->cat_list);
-+//   sel = e_widget_ilist_selected_get(eco->cat_list);
-    _e_configure_fill_cat_list(eco);
--   e_widget_ilist_selected_set(eco->cat_list, sel);
-+//   e_widget_ilist_selected_set(eco->cat_list, sel);
-    return 1;
- }

-- 
Enlightenment 17