Merge lp:~ken-vandine/libgrip/packaging-with-gir into lp:~oif-team/libgrip/packaging

Proposed by Ken VanDine
Status: Merged
Merged at revision: 24
Proposed branch: lp:~ken-vandine/libgrip/packaging-with-gir
Merge into: lp:~oif-team/libgrip/packaging
Diff against target: 146 lines (+65/-3)
8 files modified
debian/changelog (+17/-0)
debian/control (+31/-2)
debian/gir1.2-grip-0.1.install (+1/-0)
debian/libgrip-0.1-0.symbols (+4/-0)
debian/libgrip-0.1-dev.install (+1/-0)
debian/python-grip.install (+1/-0)
debian/rules (+9/-1)
debian/source/format (+1/-0)
To merge this branch: bzr merge lp:~ken-vandine/libgrip/packaging-with-gir
Reviewer Review Type Date Requested Status
Cody Russell (community) Approve
Review via email: mp+47096@code.launchpad.net

Description of the change

  * debian/{control,gir1.2-grip-0.1.install,libgrip-0.1-dev.install}
    - Install the gir and typelib
    - Added build depends for packages needed to build the GIR
    - Added build depends for dh-autoreconf
  * debian/rules
    - added dh_girepository for gir:Depends
    - include autoreconf.mk
  * +debian/source/format

To post a comment you must log in.
Revision history for this message
Cody Russell (bratsche) :
review: Approve

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 2011-01-03 19:18:45 +0000
3+++ debian/changelog 2011-01-24 19:46:31 +0000
4@@ -1,3 +1,20 @@
5+libgrip (0.1.1-0ubuntu2) UNRELEASED; urgency=low
6+
7+ * debian/{control,gir1.2-grip-0.1.install,libgrip-0.1-dev.install}
8+ - Install the gir and typelib
9+ - Added build depends for packages needed to build the GIR
10+ - Added build depends for dh-autoreconf
11+ * debian/{control,python-grip.install}
12+ - Added new package for the python bindings (just a gi.overrides)
13+ * debian/rules
14+ - added dh_girepository for gir:Depends
15+ - include autoreconf.mk
16+ * +debian/source/format
17+ * debian/libgrip-0.1-0.symbols
18+ - Added new symbols
19+
20+ -- Ken VanDine <ken.vandine@canonical.com> Mon, 24 Jan 2011 14:32:30 -0500
21+
22 libgrip (0.1.1-0ubuntu1) natty; urgency=low
23
24 * Bump version and release for Natty.
25
26=== modified file 'debian/control'
27--- debian/control 2010-11-29 22:07:57 +0000
28+++ debian/control 2011-01-24 19:46:31 +0000
29@@ -1,14 +1,23 @@
30 Source: libgrip
31 Section: libs
32 Priority: optional
33+XS-Python-Version: all
34 Maintainer: Cody Russell <cody.russell@ubuntu.com>
35 Build-Depends: debhelper (>= 5.0),
36 cdbs (>= 0.4.41),
37 libglib2.0-dev (>=2.14.0),
38 libgtk2.0-dev (>= 2.21.5-1ubuntu3),
39 gtk-doc-tools,
40- libutouch-geis-dev
41-Standards-Version: 3.8.4
42+ libutouch-geis-dev,
43+ gobject-introspection,
44+ libgirepository1.0-dev,
45+ gir1.2-glib-2.0,
46+ gir1.2-gtk-2.0,
47+ gir1.2-pango-1.0,
48+ gir1.2-gdkpixbuf-2.0,
49+ gir1.2-freedesktop,
50+ dh-autoreconf
51+Standards-Version: 3.9.1
52 Homepage: https://launchpad.net/libgrip
53
54 Package: libgrip-0.1-0
55@@ -32,3 +41,23 @@
56 Description: Shared library providing multitouch gestures to gtk apps.
57 .
58 This package contains files that are needed to build applications.
59+
60+Package: gir1.2-grip-0.1
61+Section: libs
62+Architecture: any
63+Depends: ${misc:Depends},
64+ ${gir:Depends}
65+Description: typelib file for libgrip
66+ .
67+ This package can be used by other packages using the GIRepository format to
68+ generate dynamic bindings for libgrip
69+
70+Package: python-grip
71+Section: python
72+Architecture: all
73+Depends: ${misc:Depends},
74+ ${python:Depends}
75+Description: python bindings for libgrip
76+ .
77+ This package provides Python bindings so that you can use libgrip from
78+ a Python program.
79
80=== added file 'debian/gir1.2-grip-0.1.install'
81--- debian/gir1.2-grip-0.1.install 1970-01-01 00:00:00 +0000
82+++ debian/gir1.2-grip-0.1.install 2011-01-24 19:46:31 +0000
83@@ -0,0 +1,1 @@
84+debian/tmp/usr/lib/girepository-1.0/Grip-0.1.typelib
85
86=== modified file 'debian/libgrip-0.1-0.symbols'
87--- debian/libgrip-0.1-0.symbols 2010-11-24 17:06:51 +0000
88+++ debian/libgrip-0.1-0.symbols 2011-01-24 19:46:31 +0000
89@@ -1,4 +1,8 @@
90 libgrip-0.1.so.0 libgrip-0.1-0 #MINVER#
91+ grip_gesture_event_copy@Base 0.1.1
92+ grip_gesture_event_free@Base 0.1.1
93+ grip_gesture_event_get_type@Base 0.1.1
94+ grip_gesture_event_new@Base 0.1.1
95 grip_gesture_manager_get@Base 0.1.0
96 grip_gesture_manager_get_type@Base 0.1.0
97 grip_gesture_manager_register_window@Base 0.1.0
98
99=== modified file 'debian/libgrip-0.1-dev.install'
100--- debian/libgrip-0.1-dev.install 2010-11-24 17:06:51 +0000
101+++ debian/libgrip-0.1-dev.install 2011-01-24 19:46:31 +0000
102@@ -1,3 +1,4 @@
103 debian/tmp/usr/include/
104 debian/tmp/usr/lib/pkgconfig
105 debian/tmp/usr/lib/*.so
106+debian/tmp/usr/share/gir-1.0/Grip-0.1.gir
107
108=== added file 'debian/python-grip.install'
109--- debian/python-grip.install 1970-01-01 00:00:00 +0000
110+++ debian/python-grip.install 2011-01-24 19:46:31 +0000
111@@ -0,0 +1,1 @@
112+debian/tmp/usr/*/*python*
113
114=== modified file 'debian/rules'
115--- debian/rules 2010-11-24 17:06:51 +0000
116+++ debian/rules 2011-01-24 19:46:31 +0000
117@@ -2,8 +2,10 @@
118
119 include /usr/share/cdbs/1/rules/debhelper.mk
120 include /usr/share/cdbs/1/class/autotools.mk
121-include /usr/share/cdbs/1/rules/simple-patchsys.mk
122 include /usr/share/cdbs/1/rules/utils.mk
123+include /usr/share/cdbs/1/rules/autoreconf.mk
124+
125+DEB_PYTHON_SYSTEM=dh_python2
126
127 DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-O1 -Wl,--as-needed"
128 DEB_COMPRESS_EXCLUDE = .c
129@@ -14,4 +16,10 @@
130 find debian/tmp/usr/lib -name \*.la -exec rm {} \;
131 find debian/tmp/usr/lib -name \*.a -exec rm {} \;
132
133+binary-predeb/gir%::
134+ dh_girepository -p$(cdbs_curpkg)
135+
136+binary-predeb/python-grip::
137+ dh_python2 -ppython-grip
138+
139 common-binary-predeb-arch:: list-missing
140
141=== added directory 'debian/source'
142=== added file 'debian/source/format'
143--- debian/source/format 1970-01-01 00:00:00 +0000
144+++ debian/source/format 2011-01-24 19:46:31 +0000
145@@ -0,0 +1,1 @@
146+3.0 (quilt)

Subscribers

People subscribed via source and target branches