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

Proposed by Artur Rona on 2013-07-28
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 2013-07-28 Approve on 2013-07-30
Review via email: mp+177291@code.launchpad.net
To post a comment you must log in.
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
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-06-08 23:53:14 +0000
3+++ debian/changelog 2013-07-28 18:13:25 +0000
4@@ -1,3 +1,21 @@
5+evas (1.7.7-1ubuntu1) saucy; urgency=low
6+
7+ * Merge from Debian unstable. Remaining changes:
8+ - debian/control:
9+ + Build-depend on libtiff-dev rather than libtiff4-dev.
10+ - debian/rules:
11+ + Change OpenGL backend from GL to GLES 2 for ARM.
12+ + Enable runtime shader compiler for GLES.
13+
14+ -- Artur Rona <ari-tczew@tlen.pl> Sun, 28 Jul 2013 13:34:36 +0200
15+
16+evas (1.7.7-1) unstable; urgency=low
17+
18+ * New upstream version
19+ * debian/control: update URI in the VCS-* fields
20+
21+ -- Albin Tonnerre <lutin@debian.org> Sun, 23 Jun 2013 16:04:25 +0200
22+
23 evas (1.7.7-0ubuntu1) saucy; urgency=low
24
25 * New upstream release
26@@ -8,6 +26,12 @@
27
28 -- Ricardo Salveti de Araujo <ricardo.salveti@canonical.com> Sat, 08 Jun 2013 23:53:14 -0300
29
30+evas (1.7.4-4) unstable; urgency=low
31+
32+ * Upload to unstable
33+
34+ -- Albin Tonnerre <lutin@debian.org> Sat, 11 May 2013 12:46:15 +0200
35+
36 evas (1.7.4-3) experimental; urgency=low
37
38 * As per configure.ac, build-depend on eet >= 1.7.4. Fixes FTBFS (again...)
39
40=== modified file 'debian/control'
41--- debian/control 2013-06-08 23:53:14 +0000
42+++ debian/control 2013-07-28 18:13:25 +0000
43@@ -15,8 +15,8 @@
44 libpixman-1-dev, libxcb-shm0-dev, libxcb-image0-dev, libxcb1-dev
45 Build-Depends-Indep: doxygen
46 Standards-Version: 3.9.1
47-Vcs-Git: git://git.debian.org/pkg-e/libs/evas.git
48-Vcs-Browser: http://git.debian.org/?p=pkg-e/libs/evas.git
49+Vcs-Git: git://anonscm.debian.org/pkg-e/libs/evas.git
50+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-e/libs/evas.git
51 Homepage: http://www.enlightenment.org
52
53 Package: libevas1

Subscribers

People subscribed via source and target branches