r45029 - in /desktop/experimental/gnome-panel/debian: changelog control control.in gnome-panel.install libpanel-applet-dev.install libpanel-applet0.install patches/ patches/fix_typelibdir.patch rules

mitya57 at users.alioth.debian.org mitya57 at users.alioth.debian.org
Thu Jun 11 10:15:41 UTC 2015 

Author: mitya57
Date: Thu Jun 11 10:15:40 2015
New Revision: 45029

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=45029
Log:
* Revert the convertion to multi-arch. We cannot yet do that because
  paths to applets libraries are read from *.panel_applet files in
  /usr/share/gnome-panel, and thus should be architecure-independent.
  If in a future release .panel_applet files are moved into /usr/lib,
  then we will be able to reconsider this change.
* Restore and refresh fix_typelibdir.patch.

Added:
    desktop/experimental/gnome-panel/debian/patches/
      - copied from r44818, desktop/experimental/gnome-panel/debian/patches/
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/patches/fix_typelibdir.patch
    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=45029&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/changelog	[utf-8] Thu Jun 11 10:15:40 2015
@@ -1,8 +1,14 @@
 gnome-panel (3.16.1-2) UNRELEASED; urgency=medium
 
   * debian/rules: Fix package name in dh_makeshlibs flags.
-
- -- Dmitry Shachnev <mitya57 at debian.org>  Mon, 08 Jun 2015 11:08:30 +0300
+  * Revert the convertion to multi-arch. We cannot yet do that because
+    paths to applets libraries are read from *.panel_applet files in
+    /usr/share/gnome-panel, and thus should be architecure-independent.
+    If in a future release .panel_applet files are moved into /usr/lib,
+    then we will be able to reconsider this change.
+  * Restore and refresh fix_typelibdir.patch.
+
+ -- Dmitry Shachnev <mitya57 at debian.org>  Thu, 11 Jun 2015 13:13:27 +0300
 
 gnome-panel (3.16.1-1) experimental; urgency=medium
 

Modified: desktop/experimental/gnome-panel/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/control?rev=45029&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/control	[utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/control	[utf-8] Thu Jun 11 10:15:40 2015
@@ -45,7 +45,6 @@
 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
@@ -55,7 +54,6 @@
 
 Package: gnome-panel
 Architecture: any
-Multi-Arch: foreign
 Depends: evolution-common (>= 3.4.3),
          gnome-menus (>= 3.1.4),
          gnome-panel-data (= ${source:Version}),
@@ -82,7 +80,6 @@
 
 Package: gnome-panel-data
 Architecture: all
-Multi-Arch: foreign
 Depends: ${misc:Depends}
 Recommends: gnome-panel
 Description: common files for the GNOME Panel
@@ -93,7 +90,6 @@
 Section: debug
 Priority: extra
 Architecture: any
-Multi-Arch: same
 Depends: gnome-panel (= ${binary:Version}),
          libpanel-applet0 (= ${binary:Version}),
          ${misc:Depends}
@@ -106,7 +102,6 @@
 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.
@@ -114,7 +109,6 @@
 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),
@@ -128,7 +122,6 @@
 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=45029&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/control.in	[utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/control.in	[utf-8] Thu Jun 11 10:15:40 2015
@@ -41,7 +41,6 @@
 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
@@ -51,7 +50,6 @@
 
 Package: gnome-panel
 Architecture: any
-Multi-Arch: foreign
 Depends: evolution-common (>= 3.4.3),
          gnome-menus (>= 3.1.4),
          gnome-panel-data (= ${source:Version}),
@@ -78,7 +76,6 @@
 
 Package: gnome-panel-data
 Architecture: all
-Multi-Arch: foreign
 Depends: ${misc:Depends}
 Recommends: gnome-panel
 Description: common files for the GNOME Panel
@@ -89,7 +86,6 @@
 Section: debug
 Priority: extra
 Architecture: any
-Multi-Arch: same
 Depends: gnome-panel (= ${binary:Version}),
          libpanel-applet0 (= ${binary:Version}),
          ${misc:Depends}
@@ -102,7 +98,6 @@
 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.
@@ -110,7 +105,6 @@
 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,7 +118,6 @@
 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=45029&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/gnome-panel.install	[utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/gnome-panel.install	[utf-8] Thu Jun 11 10:15:40 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=45029&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 Jun 11 10:15:40 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=45029&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/libpanel-applet0.install	[utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/libpanel-applet0.install	[utf-8] Thu Jun 11 10:15:40 2015
@@ -1 +1 @@
-usr/lib/*/libpanel-applet*.so.*
+usr/lib/libpanel-applet*.so.*

Modified: desktop/experimental/gnome-panel/debian/patches/fix_typelibdir.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/fix_typelibdir.patch?rev=45029&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/fix_typelibdir.patch	[utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/patches/fix_typelibdir.patch	[utf-8] Thu Jun 11 10:15:40 2015
@@ -1,11 +1,11 @@
 Description: fix typelibdir path for Debian
 Author: Dmitry Shachnev <mitya57 at debian.org>
 Forwarded: yes
-Last-Update: 2014-10-30
+Last-Update: 2015-06-11
 
 --- a/libpanel-applet/Makefile.am
 +++ b/libpanel-applet/Makefile.am
-@@ -124,7 +124,7 @@
+@@ -125,7 +125,7 @@
  girdir = $(datadir)/gir-1.0
  gir_DATA = $(INTROSPECTION_GIRS)
  

Modified: desktop/experimental/gnome-panel/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/rules?rev=45029&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/rules	[utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/rules	[utf-8] Thu Jun 11 10:15:40 2015
@@ -4,7 +4,6 @@
 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
@@ -12,7 +11,6 @@
 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