Merge lp:~cyphermox/libgrip/inline into lp:libgrip

[Mathieu Trudel-Lapierre]

Inline packaging.

[Didier Roche-Tolomelli (didrocks)]

Hey Mathieu, thanks for the merge!

* I would say as for the other MR: did you test that multiarch didn't break the installed version?
* Please remove the undeeded Breaks/Replaces that are not in a supported upgrade path
* -exec rm {} \ can be done with -delete as seb mentionned the other day :)

If you change the two latest and can answer "yes" to the first one, please get it merged :)
Nice work!

review: Approve

[lp:~cyphermox/libgrip/inline]

89. By Mathieu Trudel-Lapierre on 2012-11-27

Drop the unneeded old Breaks/Replaces lines.

90. By Mathieu Trudel-Lapierre on 2012-11-27

Change the --exec rm find commands with the equivalent -delete which does the same thing.

[Mathieu Trudel-Lapierre (cyphermox)]

I can't properly test that the grips themselves work, but I see no issues loading, say, eog with libgrip after multiarch; the shared libraries are found without issues.

[Francis Ginther (fginther)]

Verified that didrocks' comments have been implemented. Approving.

review: Approve

=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf	1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf	2012-11-27 20:56:33 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+split = True

=== added directory 'debian'
=== added file 'debian/changelog'
--- debian/changelog	1970-01-01 00:00:00 +0000
+++ debian/changelog	2012-11-27 20:56:33 +0000
@@ -0,0 +1,174 @@
+libgrip (0.3.6-0ubuntu1) UNRELEASED; urgency=low
+
+  * debian/control:
+    - Update Vcs-Bzr, Vcs-Browser and add a notice to uploaders.
+    - Update style: use trailing commas at the end of dependency lists. 
+    - Drop Build-Depends on cdbs.
+    - Bump Build-Depends on debhelper to (>= 9).
+    - Reorganize Build-Depends for clarity.
+    - Add a Build-Depends on gnome-common.
+    - Add a Build-Depends on dh-autoreconf.
+    - Add a Pre-Depends: multiarch-support for libgrip0.
+    - Drop the unneeded old Breaks/Replaces lines.
+  * debian/compat: bump compat level to 9.
+  * debian/rules:
+    - Convert to using the dh9 sequencer.
+    - Add and export DPKG_GENSYMBOLS_CHECK_LEVEL.
+    - Explicitly remove grip-test binary to avoid dh_install failing the build.
+  * debian/*.install: update paths for multiarch.
+  * debian/source/format: migrate back to source format 1.0.
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Thu, 22 Nov 2012 17:19:36 -0500
+
+libgrip (0.3.5-0ubuntu1) quantal; urgency=low
+
+  * New upstream release.
+    - Update dependency on libgeis due to project rename
+    - Remove lp872022-disconnect-non-toplevel-signal.patch, merged upstream
+  * Update debian/control for upstream gesture project rename
+
+ -- Chase Douglas <[e-mail]>  Mon, 30 Jul 2012 14:13:08 -0700
+
+libgrip (0.3.4-0ubuntu2) quantal; urgency=low
+
+  * updated to standards-version 3.9.3
+    - debian/changelog: used official URL
+  * Fixed a segfault when starting eog under some circumstances (lp: #872022).
+
+ -- Stephen M. Webb <[e-mail]>  Wed, 30 May 2012 12:25:44 -0400
+
+libgrip (0.3.4-0ubuntu1) precise; urgency=low
+
+  * New upstream release.
+
+ -- Daniel d'Andrada <[e-mail]>  Thu, 02 Feb 2012 16:49:20 -0200
+
+libgrip (0.3.3-0ubuntu1) precise; urgency=low
+
+  [ Chase Douglas ]
+  * Run autoreconf if the build is native (for daily builds)
+  * Don't strip binaries if build is native (for daily builds)
+
+  [ Martin Pitt ]
+  * debian/libgrip-dev.install: Install the HTML documentation into
+    /usr/share/doc/.
+  * Add debian/libgrip-dev.links: Provide a gtk-doc symlink for devhelp.
+  * debian/control: Fix Vcs-Bzr:, so that debcheckout actually works.
+
+  [ Stephen M. Webb ]
+  * New upstream release.
+  * Removed gio from main loop on shutdown (LP: #830640).
+  * Fixed segfaults to to inconsistent window handling (LP: #827958).
+  * Changed the names of generaed introspection files (LP: #861596).
+  * Tweked Python introspection bindings (LP: #861599).
+  * Fixed PPA daily build failures.
+
+ -- Stephen M. Webb <[e-mail]>  Wed, 19 Oct 2011 22:48:21 -0400
+
+libgrip (0.3.2-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release. 
+    - Fix unwanted gesture unsubscription (LP: #839379)
+
+ -- Jussi Pakkanen <[e-mail]>  Fri, 09 Sep 2011 18:15:15 +0300
+
+libgrip (0.3.1-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release.
+    - Fix FTBFS on ARM due to cast alignment issue
+
+ -- Chase Douglas <[e-mail]>  Tue, 09 Aug 2011 17:33:39 -0700
+
+libgrip (0.3.0-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release.
+    - Add documentation (LP: #744911)
+    - Expose device type and attributes
+
+ -- Chase Douglas <[e-mail]>  Tue, 09 Aug 2011 16:33:26 -0700
+
+libgrip (0.2.1-0ubuntu1) oneiric; urgency=low
+
+  [ Jussi Pakkanen ]
+  * New upstream release.
+    - Adds transformation point coordinates to pinch and rotate events
+      (LP: #741052)
+    - Change to API to subscribe to specific classes of devices (LP: #741236)
+    - Add a mechanism to unregister a window or widget (LP: #759117)
+    - Renamed all packages for consistency
+
+  [ Chase Douglas ]
+  * Bump packaging standards to 3.9.2
+  * Add build dependency on python-dev for dh_python2
+  * Updated bzr branch listed in debian/control
+
+ -- Chase Douglas <[e-mail]>  Wed, 13 Jul 2011 12:51:42 -0700
+
+libgrip (0.1.6-0ubuntu1) natty; urgency=low
+
+  [ Chase Douglas ]
+  * New upstream release.
+  * Remove autoreconf usage
+  * Remove deprecated DEB_COMPRESS_EXCLUDE from debian/rules
+  * Added XB-Python-Version to python binary package
+  * Remove non packaged files after dh_install
+  * Remove python byte-compiled files after dh_install
+
+  [ Stephen M. Webb ]
+  * New upstream release.
+  * Versioned symbols in the debian/symbols file.
+  * Add Vcs-Bzr to debian/control.
+
+  [ Chase Douglas ]
+  * Initial Release (LP: #715830)
+  * Change package maintainer to Ubuntu Developers
+
+ -- Chase Douglas <[e-mail]>  Mon, 07 Mar 2011 07:54:24 -0500
+
+libgrip (0.1.2-0ubuntu1) natty; urgency=low
+
+  * New upstream release.
+
+ -- Cody Russell <[e-mail]>  Fri, 04 Feb 2011 10:21:37 -0600
+
+libgrip (0.1.1-0ubuntu2) UNRELEASED; urgency=low
+
+  * Merged lp:~bratsche/libgrip/python-fixage-wip branch
+  * 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/{control,python-grip.install}
+    - Added new package for the python bindings (just a gi.overrides)
+  * debian/rules
+    - added dh_girepository for gir:Depends
+    - include autoreconf.mk
+  * +debian/source/format
+  * debian/libgrip-0.1-0.symbols
+    - Added new symbols
+
+ -- Ken VanDine <[e-mail]>  Mon, 24 Jan 2011 14:32:30 -0500
+
+libgrip (0.1.1-0ubuntu1) natty; urgency=low
+
+  * Bump version and release for Natty.
+
+ -- Cody Russell <[e-mail]>  Mon, 03 Jan 2011 13:17:48 -0600
+
+libgrip (0.1.0-0ubuntu3) maverick; urgency=low
+
+  * Fix for start callbacks.
+
+ -- Cody Russell <[e-mail]>  Thu, 02 Dec 2010 13:58:18 -0600
+
+libgrip (0.1.0-0ubuntu2) maverick; urgency=low
+
+  * Fix build dependencies.
+
+ -- Cody Russell <[e-mail]>  Mon, 29 Nov 2010 16:08:24 -0600
+
+libgrip (0.1.0-0ubuntu1) maverick; urgency=low
+
+  * Initial release
+
+ -- Cody Russell <[e-mail]>  Wed, 24 Nov 2010 08:57:00 -0500

=== added file 'debian/compat'
--- debian/compat	1970-01-01 00:00:00 +0000
+++ debian/compat	2012-11-27 20:56:33 +0000
@@ -0,0 +1,1 @@
+9

=== added file 'debian/control'
--- debian/control	1970-01-01 00:00:00 +0000
+++ debian/control	2012-11-27 20:56:33 +0000
@@ -0,0 +1,71 @@
+Source: libgrip
+Section: libs
+Priority: optional
+XS-Python-Version: all
+Maintainer: Ubuntu Developers <[e-mail]>
+Build-Depends: debhelper (>= 9),
+               dh-autoreconf,
+               gnome-common,
+               gtk-doc-tools,
+               python,
+               python-dev,
+               gir1.2-freedesktop,
+               gir1.2-gdkpixbuf-2.0,
+               gir1.2-glib-2.0,
+               gir1.2-gtk-3.0,
+               gir1.2-pango-1.0,
+               gobject-introspection,
+               libgirepository1.0-dev,
+               libglib2.0-dev (>=2.28.6),
+               libgtk-3-dev (>= 3.0.8-0ubuntu1),
+               libgeis-dev,
+Standards-Version: 3.9.3
+Homepage: https://launchpad.net/libgrip
+# If you aren't a member of ~oif-team but need to upload
+# packaging changes, just go ahead.  ~oif-team will notice
+# and sync up the code again.
+Vcs-Bzr: https://code.launchpad.net/~oif-team/libgrip/trunk
+Vcs-Browser: https://bazaar.launchpad.net/~oif-team/libgrip/trunk/files
+
+Package: libgrip0
+Architecture: any
+Pre-Depends: multiarch-support,
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Description: provides multitouch gestures to GTK+ apps
+ .
+ Libgrip hooks gesture recognition into GTK+ applications.
+
+Package: libgrip-dev
+Section: libdevel
+Architecture: any
+Depends: libglib2.0-dev (>=2.28.6),
+         libgrip0 (= ${binary:Version}),
+         libgtk-3-dev (>= 3.0.8),
+         libgeis-dev,
+         pkg-config,
+         ${misc:Depends},
+         ${shlibs:Depends},
+Description: provides multitouch gestures to GTK+ apps -- development files
+ .
+ This package contains files that are needed to build applications.
+
+Package: gir1.2-grip
+Architecture: any
+Depends: ${gir:Depends},
+         ${misc:Depends},
+Description: typelib file for libgrip
+ .
+ This package can be used by other packages using the GIRepository format to
+ generate dynamic bindings for libgrip
+
+Package: python-grip
+Section: python
+XB-Python-Version: ${python:Versions}
+Architecture: all
+Depends: ${misc:Depends},
+         ${python:Depends},
+Description: python bindings for libgrip
+ .
+ This package provides Python bindings so that you can use libgrip from
+ a Python program.

=== added file 'debian/copyright'
--- debian/copyright	1970-01-01 00:00:00 +0000
+++ debian/copyright	2012-11-27 20:56:33 +0000
@@ -0,0 +1,28 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
+Upstream-Name: libgrip
+Upstream-Contact: Cody Russell <[e-mail]>
+Source: https://launchpad.net/libgrip/+download
+
+Files: *
+Copyright: 2010-2011 Canonical Ltd.
+License: LGPL-2.1 or LGPL-3
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of either or both of the following licenses:
+ .
+ 1) the GNU Lesser General Public License version 3, as published by the
+ Free Software Foundation; and/or
+ 2) the GNU Lesser General Public License version 2.1, as published by
+ the Free Software Foundation.
+ .
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranties of
+ MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+ PURPOSE.  See the applicable version of the GNU Lesser General Public
+ License for more details.
+ .
+ You should have received a copy of both the GNU Lesser General Public
+ License version 3 and version 2.1 along with this program.  If not, see
+ <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public License
+ can be found in `/usr/share/common-licenses/LGPL-3' and `/usr/share/common-licenses/LGPL-2.1'

=== added file 'debian/gir1.2-grip.install'
--- debian/gir1.2-grip.install	1970-01-01 00:00:00 +0000
+++ debian/gir1.2-grip.install	2012-11-27 20:56:33 +0000
@@ -0,0 +1,1 @@
+debian/tmp/usr/lib/*/girepository-1.0

