diff -u libdrm-2.4.64/debian/changelog libdrm-2.4.64/debian/changelog
--- libdrm-2.4.64/debian/changelog
+++ libdrm-2.4.64/debian/changelog
@@ -1,3 +1,10 @@
+libdrm (2.4.64-1~ubuntu14.04.1) trusty; urgency=medium
+
+ * Backport to trusty (LP: #1519753)
+ * Drop revert-65041c4a1.diff, not needed anymore.
+
+ -- Timo Aaltonen <tjaalton@debian.org> Wed, 25 Nov 2015 13:20:44 +0200
+
libdrm (2.4.64-1) unstable; urgency=medium
[ Robert Hooker ]
@@ -52,6 +59,14 @@
-- Julien Cristau <jcristau@debian.org> Sun, 26 Apr 2015 12:21:30 +0200
+libdrm (2.4.60-2~ubuntu14.04.1) trusty; urgency=medium
+
+ * Backport to trusty. (LP: #1441847)
+ * control: Fix libdrm-tegra0 description typo.
+ * revert-65041c4a1.diff: Revert a commit which broke ABI.
+
+ -- Timo Aaltonen <tjaalton@debian.org> Wed, 08 Apr 2015 23:55:25 +0300
+
libdrm (2.4.60-2) experimental; urgency=medium
[ Maarten Lankhorst ]
diff -u libdrm-2.4.64/debian/libdrm2.symbols libdrm-2.4.64/debian/libdrm2.symbols
--- libdrm-2.4.64/debian/libdrm2.symbols
+++ libdrm-2.4.64/debian/libdrm2.symbols
@@ -19,6 +19,7 @@
drmAgpVendorId@Base 2.3.1
drmAgpVersionMajor@Base 2.3.1
drmAgpVersionMinor@Base 2.3.1
+ drmAllocCpy@Base 2.4.3
drmAuthMagic@Base 2.3.1
drmAvailable@Base 2.3.1
drmCheckModesettingSupported@Base 2.4.3
diff -u libdrm-2.4.64/debian/patches/series libdrm-2.4.64/debian/patches/series
--- libdrm-2.4.64/debian/patches/series
+++ libdrm-2.4.64/debian/patches/series
@@ -1,0 +2 @@
+revert-65041c4a1.diff
only in patch2:
unchanged:
--- libdrm-2.4.64.orig/debian/patches/revert-65041c4a1.diff
+++ libdrm-2.4.64/debian/patches/revert-65041c4a1.diff
@@ -0,0 +1,51 @@
+commit a29ec5af4820285226ab28cb0f2e86a4cab448ce
+Author: Timo Aaltonen <tjaalton@debian.org>
+Date: Tue Apr 21 08:12:41 2015 +0300
+
+ Revert "Fix type-limits, pointer-arith and sign-compare warnings"
+ which breaks ABI.
+
+ This reverts commit 65041c4a19bc6d1cc86f768259b9e0888af0bd5f.
+
+diff --git a/tests/dristat.c b/tests/dristat.c
+index cca4b03..57cecc9 100644
+--- a/tests/dristat.c
++++ b/tests/dristat.c
+@@ -190,9 +190,9 @@ static void printhuman(unsigned long value, const char *name, int mult)
+ static void getstats(int fd, int i)
+ {
+ drmStatsT prev, curr;
+- unsigned j;
++ int j;
+ double rate;
+-
++
+ printf(" System statistics:\n");
+
+ if (drmGetStats(fd, &prev)) return;
+diff --git a/tests/getstats.c b/tests/getstats.c
+index 8a7d299..8d40d0b 100644
+--- a/tests/getstats.c
++++ b/tests/getstats.c
+@@ -45,6 +45,8 @@ int main(int argc, char **argv)
+ ret = ioctl(fd, DRM_IOCTL_GET_STATS, &stats);
+ assert(ret == 0);
+
++ assert(stats.count >= 0);
++
+ close(fd);
+ return 0;
+ }
+diff --git a/xf86drmMode.c b/xf86drmMode.c
+index 61d5e01..9ea8fe7 100644
+--- a/xf86drmMode.c
++++ b/xf86drmMode.c
+@@ -76,7 +76,7 @@ static inline int DRM_IOCTL(int fd, unsigned long cmd, void *arg)
+ * Util functions
+ */
+
+-static void* drmAllocCpy(char *array, int count, int entry_size)
++void* drmAllocCpy(void *array, int count, int entry_size)
+ {
+ char *r;
+ int i;