[libreoffice] 01/03: fix some (minor) lintian errors/warnings
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.0
in repository libreoffice.
commit c2838a2c19804bdc02c94d89f7de36407ead02f0
Author: Rene Engelhard <rene@debian.org>
Date: Tue Sep 15 15:19:55 2015 +0200
fix some (minor) lintian errors/warnings
---
changelog | 11 ++++++++++-
control | 10 ++++------
control.fonts.in | 1 +
control.in | 9 +++------
rules | 13 +------------
5 files changed, 19 insertions(+), 25 deletions(-)
diff --git a/changelog b/changelog
index 4259cdd..d0f3930 100644
--- a/changelog
+++ b/changelog
@@ -6,12 +6,21 @@ libreoffice (1:5.0.2~rc1-1) UNRELEASED; urgency=medium
* debian/control.in:
- remove imagemagick from B-D-I:
- mention liblibreofficekitgtk.so in -gtks description
+ - various lintian fixes
+ + add ${misc:Depends}, remove duplicated Priority:
+ + make fonts-opensymbol Multi-Arch: foreign
+ + don't add unneeded XS-Python3-Version:
* debian/rules:
- stop calling dh_installmenus and stop using convert to convert the icons
to xpm
- move liblibreofficekitgtk.so into -gtk
+ - lintian fixes:
+ + don't add XS-Testsuite; it defaults to autopkgtest anyway
+ if idebian/tests/control exists
+ + move dh_fixperms after gdb helper install to fix permissions of the
+ gdb stuff
- -- Rene Engelhard <rene@debian.org> Fri, 11 Sep 2015 17:57:06 +0200
+ -- Rene Engelhard <rene@debian.org> Tue, 15 Sep 2015 11:35:43 +0200
libreoffice (1:5.0.1-1) unstable; urgency=medium
diff --git a/control b/control
index 480e5cf..d9a0e74 100644
--- a/control
+++ b/control
@@ -185,8 +185,6 @@ Build-Conflicts: amd-libopencl1,
nvidia-libopencl1,
qt3-dev-tools
Standards-Version: 3.9.4
-XS-Python3-Version: 3.4
-XS-Testsuite: autopkgtest
Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git -b debian-experimental-5.0
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-openoffice/libreoffice.git
Bugs:
@@ -845,7 +843,6 @@ Description: PDF Import component for LibreOffice
Package: libreoffice-avmedia-backend-gstreamer
Section: misc
-Priority: optional
Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
Depends: libreoffice-core, ${misc:Depends}, ${shlibs:Depends}
Replaces: libreoffice-core (<< 1:4.2~)
@@ -859,7 +856,6 @@ Description: GStreamer backend for LibreOffice
Package: libreoffice-avmedia-backend-vlc
Section: misc
-Priority: optional
Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
Depends: libreoffice-core,
${libvlc-dep} (>= 2.0.8),
@@ -874,7 +870,7 @@ Description: VLC backend for LibreOffice
to play audio/video.
Package: libreoffice-sdbc-firebird
-Depends: libreoffice-core, ${shlibs:Depends}
+Depends: libreoffice-core, ${misc:Depends}, ${shlibs:Depends}
Architecture: alpha amd64 arm64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mipsel ppc64el
Section: database
Enhances: libreoffice-base-drivers
@@ -889,6 +885,7 @@ Package: libreoffice-sdbc-hsqldb
Depends: libreoffice-core,
${java-common-depends},
${java:Depends},
+ ${misc:Depends},
${shlibs:Depends}
Replaces: libreoffice-base (<< 1:4.2~)
Architecture: alpha amd64 arm64 armel armhf arm64 i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386
@@ -902,7 +899,7 @@ Description: HSQLDB SDBC driver for LibreOffice
LibreOffice without any wrapper layer such as ODBC or JDBC.
Package: libreoffice-base-drivers
-Depends: libreoffice-core, ${shlibs:Depends}
+Depends: libreoffice-core, ${misc:Depends}, ${shlibs:Depends}
Architecture: alpha amd64 arm64 armel armhf arm64 i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386
Section: database
Suggests: libjtds-java,
@@ -4153,6 +4150,7 @@ Description: LibreOffice component for building database reports -- libraries
Package: fonts-opensymbol
Section: fonts
Architecture: all
+Multi-Arch: foreign
Depends: ${misc:Depends}
Recommends: fontconfig
Replaces: ttf-opensymbol
diff --git a/control.fonts.in b/control.fonts.in
index 4c2cb55..f52165d 100644
--- a/control.fonts.in
+++ b/control.fonts.in
@@ -1,6 +1,7 @@
Package: fonts-opensymbol
Section: fonts
Architecture: all
+Multi-Arch: foreign
Depends: ${misc:Depends}
Recommends: fontconfig
Replaces: ttf-opensymbol
diff --git a/control.in b/control.in
index 228c660..28dcadb 100644
--- a/control.in
+++ b/control.in
@@ -26,7 +26,6 @@ Build-Conflicts: ant (= 1.8.0-1) [%OOO_GCJ_JDK_ARCHS%],
amd-libopencl1,
nvidia-libopencl1
Standards-Version: 3.9.4
-XS-Python3-Version: @PYTHON_VERSION_CONTROL@
Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git -b debian-experimental-5.0
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-openoffice/libreoffice.git
Bugs: @BUGS@
@@ -677,7 +676,6 @@ Description: PDF Import component for LibreOffice
Package: libreoffice-avmedia-backend-gstreamer
Section: misc
-Priority: optional
Architecture: %OOO_ARCHS%
Depends: libreoffice-core, ${misc:Depends}, ${shlibs:Depends}
Replaces: libreoffice-core (<< 1:4.2~)
@@ -691,7 +689,6 @@ Description: GStreamer backend for LibreOffice
Package: libreoffice-avmedia-backend-vlc
Section: misc
-Priority: optional
Architecture: %OOO_ARCHS%
Depends: libreoffice-core, ${misc:Depends}, ${shlibs:Depends}, ${libvlc-dep} (>= 2.0.8)
Provides: libreoffice-avmedia-backend
@@ -703,7 +700,7 @@ Description: VLC backend for LibreOffice
to play audio/video.
Package: libreoffice-sdbc-firebird
-Depends: libreoffice-core, ${shlibs:Depends}
+Depends: libreoffice-core, ${shlibs:Depends}, ${misc:Depends}
Architecture: %OOO_LE_ARCHS%
Section: database
Enhances: libreoffice-base-drivers
@@ -715,7 +712,7 @@ Description: Firebird SDBC driver for LibreOffice
LibreOffice without any wrapper layer such as ODBC or JDBC.
Package: libreoffice-sdbc-hsqldb
-Depends: libreoffice-core, ${java-common-depends}, ${java:Depends}, ${shlibs:Depends}
+Depends: libreoffice-core, ${java-common-depends}, ${java:Depends}, ${shlibs:Depends}, ${misc:Depends}
Replaces: libreoffice-base (<< 1:4.2~)
Architecture: %OOO_JAVA_ARCHS%
Section: database
@@ -728,7 +725,7 @@ Description: HSQLDB SDBC driver for LibreOffice
LibreOffice without any wrapper layer such as ODBC or JDBC.
Package: libreoffice-base-drivers
-Depends: libreoffice-core, ${shlibs:Depends}
+Depends: libreoffice-core, ${shlibs:Depends}, ${misc:Depends}
Architecture: %OOO_BASE_ARCHS%
Section: database
Suggests: libreoffice-sdbc-postgresql | odbc-postgresql | libpg-java,
diff --git a/rules b/rules
index 3b98604..e3151fb 100755
--- a/rules
+++ b/rules
@@ -848,12 +848,6 @@ PYMINOR:=$(shell $(PYTHON) -c "import sys; print (sys.version_info[1])")
PYMINORPLUS1:=$(shell $(PYTHON) -c "import sys; print (sys.version_info[1]+1)")
PYTHON_SITE:=debian/python3-uno/$(shell $(PYTHON) -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())')
-ifeq "$(PYTHON_VERSION)" "current"
- PYTHON_VERSION_CONTROL := $(PYMAJOR).$(PYMINOR)
-else
- PYTHON_VERSION_CONTROL := $(PYTHON_VERSION)
-endif
-
ifeq "$(ENABLE_PYTHON)" "y"
BUILD_DEPS += , $(PYTHON)
DBG_DBG_SUGGESTS+= , $(PYTHON)-dbg
@@ -1612,7 +1606,6 @@ debian/control: $(wildcard debian/control*in) $(SOURCE_TREE)/bin/lo-xlate-lang
sed -e "s#%$(DEB_VENDOR)=\([^%]*\)%#, \1#g#" \
-e "s#%[A-Za-z]*=[^%]*%##g#" \
-e "s#%BUILD_DEPS_INDEP%#$(strip $(BUILD_DEPS_INDEP))#g" \
- -e "s#@PYTHON_VERSION_CONTROL@#$(PYTHON_VERSION_CONTROL)#g" \
-e "s#@BUGS@#$(BUGS)#g" \
< debian/control.in > debian/control
@@ -1815,10 +1808,6 @@ ifeq (4.4,$(SYSTEM_GCC_VERSION))
perl -pi -e 's/flex \|/flex (>= 2.5.25-7) |/' debian/control
endif
-ifeq "$(BUILD_TEST_PACKAGE)" "y"
- perl -pi -e 's/Vcs-Git:/XS-Testsuite: autopkgtest\nVcs-Git:/' debian/control
-endif
-
python debian/scripts/joinctrl.py < debian/control > debian/control.tmp
mv debian/control.tmp debian/control
@@ -3179,7 +3168,6 @@ endif
dh_lintian -s
dh_bugfiles -s -A
dh_link -s -X.desktop
- dh_fixperms -s
ifeq "$(BUILD_DBG_PACKAGE)" "y"
dh_strip -s -Nure -Nuno-libs3 --dbg-package=libreoffice-dbg
dh_strip -pure --dbg-package=ure-dbg
@@ -3212,6 +3200,7 @@ endif
else
dh_strip -s
endif
+ dh_fixperms -s
dh_icons -s
dh_compress -s -X.py -X.mk -X.sxd
dh_makeshlibs -puno-libs3 -V"uno-libs3 (>= $(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }' | cut -d. -f1-3)~), ure" -- -c0 -d -V -v`echo $(BINARY_VERSION) | cut -d: -f2`
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: