[SCM] tango branch, master, updated. debian/8.0.5+dfsg-1-1-g1dd4c13

[Picca Frédéric-Emma?==?UTF-8?Q?nuel]

The following commit has been merged in the master branch:
commit 62de3a20ef9330d82444b56ded213345911cf5f7
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Wed May 30 21:01:49 2012 +0200

    one less patch apply by upstream

diff --git a/debian/changelog b/debian/changelog
index 16ae34a..602563f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,7 @@ tango (8.0.5+dfsg-1) UNRELEASED; urgency=low
     - 0003-debian-notify_daemon.patch (refreshed)
     - 0004-upstream-fix-bug3285674.patch (deleted)
     - 0005-upstream-fix-bug3213730.patch (deleted)
-    - 0006 -> 0004-feature-forwarded-upstream-pkg-config-small-fixes.patch (renamed)
+    - 0006-feature-forwarded-upstream-pkg-config-small-fixes.patch (deleted)
     - 0007-upstream-fix-tango-db-start-during-init.patch (deleted)
     - 0008-feature-add-jpegmmx-option-to-configure-script.patch (deleted)
     - 0009-upstream-fix-bug3339975.patch (deleted)
diff --git a/debian/patches/0004-feature-forwarded-upstream-pkg-config-small-fixes.patch b/debian/patches/0004-feature-forwarded-upstream-pkg-config-small-fixes.patch
deleted file mode 100644
index b081490..0000000
--- a/debian/patches/0004-feature-forwarded-upstream-pkg-config-small-fixes.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?=
- <picca at synchrotron-soleil.fr>
-Date: Fri, 13 May 2011 12:34:13 +0200
-Subject: feature-forwarded-upstream-pkg-config-small-fixes
-
----
- lib/cpp/log4tango/log4tango.pc.in |    4 ++--
- lib/cpp/tango.pc.in               |    4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/lib/cpp/log4tango/log4tango.pc.in b/lib/cpp/log4tango/log4tango.pc.in
-index 0e61e8a..c4acacb 100644
---- a/lib/cpp/log4tango/log4tango.pc.in
-+++ b/lib/cpp/log4tango/log4tango.pc.in
-@@ -1,10 +1,10 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
--includedir=@includedir@/tango
-+includedir=@includedir@
- 
- Name: log4tango
- Description: Logging library for the tango constrol system
- Version: @VERSION@
- Libs: -L${libdir} -llog4tango
--Cflags: -I${includedir}
-+Cflags: -I${includedir}/tango
-diff --git a/lib/cpp/tango.pc.in b/lib/cpp/tango.pc.in
-index 50e62f8..870c07d 100644
---- a/lib/cpp/tango.pc.in
-+++ b/lib/cpp/tango.pc.in
-@@ -1,11 +1,11 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
--includedir=@includedir@/tango
-+includedir=@includedir@
- 
- Name: tango
- Description: The tango constrol system library
- Requires: omniDynamic4 >= 4.1.2, omniCOS4, log4tango, libzmq
- Version: @VERSION@
- Libs: -L${libdir} -ltango
--Cflags: -I${includedir}
-+Cflags: -I${includedir}/tango
diff --git a/debian/patches/series b/debian/patches/series
index 61680c6..31d0855 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 0001-debian-fix_database_scripts.patch
 0002-debian-my.cnf.in.patch
 0003-debian-notify_daemon.patch
-0004-feature-forwarded-upstream-pkg-config-small-fixes.patch

-- 
TANGO distributed control system.