[Pkg-e-commits] [SCM] Enlightenment DR17 advanced canvas library branch, master, updated. debian/0.9.9.050+svn20081206-1-2250-gcf6164e

[Albin Tonnerre]

The following commit has been merged in the master branch:
commit 572a6dbd717162eb8381d4e2b32fa8ce74e30efd
Author: Albin Tonnerre <albin.tonnerre at gmail.com>
Date:   Sun May 3 18:26:46 2009 +0200

    New upstream version, ready for upload

diff --git a/debian/changelog b/debian/changelog
index 0a55385..70dc3e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,21 @@
-evas (0.9.9.050+svn??????) UNRELEASED; urgency=low
+evas (0.9.9.060-1) experimental; urgency=low
 
   * New SVN snapshot
     - Drop patches, no longer needed
     - Massive renaming due to upstream SONAME change.
-  * Update Standards-Version, no change required
-  * Move libevas-dbg to the debug section
-
- -- Albin Tonnerre <albin.tonnerre at gmail.com>  Sat, 18 Apr 2009 11:22:28 +0200
+  * debian/control:
+    - Update Standards-Version, no change required
+    - Move libevas-dbg to the debug section
+    - Remove spurious build-dep on libdirectfb-dev, as we don't build the dfb engine
+  * debian/rules:
+    - Disable the build of the software 16bits engine since it's not usable
+    - Enable SSE on non-amd64 architectures again
+    - Enable dither mask
+  * Package name purposedly doesn't match SONAME, in an attempt to make the
+    former a bit more meaningful than libevas-ver-pre-01-0
+    - Override the lintian warning: package-name-doesnt-match-sonames
+
+ -- Albin Tonnerre <albin.tonnerre at gmail.com>  Tue, 05 May 2009 18:25:18 +0200
 
 evas (0.9.9.050+svn20090204-1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 8953c61..15fce84 100644
--- a/debian/control
+++ b/debian/control
@@ -1,25 +1,25 @@
 Source: evas
 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>,
  Niv Sardi <xaiki at debian.org>, Xavier Oswald <x.oswald at free.fr>,
  Jan Lübbe <jluebbe at debian.org>,
  Nikita V. Youshchenko <yoush at debian.org>
-Build-Depends: debhelper (>= 6), cdbs, libeet-dev (>= 1.1.0), libeina-dev (>= 0.0.1~svn20090128),
+Build-Depends: debhelper (>= 6), cdbs, libeet-dev (>= 1.1.0), libeina-dev (>= 0.0.2.060),
  libfreetype6-dev, libpng12-dev | libpng-dev, libx11-dev, libxrender-dev,
  x11proto-xext-dev, zlib1g, libjpeg62-dev, libtiff4-dev, libgif-dev,
  libfontconfig1-dev, libglu1-mesa-dev, mesa-common-dev, libxpm-dev,
- librsvg2-dev, libdirectfb-dev, doxygen
+ librsvg2-dev, doxygen
 Standards-Version: 3.8.1
 Vcs-Git: git://git.debian.org/pkg-e/libs/evas.git
 Vcs-Browser: http://git.debian.org/?p=pkg-e/libs/evas.git
 Homepage: http://www.enlightenment.org
 
-Package: libevas-svn-00
+Package: libevas-svn-01
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: libevas-engines (>= 0.9.9.050+svn20090204)
+Recommends: libevas-engines (>= 0.9.9.060)
 Provides: libevas0
 Conflicts: libevas0
 Description: Enlightenment DR17 advanced canvas library
@@ -49,8 +49,8 @@ Description: Evas API Documentation
 Package: libevas-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, libevas-svn-00 (= ${binary:Version}), libjpeg62-dev, libx11-dev,
- libfreetype6-dev, libfontconfig1-dev, libeet-dev, pkg-config, libeina-dev (>= 0.0.1~svn20090128)
+Depends: ${misc:Depends}, libevas-svn-01 (= ${binary:Version}), libjpeg62-dev, libx11-dev,
+ libfreetype6-dev, libfontconfig1-dev, libeet-dev, pkg-config, libeina-dev (>= 0.0.2.060)
 Suggests: libevas-doc
 Description: Enlightenment DR17 advanced canvas library development files
  Evas is an advanced canvas library, providing six engines for rendering: X11,
@@ -65,7 +65,7 @@ Description: Enlightenment DR17 advanced canvas library development files
 Package: libevas-dbg
 Architecture: any
 Section: debug
-Depends: ${misc:Depends}, libevas-svn-00 (= ${binary:Version})
+Depends: ${misc:Depends}, libevas-svn-01 (= ${binary:Version})
 Priority: extra
 Description: enlightenment advanced canvas library
  Evas is an advanced canvas library, providing six engines for rendering: X11,
diff --git a/debian/libevas-svn-00.shlibs b/debian/libevas-svn-00.shlibs
deleted file mode 100644
index bd7b640..0000000
--- a/debian/libevas-svn-00.shlibs
+++ /dev/null
@@ -1 +0,0 @@
-libevas-ver-pre-svn-00 0 libevas-svn-00 (>= 0.9.9.050+svn??????)
diff --git a/debian/libevas-svn-00.install b/debian/libevas-svn-01.install
similarity index 100%
rename from debian/libevas-svn-00.install
rename to debian/libevas-svn-01.install
diff --git a/debian/libevas-svn-01.lintian-overrides b/debian/libevas-svn-01.lintian-overrides
new file mode 100644
index 0000000..8c7a23e
--- /dev/null
+++ b/debian/libevas-svn-01.lintian-overrides
@@ -0,0 +1 @@
+libevas-svn-01: package-name-doesnt-match-sonames
diff --git a/debian/libevas-svn-01.shlibs b/debian/libevas-svn-01.shlibs
new file mode 100644
index 0000000..1fcac9f
--- /dev/null
+++ b/debian/libevas-svn-01.shlibs
@@ -0,0 +1 @@
+libevas-ver-pre-01 0 libevas-svn-01 (>= 0.9.9.060)
diff --git a/debian/rules b/debian/rules
index 685bd33..da4417e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,12 +21,6 @@ else
 	arch_flags += --enable-pthreads
 endif
 
-ifeq (amd64,$(DEB_HOST_ARCH))
-	arch_flags += --enable-cpu-sse
-else
-	arch_flags += --disable-cpu-sse
-endif
-
 DEB_CONFIGURE_EXTRA_FLAGS := --enable-strict \
 	--enable-fontconfig \
 	--enable-software-x11 \
@@ -47,7 +41,7 @@ DEB_CONFIGURE_EXTRA_FLAGS := --enable-strict \
 	--enable-scale-smooth \
 	--enable-convert-yuv \
 	--enable-small-dither-mask \
-	--enable-no-dither-mask \
+	--disable-no-dither-mask \
 	--enable-convert-8-rgb-332 \
 	--enable-convert-8-rgb-666 \
 	--enable-convert-8-rgb-232 \
@@ -75,5 +69,6 @@ DEB_CONFIGURE_EXTRA_FLAGS := --enable-strict \
 	--enable-convert-32-rgb-rot-270 \
 	--enable-convert-32-rgb-rot-90 \
 	--disable-image-loader-edb \
+	--disable-software-16-x11 \
 	--enable-doc \
 	--disable-rpath $(arch_flags)

-- 
Enlightenment DR17 advanced canvas library