[Pkg-e-commits] [SCM] Enlightenment DR17 support for freedesktop.org specs branch, new-svn-snapshot, updated. debian/0.5.0.050+svn20081114-1-395-geab4b70

[Albin Tonnerre]

The following commit has been merged in the new-svn-snapshot branch:
commit eab4b7091d6e20570b6ee44d83ce1c1ed1c04073
Author: Albin Tonnerre <albin.tonnerre at gmail.com>
Date:   Fri Aug 21 15:37:09 2009 +0200

    Add svg icons to the search list, and prevent the doc from being built when not necessary

diff --git a/debian/changelog b/debian/changelog
index 643dcc2..9efc965 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+efreet (0.5.0.062-2) unstable; urgency=low
+
+  * Add 01_support_svg_by_default: (Closes: #538172)
+    - Efreet now considers .svg files when searching for icons
+  * debian/rules: build the doc in install: rather than build:, so that it
+    doesn't get built when the doc package is not built
+  * Update Standards-Version to 3.8.3, no change required
+
+ -- Albin Tonnerre <albin.tonnerre at gmail.com>  Fri, 21 Aug 2009 15:37:44 +0200
+
 efreet (0.5.0.062-1) unstable; urgency=low
 
   * New upstream snapshot
diff --git a/debian/control b/debian/control
index bee9bd7..f5dd5a1 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ 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.062), libeina-dev (>= 0.0.2.062), doxygen, graphviz
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
 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/patches/01_support_svg_by_default.diff b/debian/patches/01_support_svg_by_default.diff
new file mode 100644
index 0000000..0c9f6dd
--- /dev/null
+++ b/debian/patches/01_support_svg_by_default.diff
@@ -0,0 +1,13 @@
+diff --git a/src/lib/efreet_icon.c b/src/lib/efreet_icon.c
+index af8fdfa..177d073 100644
+--- a/src/lib/efreet_icon.c
++++ b/src/lib/efreet_icon.c
+@@ -119,7 +119,7 @@ efreet_icon_init(void)
+ 
+     if (!efreet_icon_themes)
+     {
+-        const char *default_exts[] = {".png", ".xpm", NULL};
++        const char *default_exts[] = {".png", ".svg", ".xpm", NULL};
+         int i;
+ 
+         if (!ecore_init())
diff --git a/debian/rules b/debian/rules
index 5929c1e..332f5ee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,10 +4,8 @@ include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-build/libefreet-doc::
-	$(MAKE) doc
-
 install/libefreet-doc::
+	$(MAKE) doc
 	cp -R $(DEB_SRCDIR)/doc/html debian/libefreet-doc/usr/share/doc/libefreet-doc/
 
 DEB_CONFIGURE_EXTRA_FLAGS := --disable-rpath --enable-doc

-- 
Enlightenment DR17 support for freedesktop.org specs