r31208 - in /packages/unstable/libpeas/debian: changelog control control.in libpeas-1.0-0.symbols libpeas-dev.install rules

sjoerd at users.alioth.debian.org sjoerd at users.alioth.debian.org
Sun Nov 6 00:05:18 UTC 2011


Author: sjoerd
Date: Sun Nov  6 00:05:18 2011
New Revision: 31208

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31208
Log:
* Sync with ubuntu:
  * Don't ship vapi files, rely on valac-0.14 shipping them
  * debian/libpeas-1.0-0.symbols: Updates
  * Put libpeas-1.0-0, libpeas-common and gir1.2-peas-1.0 in section libs
  * Don't run the GTK test as they require an X server
  * Set priority to extra

Modified:
    packages/unstable/libpeas/debian/changelog
    packages/unstable/libpeas/debian/control
    packages/unstable/libpeas/debian/control.in
    packages/unstable/libpeas/debian/libpeas-1.0-0.symbols
    packages/unstable/libpeas/debian/libpeas-dev.install
    packages/unstable/libpeas/debian/rules

Modified: packages/unstable/libpeas/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libpeas/debian/changelog?rev=31208&op=diff
==============================================================================
--- packages/unstable/libpeas/debian/changelog [utf-8] (original)
+++ packages/unstable/libpeas/debian/changelog [utf-8] Sun Nov  6 00:05:18 2011
@@ -13,8 +13,14 @@
   [ Sjoerd Simons ]
   * New upstream release
   * Binds plugin module symbols globally, fixes python plugins (Closes: 647292)
-
- -- Sjoerd Simons <sjoerd at debian.org>  Sat, 05 Nov 2011 23:50:41 +0000
+  * Sync with ubuntu:
+    * Don't ship vapi files, rely on valac-0.14 shipping them
+    * debian/libpeas-1.0-0.symbols: Updates
+    * Put libpeas-1.0-0, libpeas-common and gir1.2-peas-1.0 in section libs
+    * Don't run the GTK test as they require an X server
+    * Set priority to extra
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sat, 05 Nov 2011 23:59:33 +0000
 
 libpeas (1.1.1-1) unstable; urgency=low
 

Modified: packages/unstable/libpeas/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libpeas/debian/control?rev=31208&op=diff
==============================================================================
--- packages/unstable/libpeas/debian/control [utf-8] (original)
+++ packages/unstable/libpeas/debian/control [utf-8] Sun Nov  6 00:05:18 2011
@@ -4,9 +4,10 @@
 # This file is regenerated automatically in the clean target.
 
 Source: libpeas
-Priority: optional
-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Frederic Peters <fpeters at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Priority: extra
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Frederic Peters <fpeters at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
 Build-Depends: cdbs (>= 0.4.90),
                debhelper (>= 8),
                gnome-pkg-tools,
@@ -20,8 +21,8 @@
                libgtk-3-dev,
                libseed-gtk3-dev (>= 2.91.91) [!ia64 !mips],
                python-dev (>= 2.5.2),
-               python-gobject-dev (>= 2.20.0),
-               valac-0.12,
+               python-gobject-dev (>= 3.0.0),
+               valac,
                gnome-icon-theme
 Standards-Version: 3.9.2
 Section: libs
@@ -30,6 +31,7 @@
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/libpeas/
 
 Package: libpeas-1.0-0
+Section: libs
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
@@ -65,6 +67,7 @@
  This package contains the API reference for libpeas.
 
 Package: libpeas-common
+Section: libs
 Architecture: all
 Depends: ${misc:Depends}
 Replaces: libpeas-1.0-0 (<< 0.7.0-1)
@@ -74,6 +77,7 @@
  This package contains common files, such as translations and icons.
 
 Package: gir1.2-peas-1.0
+Section: libs
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},

Modified: packages/unstable/libpeas/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libpeas/debian/control.in?rev=31208&op=diff
==============================================================================
--- packages/unstable/libpeas/debian/control.in [utf-8] (original)
+++ packages/unstable/libpeas/debian/control.in [utf-8] Sun Nov  6 00:05:18 2011
@@ -1,5 +1,5 @@
 Source: libpeas
-Priority: optional
+Priority: extra
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
 Build-Depends: cdbs (>= 0.4.90),
@@ -15,8 +15,8 @@
                libgtk-3-dev,
                libseed-gtk3-dev (>= 2.91.91) [!ia64 !mips],
                python-dev (>= 2.5.2),
-               python-gobject-dev (>= 2.20.0),
-               valac-0.12,
+               python-gobject-dev (>= 3.0.0),
+               valac-0.14,
                gnome-icon-theme
 Standards-Version: 3.9.2
 Section: libs
@@ -25,6 +25,7 @@
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/libpeas/
 
 Package: libpeas-1.0-0
+Section: libs
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
@@ -60,6 +61,7 @@
  This package contains the API reference for libpeas.
 
 Package: libpeas-common
+Section: libs
 Architecture: all
 Depends: ${misc:Depends}
 Replaces: libpeas-1.0-0 (<< 0.7.0-1)
@@ -69,6 +71,7 @@
  This package contains common files, such as translations and icons.
 
 Package: gir1.2-peas-1.0
+Section: libs
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},

Modified: packages/unstable/libpeas/debian/libpeas-1.0-0.symbols
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libpeas/debian/libpeas-1.0-0.symbols?rev=31208&op=diff
==============================================================================
--- packages/unstable/libpeas/debian/libpeas-1.0-0.symbols [utf-8] (original)
+++ packages/unstable/libpeas/debian/libpeas-1.0-0.symbols [utf-8] Sun Nov  6 00:05:18 2011
@@ -75,6 +75,7 @@
  peas_plugin_info_get_module_name at Base 1.0.0
  peas_plugin_info_get_name at Base 1.0.0
  peas_plugin_info_get_type at Base 1.0.0
+ peas_plugin_loader_initialize at Base 1.2.0
  peas_plugin_info_get_version at Base 1.0.0
  peas_plugin_info_get_website at Base 1.0.0
  peas_plugin_info_has_dependency at Base 1.0.0

Modified: packages/unstable/libpeas/debian/libpeas-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libpeas/debian/libpeas-dev.install?rev=31208&op=diff
==============================================================================
--- packages/unstable/libpeas/debian/libpeas-dev.install [utf-8] (original)
+++ packages/unstable/libpeas/debian/libpeas-dev.install [utf-8] Sun Nov  6 00:05:18 2011
@@ -3,4 +3,3 @@
 usr/lib/pkgconfig
 usr/share/gir-1.0
 usr/share/glade/catalogs
-libpeas/*.vapi /usr/share/vala/vapi

Modified: packages/unstable/libpeas/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libpeas/debian/rules?rev=31208&op=diff
==============================================================================
--- packages/unstable/libpeas/debian/rules [utf-8] (original)
+++ packages/unstable/libpeas/debian/rules [utf-8] Sun Nov  6 00:05:18 2011
@@ -10,14 +10,10 @@
 
 # We clean the test directory before running check because we need to stop
 # -Bsymbolic-functions from being used when building the tests.  Else
-# the extension-c test fails.
-DEB_MAKE_CHECK_TARGET = -C tests clean check LDFLAGS=""
+# the extension-c test fails.  And we want to avoid the gtk-requiring tests.
+DEB_MAKE_CHECK_TARGET = -C tests/libpeas clean all check LDFLAGS=""
 
 DEB_DH_MAKESHLIBS_ARGS_libpeas-1.0-0 += -X/usr/lib/libpeas-1.0/
-
-common-post-build-arch::
-	# build vapi interface from gir
-	cd libpeas; vapigen --library libpeas-1.0 Peas-1.0.gir
 
 binary-post-install/libpeas-doc::
 	# remove compiled python and libtool .la files




More information about the pkg-gnome-commits mailing list