[SCM] LibreOffice packaging repository branch, master, updated. 032e5b95ec803a89b3cd48275f5be11d415c2fe7

["Rene Engelhard" <rene@debian.org>]

The following commit has been merged in the master branch:
commit 032e5b95ec803a89b3cd48275f5be11d415c2fe7
Author: Rene Engelhard <rene@debian.org>
Date:   Thu Feb 17 01:53:01 2011 +0100

    also move -kab to own control.in file

diff --git a/changelog b/changelog
index 0cf94c0..b034934 100644
--- a/changelog
+++ b/changelog
@@ -4,13 +4,14 @@ libreoffice (1:3.3.1~rc2-1) UNRELEASED; urgency=low
 
   * debian/control.in:
     - update for new git
-    - remove -evolution
-  * debian/control.evolution.in: new
-  * debian/rules, debian/soffice.sh, debian/README.DEbian:
+  * debian/rules, debian/soffice.sh, debian/README.Debian:
     - more s/OOo/LibreOffice/ (closes: #613215)
   * debian/rules:
     - disable evolution2 support for now as it doesn't work with
       evolution 2.32 
+  * debian/control.in, debian/control.{kab,evolution}.in, debian/rules:
+    - move -evolution and -kab into own files so they get automatically
+      be removed from control when disabld
 
  -- Rene Engelhard <rene@debian.org>  Wed, 16 Feb 2011 18:45:55 +0000
 
diff --git a/control b/control
index f5a6dcc..2827bcd 100644
--- a/control
+++ b/control
@@ -3418,18 +3418,6 @@ Description: office productivity suite -- KDE integration
   * konqueror / kmail
   * libreoffice-kab: KDE Addressbook support
 
-Package: libreoffice-kab
-Architecture: alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
-Depends: libreoffice-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Recommends: kaddressbook
-Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
-Description: office productivity suite -- KDE adressbook support
- LibreOffice is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package allows LibreOffice to access the KDE Addressbook.
- You need to install kaddressbook separately.
-
 Package: libreoffice-sdbc-postgresql
 Section: misc
 Architecture: alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
diff --git a/control.kab.in b/control.kab.in
new file mode 100644
index 0000000..3fd6de7
--- /dev/null
+++ b/control.kab.in
@@ -0,0 +1,14 @@
+Package: libreofficeVER-kab
+Architecture: %OOO_BASE_ARCHS%
+Depends: libreofficeVER-core (= ${binary:Version}),
+ ${shlibs:Depends},
+ ${misc:Depends}
+Recommends: kaddressbook
+Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
+Description: office productivity suite -- KDE adressbook support
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package allows LibreOffice to access the KDE Addressbook.
+ You need to install kaddressbook separately.
+
diff --git a/control.kde.in b/control.kde.in
index 7e3bff3..671e0bb 100644
--- a/control.kde.in
+++ b/control.kde.in
@@ -21,17 +21,3 @@ Description: office productivity suite -- KDE integration
   * konqueror / kmail
   * libreoffice-kab: KDE Addressbook support
 
-Package: libreofficeVER-kab
-Architecture: %OOO_BASE_ARCHS%
-Depends: libreofficeVER-core (= ${binary:Version}),
- ${shlibs:Depends},
- ${misc:Depends}
-Recommends: kaddressbook
-Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
-Description: office productivity suite -- KDE adressbook support
- LibreOffice is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package allows LibreOffice to access the KDE Addressbook.
- You need to install kaddressbook separately.
-
diff --git a/rules b/rules
index 8fee6e0..dd4709e 100755
--- a/rules
+++ b/rules
@@ -1003,7 +1003,6 @@ else
     endif
   else
 	CONFIGURE_FLAGS+= --disable-kdeab
-	DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-kab
   endif
 endif
 
@@ -1505,6 +1504,10 @@ ifeq "$(ENABLE_EVO2)" "y"
 	sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
 		>> debian/control < debian/control.evolution.in
 endif
+ifeq "$(ENABLE_KDEAB)" "y"
+	sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
+		>> debian/control < debian/control.kab.in
+endif
 
 	perl -pi -e "s,%OOO_ARCHS%,$(OOO_ARCHS),g" debian/control
 	perl -pi -e "s,%OOO_BASE_ARCHS%,$(OOO_BASE_ARCHS),g" debian/control

-- 
LibreOffice packaging repository