Merge lp:~andrewsomething/ubuntu/natty/libgda4/690688 into lp:ubuntu/natty/libgda4

Proposed by Andrew Starr-Bochicchio
Status: Merged
Merged at revision: 13
Proposed branch: lp:~andrewsomething/ubuntu/natty/libgda4/690688
Merge into: lp:ubuntu/natty/libgda4
Diff against target: 118 lines (+16/-44)
5 files modified
debian/changelog (+11/-0)
debian/control (+1/-21)
debian/control.in (+2/-17)
debian/gir1.0-gda-4.0.install (+0/-2)
debian/rules (+2/-4)
To merge this branch: bzr merge lp:~andrewsomething/ubuntu/natty/libgda4/690688
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+43780@code.launchpad.net
To post a comment you must log in.
14. By Andrew Starr-Bochicchio

Fix minor typo in debian/changelog

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-12-11 15:12:39 +0000
3+++ debian/changelog 2010-12-15 15:44:41 +0000
4@@ -1,3 +1,14 @@
5+libgda4 (4.2.2-1ubuntu1) natty; urgency=low
6+
7+ * debian/rules: Disable introspection as libgda fails
8+ to build against recent versions of gobject-
9+ introspection. See GNOME bug 629779 (LP: #690688)
10+ * debian/control: Temporarily drop introspection related
11+ build dependencies and don't build gir1.0-gda-4.0; it
12+ doesn't have any reverse depends.
13+
14+ -- Andrew Starr-Bochicchio <a.starr.b@gmail.com> Wed, 15 Dec 2010 10:11:00 -0500
15+
16 libgda4 (4.2.2-1) experimental; urgency=low
17
18 [ Piotr Pokora ]
19
20=== modified file 'debian/control'
21--- debian/control 2010-12-11 15:12:39 +0000
22+++ debian/control 2010-12-15 15:44:41 +0000
23@@ -23,11 +23,7 @@
24 libpopt-dev,
25 libsoup2.4-dev,
26 zlib1g-dev,
27- scrollkeeper,
28- gobject-introspection (>= 0.6.5),
29- libgirepository1.0-dev (>= 0.6.5),
30- gir1.0-freedesktop,
31- gir1.0-glib-2.0
32+ scrollkeeper
33 Build-Depends-Indep: gtk-doc-tools,
34 sgmltools-lite
35 Standards-Version: 3.9.1
36@@ -168,19 +164,3 @@
37 .
38 This package contains the provider needed to access PostgreSQL
39 databases through libgda.
40-
41-Package: gir1.0-gda-4.0
42-Section: libs
43-Architecture: any
44-Depends: libgda-4.0-4 (= ${binary:Version}),
45- ${shlibs:Depends},
46- ${misc:Depends},
47- ${gir:Depends}
48-Description: data abstraction library based on GLib -- GObject Introspection
49- libgda is a (relatively small) database abstraction/access library
50- integrated on the GLib object model. It can be used as a metadata
51- extractor, to get information about all database objects in a common
52- way, and as an ODBC-like wrapper to access data in different engines
53- through an easier API.
54- .
55- This package contains introspection data for libgda.
56
57=== modified file 'debian/control.in'
58--- debian/control.in 2010-12-11 15:12:39 +0000
59+++ debian/control.in 2010-12-15 15:44:41 +0000
60@@ -1,7 +1,8 @@
61 Source: libgda4
62 Section: libs
63 Priority: optional
64-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
65+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
66+XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
67 Uploaders: @GNOME_TEAM@, Piotr Pokora <piotrek.pokora@gmail.com>
68 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/packages/unstable/libgda4/
69 Vcs-Svn: svn://svn.debian.org/pkg-gnome/packages/unstable/libgda4/
70@@ -168,19 +169,3 @@
71 .
72 This package contains the provider needed to access PostgreSQL
73 databases through libgda.
74-
75-Package: gir1.0-gda-4.0
76-Section: libs
77-Architecture: any
78-Depends: libgda-4.0-@SONAME@ (= ${binary:Version}),
79- ${shlibs:Depends},
80- ${misc:Depends},
81- ${gir:Depends}
82-Description: data abstraction library based on GLib -- GObject Introspection
83- libgda is a (relatively small) database abstraction/access library
84- integrated on the GLib object model. It can be used as a metadata
85- extractor, to get information about all database objects in a common
86- way, and as an ODBC-like wrapper to access data in different engines
87- through an easier API.
88- .
89- This package contains introspection data for libgda.
90
91=== removed file 'debian/gir1.0-gda-4.0.install'
92--- debian/gir1.0-gda-4.0.install 2010-07-16 23:37:27 +0000
93+++ debian/gir1.0-gda-4.0.install 1970-01-01 00:00:00 +0000
94@@ -1,2 +0,0 @@
95-usr/share/gir-1.0/Gda-4.0.gir
96-usr/lib/girepository-1.0/Gda-4.0.typelib
97
98=== modified file 'debian/rules'
99--- debian/rules 2010-12-11 15:12:39 +0000
100+++ debian/rules 2010-12-15 15:44:41 +0000
101@@ -24,7 +24,8 @@
102 --without-mdb \
103 --without-java \
104 --enable-system-sqlite \
105- --disable-crypto
106+ --disable-crypto \
107+ --disable-introspection
108
109 # Only build the docs if this file is present (e.g. when building arch.all packages)
110 $(DEB_BUILDDIR)/config.status: DEB_CONFIGURE_EXTRA_FLAGS += $(shell if test -f /usr/share/pkgconfig/gtk-doc.pc; then echo "--enable-gtk-doc"; fi)
111@@ -56,7 +57,4 @@
112 dh_link -p$$i usr/share/doc/libgda-4.0-$(SONAME) usr/share/doc/$$i; \
113 done
114
115-binary-predeb/gir1.0-gda-4.0::
116- dh_girepository -p$(cdbs_curpkg)
117-
118 .PHONY: clean common-binary-post-install-arch

Subscribers

People subscribed via source and target branches