[SCM] libbluedevil packaging branch, master, updated. debian/1.9.2-1

[Modestas Vainius]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/libbluedevil.git;a=commitdiff;h=c0c6b93

The following commit has been merged in the master branch:
commit c0c6b934c553a2f7375e169e583c54e8fb52516e
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Tue May 1 16:12:38 2012 +0300

    Drop upstream_use-LIB_INSTALL_DIR.patch, merged upstream.
---
 debian/changelog                                  |    1 +
 debian/patches/series                             |    1 -
 debian/patches/upstream_use-LIB_INSTALL_DIR.patch |   23 ---------------------
 3 files changed, 1 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cc6c961..179cc9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libbluedevil (1.9.2-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Add myself to uploaders.
+  * Drop upstream_use-LIB_INSTALL_DIR.patch, merged upstream.
 
  -- Modestas Vainius <modax at debian.org>  Tue, 01 May 2012 16:10:08 +0300
 
diff --git a/debian/patches/series b/debian/patches/series
index 2c13471..2ab1425 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-upstream_use-LIB_INSTALL_DIR.patch
 01_findqt4_optional_x11_pthread.diff
 03_use_multiarch_lib_paths.diff
diff --git a/debian/patches/upstream_use-LIB_INSTALL_DIR.patch b/debian/patches/upstream_use-LIB_INSTALL_DIR.patch
deleted file mode 100644
index 5079659..0000000
--- a/debian/patches/upstream_use-LIB_INSTALL_DIR.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 787999b244144b79f2ea7c8f3df9917187c780aa Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino at kde.org>
-Date: Fri, 30 Mar 2012 17:52:03 +0200
-Subject: [PATCH] use LIB_INSTALL_DIR
-
----
- bluedevil/bluedevil.pc.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/bluedevil/bluedevil.pc.in b/bluedevil/bluedevil.pc.in
-index 0d61c02..e6742bd 100644
---- a/bluedevil/bluedevil.pc.in
-+++ b/bluedevil/bluedevil.pc.in
-@@ -1,5 +1,5 @@
- prefix=@CMAKE_INSTALL_PREFIX@
--libdir=@CMAKE_INSTALL_PREFIX@/lib
-+libdir=@LIB_INSTALL_DIR@
- includedir=@CMAKE_INSTALL_PREFIX@/include
- 
- Name: bluedevil
--- 
-1.7.9.1
-

-- 
libbluedevil packaging