NetworkManager

Merge lp://staging/~cody-somerville/network-manager/pptp-fix-lp395541 into lp://staging/~network-manager/network-manager/pptp-ubuntu.0.7.1

  1. pptp-fix-lp395541
  2. Merge into pptp-ubuntu.0.7.1
Proposed by Cody A.W. Somerville
Status: Merged
Merge reported by: Alexander Sack
Merged at revision: not available
Proposed branch: lp://staging/~cody-somerville/network-manager/pptp-fix-lp395541
Merge into: lp://staging/~network-manager/network-manager/pptp-ubuntu.0.7.1
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~cody-somerville/network-manager/pptp-fix-lp395541
Reviewer Review Type Date Requested Status
Network-manager Pending
Review via email: mp+8307@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Cody A.W. Somerville (cody-somerville) wrote :

Please note 0.7.1-0ubuntu2 has been uploaded.

Revision history for this message
Cody A.W. Somerville (cody-somerville) wrote :

Oops. I made a typo in the changelog (in both the version I uploaded and in the branch). I actually updated DEB_DESTDIR to $(CURDIR)/debian/network-manager-pptp and not $(CURDIR)/debian/network-manager-openvpn. Feel free to fix this this typo on your next upload.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'changelog'
2--- changelog 2009-07-03 08:09:35 +0000
3+++ changelog 2009-07-07 11:44:14 +0000
4@@ -1,3 +1,21 @@
5+network-manager-pptp (0.7.1-0ubuntu2) karmic; urgency=low
6+
7+ * debian/rules:
8+ - Update DEB_DESTDIR to $(CURDIR)/debian/network-manager-openvpn instead of
9+ $(CURDIR)/debian/tmp/ so that the files we build actually get installed.
10+ - Fixes LP: #395541
11+ * debian/control:
12+ - Bump standards version to 3.8.2.
13+ * debian/compat: Bump to compat version 5 as version 4 is deprecated.
14+ * debian/network-manager-pptp.preinst:
15+ - Add missing #DEBHELPER# token to maintainer script.
16+ - Add 'exit 0' to end of script for good 'posture'.
17+ - Set the -e flag to ensure that the script's execution is aborted when any
18+ executed command fails.
19+ * debian/copyright: Updated copyright file to meet debian standards.
20+
21+ -- Cody A.W. Somerville <cody-somerville@ubuntu.com> Tue, 07 Jul 2009 08:15:41 -0300
22+
23 network-manager-pptp (0.7.1-0ubuntu1) karmic; urgency=low
24
25 * New upstream release 0.7.1 final
26
27=== modified file 'compat'
28--- compat 2009-02-15 02:51:24 +0000
29+++ compat 2009-07-07 11:20:47 +0000
30@@ -1,1 +1,1 @@
31-4
32+5
33
34=== modified file 'control'
35--- control 2009-06-25 18:26:38 +0000
36+++ control 2009-07-07 11:16:19 +0000
37@@ -16,7 +16,7 @@
38 libgnomeui-dev,
39 libdbus-glib-1-dev,
40 libglade2-dev
41-Standards-Version: 3.7.2
42+Standards-Version: 3.8.2
43 Vcs-Bzr: http://code.launchpad.net/~network-manager/network-manager/pptp-ubuntu.0.7.1
44
45 Package: network-manager-pptp
46
47=== modified file 'copyright'
48--- copyright 2009-02-15 02:51:24 +0000
49+++ copyright 2009-07-07 11:44:14 +0000
50@@ -3,7 +3,7 @@
51
52 It was downloaded from GNOME CVS, module NetworkManager/vpn-daemons/pptp.
53
54-Copyright Holder: Anthony Mee, eemynotna@googlemail.com
55+Copyright 2006-2009 Anthony Mee <eemynotna@googlemail.com>
56
57 License:
58
59
60=== modified file 'network-manager-pptp.preinst'
61--- network-manager-pptp.preinst 2009-02-15 02:51:24 +0000
62+++ network-manager-pptp.preinst 2009-07-07 11:44:14 +0000
63@@ -1,5 +1,7 @@
64 #!/bin/sh
65
66+set -e
67+
68 # Remove a no-longer used conffile
69 rm_conffile() {
70 PKGNAME="$1"
71@@ -27,3 +29,9 @@
72 fi
73 esac
74
75+# dh_installdeb will replace this with shell code automatically
76+# generated by other debhelper scripts.
77+
78+#DEBHELPER#
79+
80+exit 0
81
82=== modified file 'rules'
83--- rules 2009-07-03 08:09:35 +0000
84+++ rules 2009-07-07 11:16:19 +0000
85@@ -16,7 +16,7 @@
86 --with-pppd-plugin-dir=/usr/lib/pppd/2.4.5/ \
87 $(NULL)
88
89-DEB_DESTDIR = $(CURDIR)/debian/tmp/
90+DEB_DESTDIR = $(CURDIR)/debian/network-manager-pptp/
91
92 get-orig-source::
93 set -e; if echo $(DEB_VERSION) | grep -c "git"; \

Subscribers

People subscribed via source and target branches