=== added file 'debian/libbrip0.symbols'
--- debian/libbrip0.symbols	1970-01-01 00:00:00 +0000
+++ debian/libbrip0.symbols	2012-11-27 20:56:33 +0000
@@ -0,0 +1,11 @@
+libgrip-0.1.so.0 libgrip-0.1-0 #MINVER#
+ GRIP_0.1@GRIP_0.1 0.1.4
+ grip_gesture_event_copy@GRIP_0.1 0.1.1
+ grip_gesture_event_free@GRIP_0.1 0.1.1
+ grip_gesture_event_get_type@GRIP_0.1 0.1.1
+ grip_gesture_event_new@GRIP_0.1 0.1.1
+ grip_gesture_manager_get@GRIP_0.1 0.1.0
+ grip_gesture_manager_get_type@GRIP_0.1 0.1.0
+ grip_gesture_manager_register_window@GRIP_0.1 0.1.0
+ grip_gesture_type_get_type@GRIP_0.1 0.1.0
+ grip_time_type_get_type@GRIP_0.1 0.1.0

=== added file 'debian/libgrip-dev.install'
--- debian/libgrip-dev.install	1970-01-01 00:00:00 +0000
+++ debian/libgrip-dev.install	2012-11-27 20:56:33 +0000
@@ -0,0 +1,5 @@
+debian/tmp/usr/include/
+debian/tmp/usr/lib/*/*.so
+debian/tmp/usr/lib/*/pkgconfig
+debian/tmp/usr/share/gir-1.0
+debian/tmp/usr/share/gtk-doc/html/libgrip/* usr/share/doc/libgrip-dev/html

=== added file 'debian/libgrip-dev.links'
--- debian/libgrip-dev.links	1970-01-01 00:00:00 +0000
+++ debian/libgrip-dev.links	2012-11-27 20:56:33 +0000
@@ -0,0 +1,1 @@
+/usr/share/doc/libgrip-dev/html usr/share/gtk-doc/html/libgrip

=== added file 'debian/libgrip0.install'
--- debian/libgrip0.install	1970-01-01 00:00:00 +0000
+++ debian/libgrip0.install	2012-11-27 20:56:33 +0000
@@ -0,0 +1,1 @@
+debian/tmp/usr/lib/*/*.so.*

