[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_4.0.3-2-1-g405c9d5
The following commit has been merged in the master branch:
commit 405c9d538d15777d35316da89b5ba78b216a80d4
Author: Rene Engelhard <rene@debian.org>
Date: Fri May 10 22:05:31 2013 +0200
remove -core Depends: for -style and add Enhances: libreoffice-core for them
diff --git a/changelog b/changelog
index 48f5179..51c247d 100644
--- a/changelog
+++ b/changelog
@@ -3,6 +3,8 @@ libreoffice (1:4.0.3-2) unstable; urgency=low
* debian/control.in:
- add Breaks: libjaxe-java (<= 3.5-2) for saxon9.jar disappearing from
-java-common
+ - remove -core Depends: for -style and add Enhances: libreoffice-core for them.
+ Apps should depend on their data files but data files not on the apps
* debian/rules:
- build with libboost1.53-dev to work around mdds-using sc unit tests failing
to build with sids new gcc-4.7
diff --git a/control b/control
index 34d0f7a..806e296 100644
--- a/control
+++ b/control
@@ -579,7 +579,8 @@ Description: office productivity suite -- database
Package: libreoffice-style-crystal
Architecture: all
-Depends: libreoffice-core, ${misc:Depends}
+Enhances: libreoffice-core
+Depends: ${misc:Depends}
Suggests: crystalcursors, kde-icons-crystal
Provides: libreoffice-style
Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)
@@ -591,7 +592,8 @@ Description: office productivity suite -- Crystal symbol style
Package: libreoffice-style-oxygen
Architecture: all
-Depends: libreoffice-core, ${misc:Depends}
+Enhances: libreoffice-core
+Depends: ${misc:Depends}
Suggests: kde-icons-oxygen, oxygencursors
Provides: libreoffice-style
Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)
@@ -603,7 +605,8 @@ Description: office productivity suite -- Oxygen symbol style
Package: libreoffice-style-tango
Architecture: all
-Depends: libreoffice-core, ${misc:Depends}
+Enhances: libreoffice-core
+Depends: ${misc:Depends}
Suggests: tango-icon-theme
Provides: libreoffice-style
Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)
@@ -616,7 +619,8 @@ Description: office productivity suite -- Tango symbol style
Package: libreoffice-style-hicontrast
Architecture: all
-Depends: libreoffice-core, ${misc:Depends}
+Enhances: libreoffice-core
+Depends: ${misc:Depends}
Suggests: gtk2-engines
Provides: libreoffice-style
Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)
@@ -629,7 +633,7 @@ Description: office productivity suite -- Hicontrast symbol style
Package: libreoffice-style-galaxy
Architecture: all
-Depends: libreoffice-core, ${misc:Depends}
+Depends: ${misc:Depends}
Provides: libreoffice-style, libreoffice-style-default
Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)
Description: office productivity suite -- Galaxy (Default) symbol style
diff --git a/control.in b/control.in
index 5926a56..db6fc0d 100644
--- a/control.in
+++ b/control.in
@@ -446,7 +446,8 @@ Description: office productivity suite -- database
Package: libreoffice-style-crystal
Architecture: all
-Depends: libreoffice-core, ${misc:Depends}
+Enhances: libreoffice-core
+Depends: ${misc:Depends}
Suggests: crystalcursors, kde-icons-crystal
Provides: libreoffice-style
Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)
@@ -458,7 +459,8 @@ Description: office productivity suite -- Crystal symbol style
Package: libreoffice-style-oxygen
Architecture: all
-Depends: libreoffice-core, ${misc:Depends}
+Enhances: libreoffice-core
+Depends: ${misc:Depends}
Suggests: kde-icons-oxygen, oxygencursors
Provides: libreoffice-style
Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)
@@ -470,7 +472,8 @@ Description: office productivity suite -- Oxygen symbol style
Package: libreoffice-style-tango
Architecture: all
-Depends: libreoffice-core, ${misc:Depends}
+Enhances: libreoffice-core
+Depends: ${misc:Depends}
Suggests: tango-icon-theme
Provides: libreoffice-style
Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)
@@ -483,7 +486,8 @@ Description: office productivity suite -- Tango symbol style
Package: libreoffice-style-hicontrast
Architecture: all
-Depends: libreoffice-core, ${misc:Depends}
+Enhances: libreoffice-core
+Depends: ${misc:Depends}
Suggests: gtk2-engines
Provides: libreoffice-style
Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)
@@ -496,7 +500,7 @@ Description: office productivity suite -- Hicontrast symbol style
Package: libreoffice-style-galaxy
Architecture: all
-Depends: libreoffice-core, ${misc:Depends}
+Depends: ${misc:Depends}
Provides: libreoffice-style, libreoffice-style-default
Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)
Description: office productivity suite -- Galaxy (Default) symbol style
--
LibreOffice packaging repository
Reply to: