r48799 - in /desktop/unstable/libpeas/debian: changelog control control.in gir1.2-peas-1.0.install libpeas-1.0-0.install libpeas-1.0-python2loader.install libpeas-dev.install libpeas-doc.install rules
laney at users.alioth.debian.org
laney at users.alioth.debian.org
Thu May 19 16:03:33 UTC 2016
Author: laney
Date: Thu May 19 16:03:32 2016
New Revision: 48799
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=48799
Log:
Convert to multiarch. (Closes: #815727)
Modified:
desktop/unstable/libpeas/debian/changelog
desktop/unstable/libpeas/debian/control
desktop/unstable/libpeas/debian/control.in
desktop/unstable/libpeas/debian/gir1.2-peas-1.0.install
desktop/unstable/libpeas/debian/libpeas-1.0-0.install
desktop/unstable/libpeas/debian/libpeas-1.0-python2loader.install
desktop/unstable/libpeas/debian/libpeas-dev.install
desktop/unstable/libpeas/debian/libpeas-doc.install
desktop/unstable/libpeas/debian/rules
Modified: desktop/unstable/libpeas/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libpeas/debian/changelog?rev=48799&op=diff
==============================================================================
--- desktop/unstable/libpeas/debian/changelog [utf-8] (original)
+++ desktop/unstable/libpeas/debian/changelog [utf-8] Thu May 19 16:03:32 2016
@@ -1,3 +1,9 @@
+libpeas (1.18.0-3) UNRELEASED; urgency=medium
+
+ * Convert to multiarch. (Closes: #815727)
+
+ -- Iain Lane <laney at debian.org> Thu, 19 May 2016 12:35:21 +0100
+
libpeas (1.18.0-2) unstable; urgency=medium
* Add Build-Depends-Package meta-tags to symbols file.
Modified: desktop/unstable/libpeas/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libpeas/debian/control?rev=48799&op=diff
==============================================================================
--- desktop/unstable/libpeas/debian/control [utf-8] (original)
+++ desktop/unstable/libpeas/debian/control [utf-8] Thu May 19 16:03:32 2016
@@ -5,7 +5,7 @@
Source: libpeas
Priority: extra
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Emilio Pozuelo Monfort <pochu at debian.org>, Michael Biebl <biebl at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Emilio Pozuelo Monfort <pochu at debian.org>, Iain Lane <laney at debian.org>, Michael Biebl <biebl at debian.org>
Build-Depends: cdbs (>= 0.4.90),
debhelper (>= 9),
dh-autoreconf,
@@ -35,6 +35,7 @@
Depends: ${misc:Depends},
${shlibs:Depends},
libpeas-common
+Multi-Arch: same
Description: Application plugin library
libpeas is a library that allows applications to support plugins.
@@ -47,6 +48,7 @@
libpeas-common
Breaks: libpeas-1.0-0 (<< 1.8.0-2)
Replaces: libpeas-1.0-0 (<< 1.8.0-2)
+Multi-Arch: same
Description: Application plugin library (Python 2 support)
libpeas is a library that allows applications to support plugins.
This package contains the Python 2 loader shared library.
@@ -67,6 +69,7 @@
libgirepository1.0-dev (>= 1.39.0),
libgtk-3-dev (>= 3.0.0)
Suggests: libpeas-doc
+Multi-Arch: same
Description: Application plugin library (development files)
libpeas is a library that allows applications to support plugins.
.
@@ -87,6 +90,7 @@
Section: libs
Architecture: all
Depends: ${misc:Depends}
+Multi-Arch: foreign
Description: Application plugin library (common files)
libpeas is a library that allows applications to support plugins.
.
@@ -98,6 +102,7 @@
Depends: ${misc:Depends},
${shlibs:Depends},
${gir:Depends}
+Multi-Arch: same
Description: Application plugin library (introspection files)
libpeas is a library that allows applications to support plugins.
.
Modified: desktop/unstable/libpeas/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libpeas/debian/control.in?rev=48799&op=diff
==============================================================================
--- desktop/unstable/libpeas/debian/control.in [utf-8] (original)
+++ desktop/unstable/libpeas/debian/control.in [utf-8] Thu May 19 16:03:32 2016
@@ -31,6 +31,7 @@
Depends: ${misc:Depends},
${shlibs:Depends},
libpeas-common
+Multi-Arch: same
Description: Application plugin library
libpeas is a library that allows applications to support plugins.
@@ -43,6 +44,7 @@
libpeas-common
Breaks: libpeas-1.0-0 (<< 1.8.0-2)
Replaces: libpeas-1.0-0 (<< 1.8.0-2)
+Multi-Arch: same
Description: Application plugin library (Python 2 support)
libpeas is a library that allows applications to support plugins.
This package contains the Python 2 loader shared library.
@@ -63,6 +65,7 @@
libgirepository1.0-dev (>= 1.39.0),
libgtk-3-dev (>= 3.0.0)
Suggests: libpeas-doc
+Multi-Arch: same
Description: Application plugin library (development files)
libpeas is a library that allows applications to support plugins.
.
@@ -83,6 +86,7 @@
Section: libs
Architecture: all
Depends: ${misc:Depends}
+Multi-Arch: foreign
Description: Application plugin library (common files)
libpeas is a library that allows applications to support plugins.
.
@@ -94,6 +98,7 @@
Depends: ${misc:Depends},
${shlibs:Depends},
${gir:Depends}
+Multi-Arch: same
Description: Application plugin library (introspection files)
libpeas is a library that allows applications to support plugins.
.
Modified: desktop/unstable/libpeas/debian/gir1.2-peas-1.0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libpeas/debian/gir1.2-peas-1.0.install?rev=48799&op=diff
==============================================================================
--- desktop/unstable/libpeas/debian/gir1.2-peas-1.0.install [utf-8] (original)
+++ desktop/unstable/libpeas/debian/gir1.2-peas-1.0.install [utf-8] Thu May 19 16:03:32 2016
@@ -1 +1 @@
-usr/lib/girepository-1.0
+usr/lib/*/girepository-1.0
Modified: desktop/unstable/libpeas/debian/libpeas-1.0-0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libpeas/debian/libpeas-1.0-0.install?rev=48799&op=diff
==============================================================================
--- desktop/unstable/libpeas/debian/libpeas-1.0-0.install [utf-8] (original)
+++ desktop/unstable/libpeas/debian/libpeas-1.0-0.install [utf-8] Thu May 19 16:03:32 2016
@@ -1,2 +1,2 @@
-usr/lib/*.so.*
-usr/lib/libpeas-1.0/loaders/libpython3loader.so
+usr/lib/*/*.so.*
+usr/lib/*/libpeas-1.0/loaders/libpython3loader.so
Modified: desktop/unstable/libpeas/debian/libpeas-1.0-python2loader.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libpeas/debian/libpeas-1.0-python2loader.install?rev=48799&op=diff
==============================================================================
--- desktop/unstable/libpeas/debian/libpeas-1.0-python2loader.install [utf-8] (original)
+++ desktop/unstable/libpeas/debian/libpeas-1.0-python2loader.install [utf-8] Thu May 19 16:03:32 2016
@@ -1 +1 @@
-usr/lib/libpeas-1.0/loaders/libpythonloader.so
+usr/lib/*/libpeas-1.0/loaders/libpythonloader.so
Modified: desktop/unstable/libpeas/debian/libpeas-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libpeas/debian/libpeas-dev.install?rev=48799&op=diff
==============================================================================
--- desktop/unstable/libpeas/debian/libpeas-dev.install [utf-8] (original)
+++ desktop/unstable/libpeas/debian/libpeas-dev.install [utf-8] Thu May 19 16:03:32 2016
@@ -1,5 +1,5 @@
usr/include
-usr/lib/*.so
-usr/lib/pkgconfig
+usr/lib/*/*.so
+usr/lib/*/pkgconfig
usr/share/gir-1.0
usr/share/glade/catalogs
Modified: desktop/unstable/libpeas/debian/libpeas-doc.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libpeas/debian/libpeas-doc.install?rev=48799&op=diff
==============================================================================
--- desktop/unstable/libpeas/debian/libpeas-doc.install [utf-8] (original)
+++ desktop/unstable/libpeas/debian/libpeas-doc.install [utf-8] Thu May 19 16:03:32 2016
@@ -1,3 +1,3 @@
usr/bin/peas-demo
-usr/lib/peas-demo
+usr/lib/*/peas-demo
usr/share/gtk-doc
Modified: desktop/unstable/libpeas/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libpeas/debian/rules?rev=48799&op=diff
==============================================================================
--- desktop/unstable/libpeas/debian/rules [utf-8] (original)
+++ desktop/unstable/libpeas/debian/rules [utf-8] Thu May 19 16:03:32 2016
@@ -11,7 +11,8 @@
DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc \
--enable-python2 \
- --enable-python3
+ --enable-python3 \
+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
DEB_MAKE_CHECK_TARGET =
@@ -22,7 +23,7 @@
HOME=$(CURDIR) xvfb-run $(MAKE) check
endif
-DEB_DH_MAKESHLIBS_ARGS_libpeas-1.0-0 += -X/usr/lib/libpeas-1.0/ -V -- -c4
+DEB_DH_MAKESHLIBS_ARGS_libpeas-1.0-0 += -X/usr/lib/$(DEB_HOST_MULTIARCH)/libpeas-1.0/ -V -- -c4
binary-post-install/libpeas-doc::
# remove compiled python and libtool .la files
More information about the pkg-gnome-commits
mailing list