Merge lp:~ari-tczew/ubuntu/saucy/evas/merge-from-debian into lp:ubuntu/saucy/evas

Proposed by Artur Rona
Status: Merged
Merge reported by: Artur Rona
Merged at revision: not available
Proposed branch: lp:~ari-tczew/ubuntu/saucy/evas/merge-from-debian
Merge into: lp:ubuntu/saucy/evas
Diff against target: 53 lines (+26/-2)
2 files modified
debian/changelog (+24/-0)
debian/control (+2/-2)
To merge this branch: bzr merge lp:~ari-tczew/ubuntu/saucy/evas/merge-from-debian
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Review via email: mp+177291@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Thanks. Uploaded.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2013-06-08 23:53:14 +0000
+++ debian/changelog 2013-07-28 18:13:25 +0000
@@ -1,3 +1,21 @@
1evas (1.7.7-1ubuntu1) saucy; urgency=low
2
3 * Merge from Debian unstable. Remaining changes:
4 - debian/control:
5 + Build-depend on libtiff-dev rather than libtiff4-dev.
6 - debian/rules:
7 + Change OpenGL backend from GL to GLES 2 for ARM.
8 + Enable runtime shader compiler for GLES.
9
10 -- Artur Rona <ari-tczew@tlen.pl> Sun, 28 Jul 2013 13:34:36 +0200
11
12evas (1.7.7-1) unstable; urgency=low
13
14 * New upstream version
15 * debian/control: update URI in the VCS-* fields
16
17 -- Albin Tonnerre <lutin@debian.org> Sun, 23 Jun 2013 16:04:25 +0200
18
1evas (1.7.7-0ubuntu1) saucy; urgency=low19evas (1.7.7-0ubuntu1) saucy; urgency=low
220
3 * New upstream release21 * New upstream release
@@ -8,6 +26,12 @@
826
9 -- Ricardo Salveti de Araujo <ricardo.salveti@canonical.com> Sat, 08 Jun 2013 23:53:14 -030027 -- Ricardo Salveti de Araujo <ricardo.salveti@canonical.com> Sat, 08 Jun 2013 23:53:14 -0300
1028
29evas (1.7.4-4) unstable; urgency=low
30
31 * Upload to unstable
32
33 -- Albin Tonnerre <lutin@debian.org> Sat, 11 May 2013 12:46:15 +0200
34
11evas (1.7.4-3) experimental; urgency=low35evas (1.7.4-3) experimental; urgency=low
1236
13 * As per configure.ac, build-depend on eet >= 1.7.4. Fixes FTBFS (again...)37 * As per configure.ac, build-depend on eet >= 1.7.4. Fixes FTBFS (again...)
1438
=== modified file 'debian/control'
--- debian/control 2013-06-08 23:53:14 +0000
+++ debian/control 2013-07-28 18:13:25 +0000
@@ -15,8 +15,8 @@
15 libpixman-1-dev, libxcb-shm0-dev, libxcb-image0-dev, libxcb1-dev15 libpixman-1-dev, libxcb-shm0-dev, libxcb-image0-dev, libxcb1-dev
16Build-Depends-Indep: doxygen16Build-Depends-Indep: doxygen
17Standards-Version: 3.9.117Standards-Version: 3.9.1
18Vcs-Git: git://git.debian.org/pkg-e/libs/evas.git18Vcs-Git: git://anonscm.debian.org/pkg-e/libs/evas.git
19Vcs-Browser: http://git.debian.org/?p=pkg-e/libs/evas.git19Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-e/libs/evas.git
20Homepage: http://www.enlightenment.org20Homepage: http://www.enlightenment.org
2121
22Package: libevas122Package: libevas1

Subscribers

People subscribed via source and target branches