[SCM] qtimageformats packaging branch, experimental, updated. debian/5.3.2-2-7-g950c2be
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Tue Dec 23 16:04:39 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtimageformats.git;a=commitdiff;h=950c2be
The following commit has been merged in the experimental branch:
commit 950c2be71e638bb63c7168430aff992685707d00
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Tue Dec 23 19:04:37 2014 +0300
Drop fix_libmng_test.patch, applied upstream.
---
debian/changelog | 1 +
debian/patches/fix_libmng_test.patch | 22 ----------------------
debian/patches/series | 1 -
3 files changed, 1 insertion(+), 23 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 60089b2..7a99610 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qtimageformats-opensource-src (5.4.0-1) UNRELEASED; urgency=medium
[ Dmitry Shachnev ]
* New upstream release.
+ * Drop fix_libmng_test.patch, applied upstream.
* Build-depend on qtbase 5.4.0.
* Update debian/copyright.
* Update Vcs-Browser field to point to cgit interface.
diff --git a/debian/patches/fix_libmng_test.patch b/debian/patches/fix_libmng_test.patch
deleted file mode 100644
index e1db9f5..0000000
--- a/debian/patches/fix_libmng_test.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Author: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
-Description: fix libmng test by adding necessary header.
- libmng pulls in libjpeg. In turn libjpeg requires that code that uses it should
- include stdio.h [0].
- .
- [0] <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=461602#10>
-Applied-Upstream: no
-
----
- config.tests/libmng/libmng.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/config.tests/libmng/libmng.cpp
-+++ b/config.tests/libmng/libmng.cpp
-@@ -39,6 +39,7 @@
- **
- ****************************************************************************/
-
-+#include <stdio.h>
- #include <libmng.h>
-
- int main(int, char **)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e933bc9..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fix_libmng_test.patch
--
qtimageformats packaging
More information about the pkg-kde-commits
mailing list