Merge lp:~iahmad/libpam-freerdp/call-autogen into lp:~freerdp-remote-team/libpam-freerdp/ubuntu

Proposed by I Ahmad
Status: Merged
Merged at revision: 33
Proposed branch: lp:~iahmad/libpam-freerdp/call-autogen
Merge into: lp:~freerdp-remote-team/libpam-freerdp/ubuntu
Diff against target: 54 lines (+20/-0)
4 files modified
autogen.sh (+9/-0)
debian/changelog (+6/-0)
debian/control (+1/-0)
debian/rules (+4/-0)
To merge this branch: bzr merge lp:~iahmad/libpam-freerdp/call-autogen
Reviewer Review Type Date Requested Status
David Barth (community) Approve
Review via email: mp+152828@code.launchpad.net

This proposal supersedes a proposal from 2013-03-11.

Description of the change

Added autogen.sh and updated the changelog entry accordingly.

To post a comment you must log in.
Revision history for this message
David Barth (dbarth) wrote : Posted in a previous version of this proposal

It doesn't build: the autogen.sh file is missing

review: Needs Fixing
Revision history for this message
I Ahmad (iahmad) wrote : Posted in a previous version of this proposal

Jenkins process of building such packages is like this. It pulls the trunk and then pulls the packaging branch on top of it. That's how it builds the package. Are you suggesting that autogen.sh should be part of packaging branch instead of trunk? In that case, this needs to be removed from trunk and added in packaging branch.

Revision history for this message
David Barth (dbarth) wrote :

ok, so it seems jenkins is happy with the branch

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'autogen.sh'
2--- autogen.sh 1970-01-01 00:00:00 +0000
3+++ autogen.sh 2013-03-12 06:43:22 +0000
4@@ -0,0 +1,9 @@
5+#!/bin/sh
6+
7+which gnome-autogen.sh || {
8+ echo "Could not find 'gnome-autgen.sh'. Is gnome-common installed?"
9+ exit 1
10+}
11+
12+. gnome-autogen.sh
13+
14
15=== modified file 'debian/changelog'
16--- debian/changelog 2012-09-25 16:40:05 +0000
17+++ debian/changelog 2013-03-12 06:43:22 +0000
18@@ -1,3 +1,9 @@
19+libpam-freerdp (1.0.1-0ubuntu1~ppa2) quantal; urgency=low
20+
21+ * Added autogen.sh
22+
23+ -- Iftikhar Ahmad (QA Engineer) <iftikhar.ahmad@canonical.com> Tue, 12 Mar 2013 11:16:18 +0500
24+
25 libpam-freerdp (1.0.1-0ubuntu1~ppa1) quantal; urgency=low
26
27 * New upstream release.
28
29=== modified file 'debian/control'
30--- debian/control 2012-09-25 16:13:35 +0000
31+++ debian/control 2013-03-12 06:43:22 +0000
32@@ -7,6 +7,7 @@
33 libgtest-dev,
34 libpam0g-dev,
35 pkg-config,
36+ gnome-common,
37 Standards-Version: 3.9.3
38 Homepage: http://launchpad.net/libpam-freerdp/
39 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/libpam-freerdp/ubuntu
40
41=== modified file 'debian/rules'
42--- debian/rules 2012-08-21 15:48:21 +0000
43+++ debian/rules 2013-03-12 06:43:22 +0000
44@@ -3,6 +3,10 @@
45 %:
46 dh $@
47
48+override_dh_auto_configure:
49+ ./autogen.sh
50+ dh_auto_configure
51+
52 override_dh_install:
53 dh_install
54 find debian/libpam-freerdp -name '*.a' -delete

Subscribers

People subscribed via source and target branches

to all changes: