[SCM] Packaging of KVIrc (formerly maintained in Hg) branch, master, updated. debian/4%4.1.1_svn5829-1

[Kai Wasserbäch]

The following commit has been merged in the master branch:
commit 2b0b3bd1411c2d9140d56008d0fd6adfa43f82f7
Author: Kai Wasserbäch <curan at debian.org>
Date:   Sat May 7 16:12:16 2011 +0200

    debian/patches/22_use_old_.protocol_file_names.patch: Added.
    
    This sort of reverts upstream's r5756.
---
 debian/changelog                                   |    5 +++-
 .../patches/22_use_old_.protocol_file_names.patch  |   26 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 31 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ea2700e..a61bebc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,10 @@ kvirc (4:4.1.1~svn5829-1) UNRELEASED; urgency=low
   * debian/gbp.conf: Ensure tags get signed.
   * debian/control: Bumped Standards-Version to 3.9.2, no further changes
     needed.
-  * debian/patches/10_fix_desktop_entry.patch: Refreshed.
+  * debian/patches:
+    - 10_fix_desktop_entry.patch: Refreshed.
+    - 22_use_old_.protocol_file_names.patch: Added, sort of reverts upstream's
+      r5756.
 
  -- Kai Wasserbäch <curan at debian.org>  Sat, 07 May 2011 15:21:20 +0200
 
diff --git a/debian/patches/22_use_old_.protocol_file_names.patch b/debian/patches/22_use_old_.protocol_file_names.patch
new file mode 100644
index 0000000..66ec0ec
--- /dev/null
+++ b/debian/patches/22_use_old_.protocol_file_names.patch
@@ -0,0 +1,26 @@
+Description: Use old file name for .protocol files
+ Upstream renamed the .protocol files which shouldn't be needed on Debian
+ systems. Thus this patch, which reverts the name change.
+Author: Kai Wasserbäch <curan at debian.org>
+Last-Update: 2011-05-07
+Origin: vendor, http://git.debian.org/?p=pkg-kde/kde-extras/kvirc.git;a=blob_plain;f=debian/patches/22_use_old_.protocol_file_names.patch;hb=HEAD
+Forwarded: not-needed
+---
+ data/protocols/CMakeLists.txt |   10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+--- a/data/protocols/CMakeLists.txt
++++ b/data/protocols/CMakeLists.txt
+@@ -1,4 +1,10 @@
+ IF(KDE4_FOUND)
+-	INSTALL(FILES _irc.protocol DESTINATION ${SERVICES_INSTALL_DIR})
+-	INSTALL(FILES _irc6.protocol DESTINATION ${SERVICES_INSTALL_DIR})
++	INSTALL(FILES _irc.protocol
++          DESTINATION ${SERVICES_INSTALL_DIR}
++          RENAME irc.protocol
++          )
++	INSTALL(FILES _irc6.protocol
++          DESTINATION ${SERVICES_INSTALL_DIR}
++          REMAME irc6.protocol
++          )
+ ENDIF(KDE4_FOUND)
diff --git a/debian/patches/series b/debian/patches/series
index 3ce1901..0baf110 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 05_xpmicon.patch
 10_fix_desktop_entry.patch
 21_make_shared-mime-info_B-D_superfluous.patch
+22_use_old_.protocol_file_names.patch

-- 
Packaging of KVIrc (formerly maintained in Hg)