[SCM] qtsensors packaging branch, master, updated. debian/5.2.0+dfsg-2
Lisandro Damián Nicanor Pérez
lisandro at moszumanska.debian.org
Fri Jan 31 23:23:41 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtsensors.git;a=commitdiff;h=0534628
The following commit has been merged in the master branch:
commit 0534628356da6c4099b4b2b5e577775ac178fedf
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date: Fri Dec 13 23:56:20 2013 -0300
Remove patch applied upstream.
---
debian/changelog | 2 --
debian/patches/fix_grue_qmldir_path.diff | 16 ----------------
debian/patches/series | 1 -
3 files changed, 19 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4031efd..9e12cf5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,6 @@ qtsensors-opensource-src (5.2.0+dfsg-1) UNRELEASED; urgency=low
[ Dmitry Shachnev ]
* New upstream release.
- * debian/patches/fix_grue_qmldir_path.diff: correctly set qmldir.path for
- grue example to fix FTBFS.
* Update libqt5sensors5.symbols.
* Bump qtbase and qtdeclarative build-dependencies to 5.2.0.
* Make Vcs-Browser field canonical by dropping useless attribute.
diff --git a/debian/patches/fix_grue_qmldir_path.diff b/debian/patches/fix_grue_qmldir_path.diff
deleted file mode 100644
index 08fe5e0..0000000
--- a/debian/patches/fix_grue_qmldir_path.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: set qmldir.path correctly
-Author: Dmitry Shachnev <mitya57 at gmail.com>
-Forwarded: yes, https://codereview.qt-project.org/69586
-Last-Update: 2013-10-29
-
---- a/examples/sensors/grue/import/import.pro
-+++ b/examples/sensors/grue/import/import.pro
-@@ -21,7 +21,7 @@
- INSTALLS += target
-
- qmldir.files=$$PWD/qmldir
--qmldir.path=$$DESTDIR
-+qmldir.path=$$DESTPATH
- INSTALLS += qmldir
-
- OTHER_FILES += \
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index d9902c9..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fix_grue_qmldir_path.diff
--
qtsensors packaging
More information about the pkg-kde-commits
mailing list