[libreoffice] 01/01: migrate gir install to .install, as they are installed from debian/tmp anyway
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.1
in repository libreoffice.
commit 19461435afa8ae689c5d1d5e24c50b2506064924
Author: Rene Engelhard <rene@debian.org>
Date: Mon Sep 14 15:21:50 2015 +0200
migrate gir install to .install, as they are installed from debian/tmp anyway
---
rules | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/rules b/rules
index 9d0a16e..4107d75 100755
--- a/rules
+++ b/rules
@@ -2152,6 +2152,10 @@ endif
ifeq "$(PACKAGE_LOKIT)" "y"
echo "../../../include/LibreOfficeKit usr/include" > debian/libreofficekit-dev.install
endif
+ifeq "$(ENABLE_INTROSPECTION)" "y"
+ echo "../usr/share/gir-1.0/LOKDocView-0.1.gir /usr/share/gir-1.0/" > debian/gir1.2-lokdocview-0.1.install
+ echo "../usr/lib/girepository-1.0/LOKDocView-0.1.typelib /usr/lib/girepository-1.0" >> debian/gir1.2-lokdocview-0.1.install
+endif
dh_installdirs -A
dh_install -A --sourcedir=debian/tmp/pkg --fail-missing
@@ -2554,14 +2558,6 @@ ifeq "$(BUILD_GTK3)" "y"
mkdir -p -m755 $(PKGDIR)-gtk3/$(OODIR)/program
mv $(PKGDIR)-gnome/$(OODIR)/program/libvclplug_gtk3lo.so $(PKGDIR)-gtk3/$(OODIR)/program/
mv $(PKGDIR)-core/$(OODIR)/program/liblibreofficekitgtk.so $(PKGDIR)-gtk3/$(OODIR)/program/
- ifeq "$(ENABLE_INTROSPECTION)" "y"
- mkdir -p debian/gir1.2-lokdocview-0.1/usr/share/gir-1.0
- mkdir -p debian/gir1.2-lokdocview-0.1/usr/lib/girepository-1.0
- mv debian/tmp/usr/share/gir-1.0/LOKDocView-0.1.gir \
- debian/gir1.2-lokdocview-0.1/usr/share/gir-1.0/
- mv debian/tmp/usr/lib/girepository-1.0/LOKDocView-0.1.typelib \
- debian/gir1.2-lokdocview-0.1/usr/lib/girepository-1.0/
- endif
endif
mv $(PKGDIR)-gnome/$(OODIR)/program/* $(PKGDIR)-gtk/$(OODIR)/program/
mv $(PKGDIR)-gtk/$(OODIR)/program/gnome-open-url $(PKGDIR)-gnome/$(OODIR)/program
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: