[libreoffice] 84/152: fix merge failures

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to tag libreoffice_3.5.0_rc3-0ubuntu2
in repository libreoffice.

commit 23b3a1b4aca1285d6b7208e6bb51835f2df32848
Author: Rico Tzschichholz <ricotz at ubuntu.com>
Date:   Thu Jun 30 22:25:24 2016 +0200

    fix merge failures
---
 changelog                   | 1 -
 debian-l10n/control.lang.in | 2 +-
 rules                       | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/changelog b/changelog
index 48fc273..479bb1d 100644
--- a/changelog
+++ b/changelog
@@ -415,7 +415,6 @@ libreoffice (1:5.1.0~rc2-1) experimental; urgency=medium
     - build-depend on libpng-dev instead of libpng12-dev (closes: #662411)
 
  -- Rene Engelhard <rene at debian.org>  Wed, 13 Jan 2016 17:38:32 +0100
->>>>>>> libreoffice_5.2.0_beta1-1
 
 libreoffice (1:5.1.0~rc1-1) experimental; urgency=medium
 
diff --git a/debian-l10n/control.lang.in b/debian-l10n/control.lang.in
index 665f66e..d25cdd6 100644
--- a/debian-l10n/control.lang.in
+++ b/debian-l10n/control.lang.in
@@ -2,7 +2,7 @@ Package: libreoffice-l10n-${isocode_lower}
 Section: localization
 Architecture: all
 Pre-Depends: $${misc:Pre-Depends}
-Depends: libreoffice-common, $${misc:Depends}, $${locales_depends}
+Depends: libreoffice-common, $${misc:Depends}, ${locales_depends}
 Recommends: libreoffice-core (>> $${base-version}) | language-support-translations-${isocode_firstpart} ${font_suggests}
 Provides: libreoffice-l10n-$${help-l10n-virtual-version}
 Suggests: hunspell-dictionary-${isocode_lower} | myspell-dictionary-${isocode_lower},
diff --git a/rules b/rules
index 7225c83..abb8e06 100755
--- a/rules
+++ b/rules
@@ -931,7 +931,7 @@ ifeq "$(shell echo $(BUILD_DBGSYM_PACKAGES)$(BUILD_DBG_PACKAGE) | grep -q y && e
     endif
   endif
   ifeq "$(BUILD_DBG_PACKAGE)" "y"
-	DBG_DBG_SUGGESTS+= , libc6.1-dbg [alpha ia64], libc0.1-dbg [kfreebsd-any], libc0.3-dbg [hurd-i386], libc6-dbg [!alpha !ia64 !kfreebsd-i386 !kfreebas-any] !hurd-i386], libatk1.0-dbg, libglib2.0-0-dbg, libgnomevfs2-0-dbg, libstdc++6-$(SYSTEM_GCC_VERSION)-dbg, libx11-6-dbg, libxext6-dbg, libxaw7-dbg, libxml2-dbg, libgtk2.0-0-dbg, libxau6-dbg, libice6-dbg, libsm6-dbg, libxinerama1-dbg, libfontconfig1-dbg, libhunspell-$(shell pkg-config --modversion hunspell | cut -d. -f1,2)-0-dbg, libcurl4-dbg
+	DBG_DBG_SUGGESTS+= , libc6.1-dbg [alpha ia64], libc0.1-dbg [kfreebsd-any], libc0.3-dbg [hurd-i386], libc6-dbg [!alpha !ia64 !kfreebsd-i386 !kfreebas-any !hurd-i386], libatk1.0-dbg, libglib2.0-0-dbg, libgnomevfs2-0-dbg, libstdc++6-$(SYSTEM_GCC_VERSION)-dbg, libx11-6-dbg, libxext6-dbg, libxaw7-dbg, libxml2-dbg, libgtk2.0-0-dbg, libxau6-dbg, libice6-dbg, libsm6-dbg, libxinerama1-dbg, libfontconfig1-dbg, libhunspell-$(shell pkg-config --modversion hunspell | cut -d. -f1,2)-0-dbg, libcurl4-dbg
   endif
 	PYTHON_SIX_RECOMMENDS = python3-six
 endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git