Merge lp:~vibhavp/ubuntu/raring/libnotify/add-autopkgtest into lp:ubuntu/raring/libnotify

Proposed by Vibhav Pant
Status: Merged
Merge reported by: Martin Pitt
Merged at revision: not available
Proposed branch: lp:~vibhavp/ubuntu/raring/libnotify/add-autopkgtest
Merge into: lp:ubuntu/raring/libnotify
Diff against target: 103 lines (+54/-2)
5 files modified
debian/changelog (+6/-0)
debian/control (+3/-1)
debian/control.in (+2/-1)
debian/tests/build (+41/-0)
debian/tests/control (+2/-0)
To merge this branch: bzr merge lp:~vibhavp/ubuntu/raring/libnotify/add-autopkgtest
Reviewer Review Type Date Requested Status
Martin Pitt Approve
Review via email: mp+149209@code.launchpad.net
To post a comment you must log in.
13. By Vibhav Pant

remove | from test dependencies

14. By Vibhav Pant

Correct typo

Revision history for this message
Martin Pitt (pitti) wrote :

This works now, thanks! I'll apply it directly to Debian.

review: Approve
Revision history for this message
Martin Pitt (pitti) wrote :

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2012-10-05 00:10:20 +0000
+++ debian/changelog 2013-02-19 08:11:20 +0000
@@ -1,3 +1,9 @@
1libnotify (0.7.5-1ubuntu1) raring; urgency=low
2
3 * Add simple autopkgtest to package.
4
5 -- Vibhav Pant <vibhavp@ubuntu.com> Tue, 19 Feb 2013 12:48:04 +0530
6
1libnotify (0.7.5-1build1) quantal; urgency=low7libnotify (0.7.5-1build1) quantal; urgency=low
28
3 * Rebuild for new armel compiler default of ARMv5t.9 * Rebuild for new armel compiler default of ARMv5t.
410
=== modified file 'debian/control'
--- debian/control 2012-03-27 22:24:42 +0000
+++ debian/control 2013-02-19 08:11:20 +0000
@@ -5,7 +5,8 @@
55
6Source: libnotify6Source: libnotify
7Priority: optional7Priority: optional
8Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>8Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
9XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
9Build-Depends: gnome-pkg-tools (>= 0.7),10Build-Depends: gnome-pkg-tools (>= 0.7),
10 cdbs (>= 0.4.93~),11 cdbs (>= 0.4.93~),
11 debhelper (>= 8.1.3~),12 debhelper (>= 8.1.3~),
@@ -17,6 +18,7 @@
17 libgirepository1.0-dev (>= 0.9.12),18 libgirepository1.0-dev (>= 0.9.12),
18 gir1.2-glib-2.0,19 gir1.2-glib-2.0,
19 gtk-doc-tools (>= 1.14)20 gtk-doc-tools (>= 1.14)
21XS-Testsuite: autopkgtest
20Uploaders: Emilio Pozuelo Monfort <pochu@debian.org>, Laurent Bigonville <bigon@debian.org>, Michael Biebl <biebl@debian.org>22Uploaders: Emilio Pozuelo Monfort <pochu@debian.org>, Laurent Bigonville <bigon@debian.org>, Michael Biebl <biebl@debian.org>
21Standards-Version: 3.9.223Standards-Version: 3.9.2
22Section: libs24Section: libs
2325
=== modified file 'debian/control.in'
--- debian/control.in 2012-03-27 22:24:42 +0000
+++ debian/control.in 2013-02-19 08:11:20 +0000
@@ -1,6 +1,7 @@
1Source: libnotify1Source: libnotify
2Priority: optional2Priority: optional
3Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>3Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
4XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
4Build-Depends: gnome-pkg-tools (>= 0.7),5Build-Depends: gnome-pkg-tools (>= 0.7),
5 cdbs (>= 0.4.93~),6 cdbs (>= 0.4.93~),
6 debhelper (>= 8.1.3~),7 debhelper (>= 8.1.3~),
78
=== added directory 'debian/tests'
=== added file 'debian/tests/build'
--- debian/tests/build 1970-01-01 00:00:00 +0000
+++ debian/tests/build 2013-02-19 08:11:20 +0000
@@ -0,0 +1,41 @@
1#!/bin/sh
2# autopkgtest check: Build and run a program against libnotify, to verify that
3# the headers and pkg-config file are installed correctly
4# (C) 2013 Vibhav Pant
5# Author: Vibhav Pant <vibhavp@ubuntu.com>
6
7set -e
8
9WORKDIR=$(mktemp -d)
10trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM
11cd $WORKDIR
12cat <<EOF > libnotify_test.c
13#include <libnotify/notify.h>
14#include <assert.h>
15
16int main(void)
17{
18 NotifyNotification *notify;
19 GError *error = NULL;
20
21 assert(notify_init("autopkgtest") == TRUE);
22 assert(notify_is_initted() == TRUE);
23
24 notify = notify_notification_new("autopkgtest",
25 "Testing libnotify",
26 NULL);
27 notify_notification_set_urgency(notify, NOTIFY_URGENCY_NORMAL);
28
29 notify_notification_set_timeout(notify, 500);
30 notify_notification_show(notify, &error);
31 notify_uninit();
32 return 0;
33}
34EOF
35
36gcc -o libnotify_test libnotify_test.c \
37`pkg-config --cflags --libs libnotify` -Wall -Werror
38echo "build: OK"
39[ -x libnotify_test ]
40dbus-launch xvfb-run ./libnotify_test
41echo "run: OK"
042
=== added file 'debian/tests/control'
--- debian/tests/control 1970-01-01 00:00:00 +0000
+++ debian/tests/control 2013-02-19 08:11:20 +0000
@@ -0,0 +1,2 @@
1Tests: build
2Depends: dbus-x11, notification-daemon, xvfb, libnotify-dev, pkg-config
0\ No newline at end of file3\ No newline at end of file

Subscribers

People subscribed via source and target branches

to all changes: