r31472 - in /packages/unstable/json-glib/debian: changelog control control.in gir1.2-json-1.0.install libjson-glib-1.0-0.install libjson-glib-dev.install libjson-glib-doc.install rules
bigon at users.alioth.debian.org
bigon at users.alioth.debian.org
Thu Nov 17 09:55:48 UTC 2011
Author: bigon
Date: Thu Nov 17 09:55:47 2011
New Revision: 31472
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31472
Log:
Add multiarch support
Modified:
packages/unstable/json-glib/debian/changelog
packages/unstable/json-glib/debian/control
packages/unstable/json-glib/debian/control.in
packages/unstable/json-glib/debian/gir1.2-json-1.0.install
packages/unstable/json-glib/debian/libjson-glib-1.0-0.install
packages/unstable/json-glib/debian/libjson-glib-dev.install
packages/unstable/json-glib/debian/libjson-glib-doc.install
packages/unstable/json-glib/debian/rules
Modified: packages/unstable/json-glib/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/json-glib/debian/changelog?rev=31472&op=diff
==============================================================================
--- packages/unstable/json-glib/debian/changelog [utf-8] (original)
+++ packages/unstable/json-glib/debian/changelog [utf-8] Thu Nov 17 09:55:47 2011
@@ -1,9 +1,10 @@
json-glib (0.14.2-1) UNRELEASED; urgency=low
* New upstream release
+ * Add multiarch support
* debian/watch: Switch to .xz tarballs
- -- Laurent Bigonville <bigon at debian.org> Wed, 16 Nov 2011 16:08:26 +0100
+ -- Laurent Bigonville <bigon at debian.org> Thu, 17 Nov 2011 10:23:18 +0100
json-glib (0.14.0-1) unstable; urgency=low
Modified: packages/unstable/json-glib/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/json-glib/debian/control?rev=31472&op=diff
==============================================================================
--- packages/unstable/json-glib/debian/control [utf-8] (original)
+++ packages/unstable/json-glib/debian/control [utf-8] Thu Nov 17 09:55:47 2011
@@ -7,9 +7,9 @@
Section: libs
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Laurent Bigonville <bigon at debian.org>, Rob Bradford <robster at debian.org>, Ross Burton <ross at debian.org>, Sjoerd Simons <sjoerd at debian.org>
-Build-Depends: debhelper (>= 8),
- cdbs (>= 0.4.90~),
+Uploaders: Laurent Bigonville <bigon at debian.org>, Rob Bradford <robster at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Build-Depends: debhelper (>= 8.1.3),
+ cdbs (>= 0.4.93~),
gnome-pkg-tools,
libglib2.0-dev (>= 2.27.3),
gtk-doc-tools,
@@ -24,6 +24,8 @@
Package: libjson-glib-1.0-0
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: GLib JSON manipulation library
JSON-GLib is a library for parsing, generating and manipulating JavaScript
Object Notation (JSON) data streams using the GLib type system. It allows
@@ -35,6 +37,7 @@
Section: debug
Priority: extra
Architecture: any
+Multi-Arch: same
Depends: libjson-glib-1.0-0 (= ${binary:Version}), ${misc:Depends}
Description: GLib JSON manipulation library (debug symbols)
JSON-GLib is a library for parsing, generating and manipulating JavaScript
Modified: packages/unstable/json-glib/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/json-glib/debian/control.in?rev=31472&op=diff
==============================================================================
--- packages/unstable/json-glib/debian/control.in [utf-8] (original)
+++ packages/unstable/json-glib/debian/control.in [utf-8] Thu Nov 17 09:55:47 2011
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 8),
- cdbs (>= 0.4.90~),
+Build-Depends: debhelper (>= 8.1.3),
+ cdbs (>= 0.4.93~),
gnome-pkg-tools,
libglib2.0-dev (>= 2.27.3),
gtk-doc-tools,
@@ -19,6 +19,8 @@
Package: libjson-glib-1.0-0
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: GLib JSON manipulation library
JSON-GLib is a library for parsing, generating and manipulating JavaScript
Object Notation (JSON) data streams using the GLib type system. It allows
@@ -30,6 +32,7 @@
Section: debug
Priority: extra
Architecture: any
+Multi-Arch: same
Depends: libjson-glib-1.0-0 (= ${binary:Version}), ${misc:Depends}
Description: GLib JSON manipulation library (debug symbols)
JSON-GLib is a library for parsing, generating and manipulating JavaScript
Modified: packages/unstable/json-glib/debian/gir1.2-json-1.0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/json-glib/debian/gir1.2-json-1.0.install?rev=31472&op=diff
==============================================================================
--- packages/unstable/json-glib/debian/gir1.2-json-1.0.install [utf-8] (original)
+++ packages/unstable/json-glib/debian/gir1.2-json-1.0.install [utf-8] Thu Nov 17 09:55:47 2011
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/girepository-1.0/
+usr/lib/*/girepository-1.0/ usr/lib/
Modified: packages/unstable/json-glib/debian/libjson-glib-1.0-0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/json-glib/debian/libjson-glib-1.0-0.install?rev=31472&op=diff
==============================================================================
--- packages/unstable/json-glib/debian/libjson-glib-1.0-0.install [utf-8] (original)
+++ packages/unstable/json-glib/debian/libjson-glib-1.0-0.install [utf-8] Thu Nov 17 09:55:47 2011
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/*.so.*
+usr/lib/*/*.so.*
Modified: packages/unstable/json-glib/debian/libjson-glib-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/json-glib/debian/libjson-glib-dev.install?rev=31472&op=diff
==============================================================================
--- packages/unstable/json-glib/debian/libjson-glib-dev.install [utf-8] (original)
+++ packages/unstable/json-glib/debian/libjson-glib-dev.install [utf-8] Thu Nov 17 09:55:47 2011
@@ -1,4 +1,4 @@
-debian/tmp/usr/lib/*.so
-debian/tmp/usr/lib/pkgconfig/
-debian/tmp/usr/include/
-debian/tmp/usr/share/gir-1.0/
+usr/lib/*/*.so
+usr/lib/*/pkgconfig/
+usr/include/
+usr/share/gir-1.0/
Modified: packages/unstable/json-glib/debian/libjson-glib-doc.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/json-glib/debian/libjson-glib-doc.install?rev=31472&op=diff
==============================================================================
--- packages/unstable/json-glib/debian/libjson-glib-doc.install [utf-8] (original)
+++ packages/unstable/json-glib/debian/libjson-glib-doc.install [utf-8] Thu Nov 17 09:55:47 2011
@@ -1,1 +1,1 @@
-debian/tmp/usr/share/gtk-doc/html/json-glib
+usr/share/gtk-doc/html/json-glib
Modified: packages/unstable/json-glib/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/json-glib/debian/rules?rev=31472&op=diff
==============================================================================
--- packages/unstable/json-glib/debian/rules [utf-8] (original)
+++ packages/unstable/json-glib/debian/rules [utf-8] Thu Nov 17 09:55:47 2011
@@ -8,7 +8,9 @@
DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-O1 -Wl,--as-needed"
DEB_COMPRESS_EXCLUDE = .c
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-gtk-doc --enable-introspection=yes
+DEB_CONFIGURE_EXTRA_FLAGS := --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
+ --enable-gtk-doc \
+ --enable-introspection=yes
DEB_DH_MAKESHLIBS_ARGS_libjson-glib-1.0-0 += -V -- -c4
DEB_MAKE_CHECK_TARGET = test
More information about the pkg-gnome-commits
mailing list