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
=== modified file 'debian/changelog'
--- debian/changelog 2011-01-03 19:18:45 +0000
+++ debian/changelog 2011-01-24 19:46:31 +0000
@@ -1,3 +1,20 @@
1libgrip (0.1.1-0ubuntu2) UNRELEASED; urgency=low
2
3 * debian/{control,gir1.2-grip-0.1.install,libgrip-0.1-dev.install}
4 - Install the gir and typelib
5 - Added build depends for packages needed to build the GIR
6 - Added build depends for dh-autoreconf
7 * debian/{control,python-grip.install}
8 - Added new package for the python bindings (just a gi.overrides)
9 * debian/rules
10 - added dh_girepository for gir:Depends
11 - include autoreconf.mk
12 * +debian/source/format
13 * debian/libgrip-0.1-0.symbols
14 - Added new symbols
15
16 -- Ken VanDine <ken.vandine@canonical.com> Mon, 24 Jan 2011 14:32:30 -0500
17
1libgrip (0.1.1-0ubuntu1) natty; urgency=low18libgrip (0.1.1-0ubuntu1) natty; urgency=low
219
3 * Bump version and release for Natty.20 * Bump version and release for Natty.
421
=== modified file 'debian/control'
--- debian/control 2010-11-29 22:07:57 +0000
+++ debian/control 2011-01-24 19:46:31 +0000
@@ -1,14 +1,23 @@
1Source: libgrip1Source: libgrip
2Section: libs2Section: libs
3Priority: optional3Priority: optional
4XS-Python-Version: all
4Maintainer: Cody Russell <cody.russell@ubuntu.com>5Maintainer: Cody Russell <cody.russell@ubuntu.com>
5Build-Depends: debhelper (>= 5.0),6Build-Depends: debhelper (>= 5.0),
6 cdbs (>= 0.4.41),7 cdbs (>= 0.4.41),
7 libglib2.0-dev (>=2.14.0),8 libglib2.0-dev (>=2.14.0),
8 libgtk2.0-dev (>= 2.21.5-1ubuntu3),9 libgtk2.0-dev (>= 2.21.5-1ubuntu3),
9 gtk-doc-tools,10 gtk-doc-tools,
10 libutouch-geis-dev11 libutouch-geis-dev,
11Standards-Version: 3.8.412 gobject-introspection,
13 libgirepository1.0-dev,
14 gir1.2-glib-2.0,
15 gir1.2-gtk-2.0,
16 gir1.2-pango-1.0,
17 gir1.2-gdkpixbuf-2.0,
18 gir1.2-freedesktop,
19 dh-autoreconf
20Standards-Version: 3.9.1
12Homepage: https://launchpad.net/libgrip21Homepage: https://launchpad.net/libgrip
1322
14Package: libgrip-0.1-023Package: libgrip-0.1-0
@@ -32,3 +41,23 @@
32Description: Shared library providing multitouch gestures to gtk apps.41Description: Shared library providing multitouch gestures to gtk apps.
33 .42 .
34 This package contains files that are needed to build applications.43 This package contains files that are needed to build applications.
44
45Package: gir1.2-grip-0.1
46Section: libs
47Architecture: any
48Depends: ${misc:Depends},
49 ${gir:Depends}
50Description: typelib file for libgrip
51 .
52 This package can be used by other packages using the GIRepository format to
53 generate dynamic bindings for libgrip
54
55Package: python-grip
56Section: python
57Architecture: all
58Depends: ${misc:Depends},
59 ${python:Depends}
60Description: python bindings for libgrip
61 .
62 This package provides Python bindings so that you can use libgrip from
63 a Python program.
3564
=== added file 'debian/gir1.2-grip-0.1.install'
--- debian/gir1.2-grip-0.1.install 1970-01-01 00:00:00 +0000
+++ debian/gir1.2-grip-0.1.install 2011-01-24 19:46:31 +0000
@@ -0,0 +1,1 @@
1debian/tmp/usr/lib/girepository-1.0/Grip-0.1.typelib
02
=== modified file 'debian/libgrip-0.1-0.symbols'
--- debian/libgrip-0.1-0.symbols 2010-11-24 17:06:51 +0000
+++ debian/libgrip-0.1-0.symbols 2011-01-24 19:46:31 +0000
@@ -1,4 +1,8 @@
1libgrip-0.1.so.0 libgrip-0.1-0 #MINVER#1libgrip-0.1.so.0 libgrip-0.1-0 #MINVER#
2 grip_gesture_event_copy@Base 0.1.1
3 grip_gesture_event_free@Base 0.1.1
4 grip_gesture_event_get_type@Base 0.1.1
5 grip_gesture_event_new@Base 0.1.1
2 grip_gesture_manager_get@Base 0.1.06 grip_gesture_manager_get@Base 0.1.0
3 grip_gesture_manager_get_type@Base 0.1.07 grip_gesture_manager_get_type@Base 0.1.0
4 grip_gesture_manager_register_window@Base 0.1.08 grip_gesture_manager_register_window@Base 0.1.0
59
=== modified file 'debian/libgrip-0.1-dev.install'
--- debian/libgrip-0.1-dev.install 2010-11-24 17:06:51 +0000
+++ debian/libgrip-0.1-dev.install 2011-01-24 19:46:31 +0000
@@ -1,3 +1,4 @@
1debian/tmp/usr/include/1debian/tmp/usr/include/
2debian/tmp/usr/lib/pkgconfig2debian/tmp/usr/lib/pkgconfig
3debian/tmp/usr/lib/*.so3debian/tmp/usr/lib/*.so
4debian/tmp/usr/share/gir-1.0/Grip-0.1.gir
45
=== added file 'debian/python-grip.install'
--- debian/python-grip.install 1970-01-01 00:00:00 +0000
+++ debian/python-grip.install 2011-01-24 19:46:31 +0000
@@ -0,0 +1,1 @@
1debian/tmp/usr/*/*python*
02
=== modified file 'debian/rules'
--- debian/rules 2010-11-24 17:06:51 +0000
+++ debian/rules 2011-01-24 19:46:31 +0000
@@ -2,8 +2,10 @@
22
3include /usr/share/cdbs/1/rules/debhelper.mk3include /usr/share/cdbs/1/rules/debhelper.mk
4include /usr/share/cdbs/1/class/autotools.mk4include /usr/share/cdbs/1/class/autotools.mk
5include /usr/share/cdbs/1/rules/simple-patchsys.mk
6include /usr/share/cdbs/1/rules/utils.mk5include /usr/share/cdbs/1/rules/utils.mk
6include /usr/share/cdbs/1/rules/autoreconf.mk
7
8DEB_PYTHON_SYSTEM=dh_python2
79
8DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-O1 -Wl,--as-needed"10DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-O1 -Wl,--as-needed"
9DEB_COMPRESS_EXCLUDE = .c11DEB_COMPRESS_EXCLUDE = .c
@@ -14,4 +16,10 @@
14 find debian/tmp/usr/lib -name \*.la -exec rm {} \;16 find debian/tmp/usr/lib -name \*.la -exec rm {} \;
15 find debian/tmp/usr/lib -name \*.a -exec rm {} \;17 find debian/tmp/usr/lib -name \*.a -exec rm {} \;
1618
19binary-predeb/gir%::
20 dh_girepository -p$(cdbs_curpkg)
21
22binary-predeb/python-grip::
23 dh_python2 -ppython-grip
24
17common-binary-predeb-arch:: list-missing25common-binary-predeb-arch:: list-missing
1826
=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format 1970-01-01 00:00:00 +0000
+++ debian/source/format 2011-01-24 19:46:31 +0000
@@ -0,0 +1,1 @@
13.0 (quilt)

Subscribers

People subscribed via source and target branches