From a97555448f4c0ed783ad0c41093f822ade01cd95 Mon Sep 17 00:00:00 2001 From: Emilio Pozuelo Monfort Date: Tue, 2 Jun 2015 17:13:04 +0000 Subject: [PATCH] * debian/*.install, debian/rules: + Update for new lib and plugin dir. git-svn-id: file:///svn/pkg-evolution/experimental/evolution@2725 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 3 ++ debian/evolution-dev.install | 2 +- debian/evolution-plugins-experimental.install | 4 +- debian/evolution-plugins.install | 48 +++++++++---------- debian/evolution.install | 8 ++-- debian/libevolution.install | 14 +++--- debian/rules | 2 +- 7 files changed, 42 insertions(+), 39 deletions(-) diff --git a/debian/changelog b/debian/changelog index aef326cc89..3e7f7344a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,9 @@ evolution (3.16.2.1-1) UNRELEASED; urgency=medium * debian/rules: + Drop obsolete --disable-image-inline configure switch. + Explicitly disable autoar as we don't have it in Debian yet. + * debian/*.install, + debian/rules: + + Update for new lib and plugin dir. -- Jean Schurger Sat, 06 Sep 2014 15:45:37 -0400 diff --git a/debian/evolution-dev.install b/debian/evolution-dev.install index afb43c7a36..d069feff1a 100644 --- a/debian/evolution-dev.install +++ b/debian/evolution-dev.install @@ -1,4 +1,4 @@ usr/lib/pkgconfig usr/include -usr/lib/evolution/*/*.so +usr/lib/evolution/*.so usr/share/gtk-doc diff --git a/debian/evolution-plugins-experimental.install b/debian/evolution-plugins-experimental.install index 66960518a5..62ec3d1e30 100644 --- a/debian/evolution-plugins-experimental.install +++ b/debian/evolution-plugins-experimental.install @@ -1,2 +1,2 @@ -usr/lib/evolution/*/plugins/*-external-editor.so -usr/lib/evolution/*/plugins/*-external-editor.eplug +usr/lib/evolution/plugins/*-external-editor.so +usr/lib/evolution/plugins/*-external-editor.eplug diff --git a/debian/evolution-plugins.install b/debian/evolution-plugins.install index 0057aee860..89baf041ee 100644 --- a/debian/evolution-plugins.install +++ b/debian/evolution-plugins.install @@ -1,24 +1,24 @@ -usr/lib/evolution/*/plugins/*-save-calendar.so -usr/lib/evolution/*/plugins/*-save-calendar.eplug -usr/lib/evolution/*/plugins/*-mail-to-task.so -usr/lib/evolution/*/plugins/*-mail-to-task.eplug -usr/lib/evolution/*/plugins/*-mailing-list-actions.so -usr/lib/evolution/*/plugins/*-mailing-list-actions.eplug -usr/lib/evolution/*/plugins/*-prefer-plain.so -usr/lib/evolution/*/plugins/*-prefer-plain.eplug -usr/lib/evolution/*/plugins/*-mail-notification.so -usr/lib/evolution/*/plugins/*-mail-notification.eplug -usr/lib/evolution/*/plugins/*-email-custom-header.so -usr/lib/evolution/*/plugins/*-email-custom-header.eplug -usr/lib/evolution/*/plugins/*-face.so -usr/lib/evolution/*/plugins/*-face.eplug -usr/lib/evolution/*/plugins/*-templates.so -usr/lib/evolution/*/plugins/*-templates.eplug -usr/lib/evolution/*/plugins/*-dbx-import.so -usr/lib/evolution/*/plugins/*-dbx-import.eplug -usr/lib/evolution/*/plugins/*-pst-import.so -usr/lib/evolution/*/plugins/*-pst-import.eplug -usr/lib/evolution/*/plugins/*-bbdb.so -usr/lib/evolution/*/plugins/*-bbdb.eplug -usr/lib/evolution/*/plugins/*-attachment-reminder.so -usr/lib/evolution/*/plugins/*-attachment-reminder.eplug +usr/lib/evolution/plugins/*-save-calendar.so +usr/lib/evolution/plugins/*-save-calendar.eplug +usr/lib/evolution/plugins/*-mail-to-task.so +usr/lib/evolution/plugins/*-mail-to-task.eplug +usr/lib/evolution/plugins/*-mailing-list-actions.so +usr/lib/evolution/plugins/*-mailing-list-actions.eplug +usr/lib/evolution/plugins/*-prefer-plain.so +usr/lib/evolution/plugins/*-prefer-plain.eplug +usr/lib/evolution/plugins/*-mail-notification.so +usr/lib/evolution/plugins/*-mail-notification.eplug +usr/lib/evolution/plugins/*-email-custom-header.so +usr/lib/evolution/plugins/*-email-custom-header.eplug +usr/lib/evolution/plugins/*-face.so +usr/lib/evolution/plugins/*-face.eplug +usr/lib/evolution/plugins/*-templates.so +usr/lib/evolution/plugins/*-templates.eplug +usr/lib/evolution/plugins/*-dbx-import.so +usr/lib/evolution/plugins/*-dbx-import.eplug +usr/lib/evolution/plugins/*-pst-import.so +usr/lib/evolution/plugins/*-pst-import.eplug +usr/lib/evolution/plugins/*-bbdb.so +usr/lib/evolution/plugins/*-bbdb.eplug +usr/lib/evolution/plugins/*-attachment-reminder.so +usr/lib/evolution/plugins/*-attachment-reminder.eplug diff --git a/debian/evolution.install b/debian/evolution.install index ffabd047d6..3532b2142c 100644 --- a/debian/evolution.install +++ b/debian/evolution.install @@ -1,8 +1,8 @@ debian/evolution.xpm usr/share/pixmaps/ etc/xdg usr/bin -usr/lib/evolution/*/plugins/*-itip-formatter.so -usr/lib/evolution/*/plugins/*-itip-formatter.eplug -usr/lib/evolution/*/plugins/*-publish-calendar.so -usr/lib/evolution/*/plugins/*-publish-calendar.eplug +usr/lib/evolution/plugins/*-itip-formatter.so +usr/lib/evolution/plugins/*-itip-formatter.eplug +usr/lib/evolution/plugins/*-publish-calendar.so +usr/lib/evolution/plugins/*-publish-calendar.eplug usr/share/applications diff --git a/debian/libevolution.install b/debian/libevolution.install index 902e9e6bdc..b18c4a9612 100644 --- a/debian/libevolution.install +++ b/debian/libevolution.install @@ -1,7 +1,7 @@ -usr/lib/evolution/*/*.so.* -usr/lib/evolution/*/csv2vcard -usr/lib/evolution/*/modules/*.so -usr/lib/evolution/*/evolution-addressbook-export -usr/lib/evolution/*/evolution-backup -usr/lib/evolution/*/evolution-alarm-notify -usr/lib/evolution/*/killev +usr/lib/evolution/*.so.* +usr/lib/evolution/csv2vcard +usr/lib/evolution/modules/*.so +usr/lib/evolution/evolution-addressbook-export +usr/lib/evolution/evolution-backup +usr/lib/evolution/evolution-alarm-notify +usr/lib/evolution/killev diff --git a/debian/rules b/debian/rules index b1db4b4640..a19cb8c6dd 100755 --- a/debian/rules +++ b/debian/rules @@ -9,7 +9,7 @@ include /usr/share/cdbs/1/rules/utils.mk include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk -ELIBDIR := usr/lib/evolution/3.14 +ELIBDIR := usr/lib/evolution DEB_DH_AUTORECONF_ARGS := --as-needed DEB_SHLIBDEPS_INCLUDE := debian/evolution/$(ELIBDIR)