summaryrefslogtreecommitdiff
path: root/debian
diff options
authorŁukasz 'sil2100' Zemczak <lukasz.zemczak@canonical.com>2012-07-18 13:28:31 +0200
committerŁukasz 'sil2100' Zemczak <lukasz.zemczak@canonical.com>2012-07-18 13:28:31 +0200
commitd0be15221e0d6910dbfd6c28c905960ce07c05e0 (patch)
tree9593494fa66b16effe5d07c2ec428d3e5ac750c8 /debian
parent0d5e73edfd4cb0c7a5eaf175837a18060276e9fe (diff)
We don't need the libunity-protocol-private0 dependency. Also simplified the sed expression for path extraction.
(bzr r55.10.2)
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
-rw-r--r--debian/control1
-rwxr-xr-xdebian/rules2
3 files changed, 1 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index e38569caf..10bf46b05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,6 @@ unity (6.0.0-0ubuntu3) UNRELEASED; urgency=low
* debian/rules:
- added override for dh_shlibdeps to point it to the private directory of
libunity-protocol-private.so
- * debian/control:
- - added dependency on libunity-protocol-private0
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@canonical.com> Wed, 18 Jul 2012 12:50:15 +0200
diff --git a/debian/control b/debian/control
index f00ba77dd..b78648f91 100644
--- a/debian/control
+++ b/debian/control
@@ -42,7 +42,6 @@ Build-Depends: cmake,
libxfixes-dev (>= 1:5.0-4ubuntu4),
gcc-4.6,
g++-4.6,
- libunity-protocol-private0,
Standards-Version: 3.9.3
Homepage: https://launchpad.net/unity
Vcs-Bzr: https://code.launchpad.net/+branch/ubuntu/unity
diff --git a/debian/rules b/debian/rules
index bb54de6fc..00977741e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,7 @@ CFLAGS=$(shell echo $$CFLAGS | sed -e 's/\-Wall//')
CORE_ABIVERSION := $(shell sed -rn 's/^\#define[[:space:]]+CORE_ABIVERSION[[:space:]]+//p' /usr/include/compiz/core/abiversion.h )
NUX_ABIVERSION := $(shell sed -rn 's/^\#define[[:space:]]+NUX_ABIVERSION[[:space:]]+//p' /usr/include/Nux-3.0/Nux/ABI.h )
-LIBUNITY_PRIVATE := $(shell pkg-config --libs-only-L unity-protocol-private | sed -e 's/^.*-L\(.*\)/\1/' )
+LIBUNITY_PRIVATE := $(shell pkg-config --libs-only-L unity-protocol-private | sed -e 's/-L\(.*\)/\1/' )
override_dh_quilt_patch:
dh_quilt_patch