=== added file 'debian/python-grip.install'
--- debian/python-grip.install	1970-01-01 00:00:00 +0000
+++ debian/python-grip.install	2012-11-27 20:56:33 +0000
@@ -0,0 +1,1 @@
+usr/lib/python*/*

=== added file 'debian/rules'
--- debian/rules	1970-01-01 00:00:00 +0000
+++ debian/rules	2012-11-27 20:56:33 +0000
@@ -0,0 +1,24 @@
+#!/usr/bin/make -f
+
+LDFLAGS += -Wl,-O1 -Wl,--as-needed
+
+export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
+
+%:
+	dh $@ --with python2,autoreconf
+
+override_dh_autoreconf:
+	NOCONFIGURE=1 dh_autoreconf ./autogen.sh
+
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--enable-gtk-doc
+
+override_dh_install:
+	find debian/tmp/usr/lib -name \*.la -delete
+	find debian/tmp/usr/lib -name \*.a -delete
+	find debian/tmp/usr/lib -name \*.pyc -delete
+	find debian/tmp/usr/lib -name \*.pyo -delete
+	rm -f debian/tmp/usr/bin/grip-test
+	dh_install --fail-missing
+

=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2012-11-27 20:56:33 +0000
@@ -0,0 +1,1 @@
+1.0

=== added file 'debian/watch'
--- debian/watch	1970-01-01 00:00:00 +0000
+++ debian/watch	2012-11-27 20:56:33 +0000
@@ -0,0 +1,2 @@
+version=3
+http://launchpad.net/libgrip/+download .*/grip-([0-9.]+)\.tar\.gz