r44819 - in /desktop/experimental/gnome-panel/debian: changelog control control.in gnome-panel.install libpanel-applet-dev.install libpanel-applet0.install rules
mitya57 at users.alioth.debian.org
mitya57 at users.alioth.debian.org
Thu May 28 12:44:05 UTC 2015
Author: mitya57
Date: Thu May 28 12:44:05 2015
New Revision: 44819
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=44819
Log:
Convert to multi-arch.
Modified:
desktop/experimental/gnome-panel/debian/changelog
desktop/experimental/gnome-panel/debian/control
desktop/experimental/gnome-panel/debian/control.in
desktop/experimental/gnome-panel/debian/gnome-panel.install
desktop/experimental/gnome-panel/debian/libpanel-applet-dev.install
desktop/experimental/gnome-panel/debian/libpanel-applet0.install
desktop/experimental/gnome-panel/debian/rules
Modified: desktop/experimental/gnome-panel/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/changelog?rev=44819&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/changelog [utf-8] Thu May 28 12:44:05 2015
@@ -7,6 +7,7 @@
* Do not pass --with-in-process-applets=all option to configure, it is
now default.
* Add two new symbols to debian/libpanel-applet0.symbols.
+ * Convert to multi-arch.
-- Dmitry Shachnev <mitya57 at debian.org> Wed, 27 May 2015 15:43:48 +0300
Modified: desktop/experimental/gnome-panel/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/control?rev=44819&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/control [utf-8] Thu May 28 12:44:05 2015
@@ -6,9 +6,9 @@
Section: gnome
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Dmitry Shachnev <mitya57 at debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Dmitry Shachnev <mitya57 at debian.org>
Standards-Version: 3.9.6
-Build-Depends: cdbs (>= 0.4.41),
+Build-Depends: cdbs (>= 0.4.93~),
debhelper (>= 9),
dh-autoreconf,
evolution-data-server-dev (>= 3.5.3),
@@ -45,6 +45,7 @@
Package: gir1.2-panelapplet-5.0
Section: introspection
Architecture: any
+Multi-Arch: same
Depends: ${gir:Depends}, ${misc:Depends}, ${shlibs:Depends}
Description: GObject introspection for the GNOME Panel Applet library
This package contains introspection data for the libpanel-applet
@@ -54,6 +55,7 @@
Package: gnome-panel
Architecture: any
+Multi-Arch: foreign
Depends: evolution-common (>= 3.4.3),
gnome-icon-theme-symbolic (>= 3.0.0),
gnome-menus (>= 3.1.4),
@@ -82,6 +84,7 @@
Package: gnome-panel-data
Architecture: all
+Multi-Arch: foreign
Depends: ${misc:Depends}
Recommends: gnome-panel
Description: common files for the GNOME Panel
@@ -92,6 +95,7 @@
Section: debug
Priority: extra
Architecture: any
+Multi-Arch: same
Depends: gnome-panel (= ${binary:Version}),
libpanel-applet0 (= ${binary:Version}),
${misc:Depends}
@@ -104,6 +108,7 @@
Package: libpanel-applet0
Section: libs
Architecture: any
+Multi-Arch: same
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: library for GNOME Panel applets
This library is used by GNOME Panel applets.
@@ -111,6 +116,7 @@
Package: libpanel-applet-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
Depends: gir1.2-panelapplet-5.0 (= ${binary:Version}),
libglib2.0-dev (>= 2.35.0),
libgtk-3-dev (>= 3.3.8),
@@ -124,6 +130,7 @@
Package: libpanel-applet-doc
Section: doc
Architecture: all
+Multi-Arch: foreign
Depends: ${misc:Depends}
Description: library for GNOME Panel applets - documentation files
This package provides the documentation files for the GNOME Panel applet
Modified: desktop/experimental/gnome-panel/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/control.in?rev=44819&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/control.in [utf-8] Thu May 28 12:44:05 2015
@@ -4,7 +4,7 @@
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Uploaders: @GNOME_TEAM@
Standards-Version: 3.9.6
-Build-Depends: cdbs (>= 0.4.41),
+Build-Depends: cdbs (>= 0.4.93~),
debhelper (>= 9),
dh-autoreconf,
evolution-data-server-dev (>= 3.5.3),
@@ -41,6 +41,7 @@
Package: gir1.2-panelapplet-5.0
Section: introspection
Architecture: any
+Multi-Arch: same
Depends: ${gir:Depends}, ${misc:Depends}, ${shlibs:Depends}
Description: GObject introspection for the GNOME Panel Applet library
This package contains introspection data for the libpanel-applet
@@ -50,6 +51,7 @@
Package: gnome-panel
Architecture: any
+Multi-Arch: foreign
Depends: evolution-common (>= 3.4.3),
gnome-icon-theme-symbolic (>= 3.0.0),
gnome-menus (>= 3.1.4),
@@ -78,6 +80,7 @@
Package: gnome-panel-data
Architecture: all
+Multi-Arch: foreign
Depends: ${misc:Depends}
Recommends: gnome-panel
Description: common files for the GNOME Panel
@@ -88,6 +91,7 @@
Section: debug
Priority: extra
Architecture: any
+Multi-Arch: same
Depends: gnome-panel (= ${binary:Version}),
libpanel-applet0 (= ${binary:Version}),
${misc:Depends}
@@ -100,6 +104,7 @@
Package: libpanel-applet0
Section: libs
Architecture: any
+Multi-Arch: same
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: library for GNOME Panel applets
This library is used by GNOME Panel applets.
@@ -107,6 +112,7 @@
Package: libpanel-applet-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
Depends: gir1.2-panelapplet-5.0 (= ${binary:Version}),
libglib2.0-dev (>= 2.35.0),
libgtk-3-dev (>= 3.3.8),
@@ -120,6 +126,7 @@
Package: libpanel-applet-doc
Section: doc
Architecture: all
+Multi-Arch: foreign
Depends: ${misc:Depends}
Description: library for GNOME Panel applets - documentation files
This package provides the documentation files for the GNOME Panel applet
Modified: desktop/experimental/gnome-panel/debian/gnome-panel.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/gnome-panel.install?rev=44819&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/gnome-panel.install [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/gnome-panel.install [utf-8] Thu May 28 12:44:05 2015
@@ -1,4 +1,4 @@
usr/bin
-usr/lib/gnome-panel/*/*.so
+usr/lib/*/gnome-panel/*/*.so
usr/share/applications
usr/share/man
Modified: desktop/experimental/gnome-panel/debian/libpanel-applet-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/libpanel-applet-dev.install?rev=44819&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/libpanel-applet-dev.install [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/libpanel-applet-dev.install [utf-8] Thu May 28 12:44:05 2015
@@ -1,4 +1,4 @@
usr/include
-usr/lib/libpanel-applet*.so
-usr/lib/pkgconfig
+usr/lib/*/libpanel-applet*.so
+usr/lib/*/pkgconfig
usr/share/gir-1.0
Modified: desktop/experimental/gnome-panel/debian/libpanel-applet0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/libpanel-applet0.install?rev=44819&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/libpanel-applet0.install [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/libpanel-applet0.install [utf-8] Thu May 28 12:44:05 2015
@@ -1 +1 @@
-usr/lib/libpanel-applet*.so.*
+usr/lib/*/libpanel-applet*.so.*
Modified: desktop/experimental/gnome-panel/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/rules?rev=44819&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/rules [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/rules [utf-8] Thu May 28 12:44:05 2015
@@ -4,6 +4,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/utils.mk
include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/dpkg/architecture.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
@@ -11,6 +12,7 @@
LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
DEB_CONFIGURE_EXTRA_FLAGS += \
+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
--enable-gtk-doc \
--enable-telepathy-glib
ifneq ($(DEB_BUILD_GNU_SYSTEM),gnu)
More information about the pkg-gnome-commits
mailing list