[SCM] KDE Network module packaging branch, master, updated. debian/4.10.5-1
Pino Toscano
pino at alioth.debian.org
Sat Jul 13 13:15:54 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdenetwork.git;a=commitdiff;h=cf98e6f
The following commit has been merged in the master branch:
commit cf98e6f61218086a5487c9b273c2d3028637cdc4
Author: Pino Toscano <pino at debian.org>
Date: Sun Jun 23 18:54:26 2013 +0200
drop patch upstream_r1353735.diff
backported from upstream
---
debian/changelog | 3 +++
debian/patches/series | 1 -
debian/patches/upstream_r1353735.diff | 32 --------------------------------
3 files changed, 3 insertions(+), 33 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0178b4e..289f055 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ kdenetwork (4:4.10.4-2) UNRELEASED; urgency=low
[ Maximiliano Curia ]
* Sync with sid version.
+ [ Pino Toscano ]
+ * Drop patch upstream_r1353735.diff, backported from upstream.
+
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sat, 15 Jun 2013 08:48:17 +0200
kdenetwork (4:4.10.4-1) experimental; urgency=low
diff --git a/debian/patches/series b/debian/patches/series
index f06da80..b64f8fb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
kdenetwork-4.7.97-fix-for-g++47.patch
-upstream_r1353735.diff
diff --git a/debian/patches/upstream_r1353735.diff b/debian/patches/upstream_r1353735.diff
deleted file mode 100644
index 6d302c5..0000000
--- a/debian/patches/upstream_r1353735.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-Author: Michael Palimaka <kensington at gentoo.org>
-Description: Fix build with V4L and recent kernels.
- .
- REVIEW: 7072
- BUG: 319455
-Applied-Upstream: 4.10.4, commit:1353735
-
-Index: kdenetwork/kopete/libkopete/avdevice/videodevice.cpp
-===================================================================
---- kdenetwork/kopete/libkopete/avdevice/videodevice.cpp (revision 1353734)
-+++ kdenetwork/kopete/libkopete/avdevice/videodevice.cpp (revision 1353735)
-@@ -3050,7 +3050,9 @@
- case V4L2_CID_AUDIO_TREBLE: return I18N_NOOP("Treble");
- case V4L2_CID_AUDIO_MUTE: return I18N_NOOP("Mute");
- case V4L2_CID_AUDIO_LOUDNESS: return I18N_NOOP("Loudness");
-+#ifdef V4L2_CID_BLACK_LEVEL // deprecated, likely to be removed soon
- case V4L2_CID_BLACK_LEVEL: return I18N_NOOP("Black Level");
-+#endif
- case V4L2_CID_AUTO_WHITE_BALANCE: return I18N_NOOP("Automatic White Balance");
- case V4L2_CID_DO_WHITE_BALANCE: return I18N_NOOP("Do White Balance");
- case V4L2_CID_RED_BALANCE: return I18N_NOOP("Red Balance");
-@@ -3061,8 +3063,10 @@
- case V4L2_CID_GAIN: return I18N_NOOP("Gain");
- case V4L2_CID_HFLIP: return I18N_NOOP("Horizontal Flip");
- case V4L2_CID_VFLIP: return I18N_NOOP("Vertical Flip");
-+#ifdef V4L2_CID_HCENTER // removed in kernel 3.9
- case V4L2_CID_HCENTER: return I18N_NOOP("Horizontal Center");
- case V4L2_CID_VCENTER: return I18N_NOOP("Vertical Center");
-+#endif
- #ifdef V4L2_CID_POWER_LINE_FREQUENCY // since kernel 2.6.25
- case V4L2_CID_POWER_LINE_FREQUENCY: return I18N_NOOP("Power Line Frequency");
- case V4L2_CID_HUE_AUTO: return I18N_NOOP("Automatic Hue");
--
KDE Network module packaging
More information about the pkg-kde-commits
mailing list