--- network-manager-pptp-0.6.4+svn2574.orig/config.guess +++ network-manager-pptp-0.6.4+svn2574/config.guess @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2006-07-02' +timestamp='2007-03-06' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -161,6 +161,7 @@ arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched @@ -780,7 +781,7 @@ i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; - i*:MINGW*:*) + *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; i*:windows32*:*) @@ -790,12 +791,15 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - x86:Interix*:[3456]*) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - EM64T:Interix*:[3456]*) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; + *:Interix*:[3456]*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T | authenticamd) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; @@ -950,6 +954,9 @@ x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu exit ;; + xtensa:Linux:*:*) + echo xtensa-unknown-linux-gnu + exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent @@ -1208,6 +1215,15 @@ SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; --- network-manager-pptp-0.6.4+svn2574.orig/config.sub +++ network-manager-pptp-0.6.4+svn2574/config.sub @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2006-09-20' +timestamp='2007-01-18' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -245,12 +245,12 @@ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ + | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore \ + | maxq | mb | microblaze | mcore | mep \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -324,7 +324,7 @@ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ @@ -925,6 +925,9 @@ basic_machine=sh-hitachi os=-hms ;; + sh5el) + basic_machine=sh5le-unknown + ;; sh64) basic_machine=sh64-unknown ;; @@ -1219,7 +1222,7 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1414,6 +1417,9 @@ m68*-cisco) os=-aout ;; + mep-*) + os=-elf + ;; mips*-cisco) os=-elf ;; --- network-manager-pptp-0.6.4+svn2574.orig/properties/nm-ppp-properties.c +++ network-manager-pptp-0.6.4+svn2574/properties/nm-ppp-properties.c @@ -192,6 +192,51 @@ GTK_SIGNAL_FUNC(&editable_changed), NULL, impl ); opt = vpnui_opt_new( + "phone-number", VPN_UI_OPTTYPE_STRING, + "phone-number", "Telephone-Number", _("Telephone Number"), + GTK_SIGNAL_FUNC(&editable_changed), &vld_non_empty, impl ); + + opt = vpnui_opt_new( + "bt-bdaddr", VPN_UI_OPTTYPE_STRING, + "bt-bdaddr", "Bluetooth-Address", _("Bluetooth Address"), + GTK_SIGNAL_FUNC(&editable_changed), &vld_non_empty, impl ); + + opt = vpnui_opt_new( + "bt-channel", VPN_UI_OPTTYPE_STRING, + "bt-channel", "Bluetooth-Channel", _("Bluetooth Channel"), + GTK_SIGNAL_FUNC(&editable_changed), &vld_non_empty, impl ); + + opt = vpnui_opt_new( + "gprs-apn", VPN_UI_OPTTYPE_STRING, + "gprs-apn", "GPRS-Access-Point-Name", _("GPRS APN"), + GTK_SIGNAL_FUNC(&editable_changed), &vld_non_empty, impl ); + + opt = vpnui_opt_new( + "gprs-ip-address", VPN_UI_OPTTYPE_STRING, + "gprs-ip-address", "GPRS-IP-Address", _("GPRS IP"), + GTK_SIGNAL_FUNC(&editable_changed), &vld_non_empty, impl ); + + opt = vpnui_opt_new( + "gprs-context-num", VPN_UI_OPTTYPE_STRING, + "gprs-context-num", "GPRS-Context-Number", _("GPRS Context No."), + GTK_SIGNAL_FUNC(&editable_changed), &vld_non_empty, impl ); + + opt = vpnui_opt_new( + "gprs-packet-type", VPN_UI_OPTTYPE_STRING, + "gprs-packet-type", "GPRS-Packet-Type", _("GPRS Packet Type"), + GTK_SIGNAL_FUNC(&editable_changed), &vld_non_empty, impl ); + + opt = vpnui_opt_new( + "ppp-crtscts", VPN_UI_OPTTYPE_YESNO, + "ppp-crtscts", "PPP-Hardware-CTSRTS", _("Use CTS/RTS flow control"), + GTK_SIGNAL_FUNC(&editable_changed), NULL, impl ); + + opt = vpnui_opt_new( + "ppp-modem", VPN_UI_OPTTYPE_YESNO, + "ppp-modem", "PPP-Modem", _("Connect via a modem"), + GTK_SIGNAL_FUNC(&editable_changed), NULL, impl ); + + opt = vpnui_opt_new( "ppp-noipdefault", VPN_UI_OPTTYPE_YESNO, "ppp-noipdefault", "PPP-No-IP-Default", _("Require IP to be provided"), GTK_SIGNAL_FUNC(&editable_changed), NULL, impl ); @@ -461,5 +506,20 @@ if (auth_options) gtk_widget_show(auth_options); if (comp_enc_options) gtk_widget_show(comp_enc_options); if (routing_options) gtk_widget_show(routing_options); + } else if (strcmp(variant_name,"dialup")==0) { + if (dialup_front) gtk_widget_show(dialup_front); + if (serial_options) gtk_widget_show(serial_options); + if (ppp_options) gtk_widget_show(ppp_options); + if (auth_options) gtk_widget_show(auth_options); + if (comp_enc_options) gtk_widget_show(comp_enc_options); + if (routing_options) gtk_widget_show(routing_options); + } else if (strcmp(variant_name,"btgprs")==0) { + if (bluetooth_front) gtk_widget_show(bluetooth_front); + if (gprs_options) gtk_widget_show(gprs_options); + if (serial_options) gtk_widget_show(serial_options); + if (ppp_options) gtk_widget_show(ppp_options); + if (auth_options) gtk_widget_show(auth_options); + if (comp_enc_options) gtk_widget_show(comp_enc_options); + if (routing_options) gtk_widget_show(routing_options); } } --- network-manager-pptp-0.6.4+svn2574.orig/debian/control +++ network-manager-pptp-0.6.4+svn2574/debian/control @@ -0,0 +1,20 @@ +Source: network-manager-pptp +Section: net +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Craig Box +Build-Depends: debhelper (>= 5.0.0), autotools-dev, dpatch, network-manager-dev (>= 0.6.2), ppp-dev, automake1.9, gnome-common, intltool, libgnomeui-dev, libdbus-glib-1-dev +Standards-Version: 3.7.2 + +Package: network-manager-pptp +Architecture: any +Depends: pptp-linux, network-manager, network-manager-gnome, ${shlibs:Depends}, ${misc:Depends} +Description: network management framework (PPTP plugin) + NetworkManager attempts to keep an active network connection available at + all times. It is intended primarily for laptops where it allows easy + switching betwen local wireless networks, it's also useful on desktops + with a selection of different interfaces to use. It is not intended for + usage on servers. + . + This package provides a VPN plugin for PPTP, commonly used for connecting + to Microsoft VPN servers. --- network-manager-pptp-0.6.4+svn2574.orig/debian/network-manager-pptp.manpages +++ network-manager-pptp-0.6.4+svn2574/debian/network-manager-pptp.manpages @@ -0,0 +1 @@ +debian/nm-ppp-starter.1 --- network-manager-pptp-0.6.4+svn2574.orig/debian/nm-ppp-starter.1 +++ network-manager-pptp-0.6.4+svn2574/debian/nm-ppp-starter.1 @@ -0,0 +1,41 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH NM-PPP-SERVICE 1 "August 6, 2006" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +nm-ppp-service \- PPP connection helper for NetworkManager +.SH SYNOPSIS +.B nm-ppp-starter +.RI [ options ] ... +.SH DESCRIPTION +.B nm-ppp-service +is a helper for the NetworkManager(1) program. NetworkManager will launch +this service automatically as necessary. For debugging purposes, you can +launch the helper yourself, and watch its output. +.PP +.\" TeX users may be more comfortable with the \fB\fP and +.\" \fI\fP escape sequences to invode bold face and italics, +.\" respectively. +.SH OPTIONS +None. +.SH SEE ALSO +.BR NetworkManager (1), +.SH AUTHOR +nm-ppp-service is part of the PPP plugin for NetworkManager, written by +Anthony Mee . +.PP +This manual page was written by Craig Box , +for Ubuntu (but may be used freely by anyone). --- network-manager-pptp-0.6.4+svn2574.orig/debian/copyright +++ network-manager-pptp-0.6.4+svn2574/debian/copyright @@ -0,0 +1,25 @@ +This package was debianized by Craig Box on +Sun, 6 Aug 2006 19:30:11 +1200. + +It was downloaded from GNOME CVS, module NetworkManager/vpn-daemons/pptp. + +Copyright Holder: Anthony Mee, eemynotna@googlemail.com + +License: + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. --- network-manager-pptp-0.6.4+svn2574.orig/debian/postrm +++ network-manager-pptp-0.6.4+svn2574/debian/postrm @@ -0,0 +1,40 @@ +#! /bin/sh +# postrm script for network-manager-pptp +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' overwrit>r> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + remove) +# ldconfig + ;; + + purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + --- network-manager-pptp-0.6.4+svn2574.orig/debian/compat +++ network-manager-pptp-0.6.4+svn2574/debian/compat @@ -0,0 +1 @@ +4 --- network-manager-pptp-0.6.4+svn2574.orig/debian/changelog +++ network-manager-pptp-0.6.4+svn2574/debian/changelog @@ -0,0 +1,24 @@ +network-manager-pptp (0.6.4+svn2574-0ubuntu1) gutsy; urgency=low + + * New upstream release (fixes LP: #67881, LP: #80541). + * Fix properties dialog so an option is always selected. (fixes LP: #89120) + * Set NoDisplay=true in the .desktop file to hide spurious menu item + (fixes LP: #109856). + * Bump Standards-version to 3.7.2 and fix Maintainer: field in + debian/control. + + -- Craig Box Sun, 4 Jun 2007 11:18:03 +1200 + +network-manager-pptp (0.6.3+cvs20060819-0ubuntu2) edgy; urgency=low + + * Add mss field in VPN properties structure, and update documentation to + point out that this patch only applies to NM 0.6.2 (dapper). + + -- Craig Box Sun, 1 Oct 2006 16:04:54 +1300 + +network-manager-pptp (0.6.3+cvs20060819-0ubuntu1) edgy; urgency=low + + * Initial release. + + -- Craig Box Wed, 26 Oct 2006 21:06:54 +1200 + --- network-manager-pptp-0.6.4+svn2574.orig/debian/README.Debian +++ network-manager-pptp-0.6.4+svn2574/debian/README.Debian @@ -0,0 +1,15 @@ +network-manager-pptp for Debian +------------------------------- + +When you have installed this package, you have to restart dbus before it will +allow you to connect (and add VPN icons into the menu). + +The package will reload dbus for you. + +Building for NetworkManager 0.6.2 +--------------------------------- + +To use with NM 0.6.2, you need to include the patch 02_nm_ppp_starter_0.62.patch (in the debian/patches directory), as a field was removed in the VPN properties between 0.6.2 and 0.6.3. + + -- Craig Box , Tue, 1 Oct 2006 15:48:01 +1300 + --- network-manager-pptp-0.6.4+svn2574.orig/debian/patches/05_ppplibdir.dpatch +++ network-manager-pptp-0.6.4+svn2574/debian/patches/05_ppplibdir.dpatch @@ -0,0 +1,27 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 05-ppplibdir.patch.dpatch by Craig Box +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Change to use ppp in its own dir + +@DPATCH@ +diff -urNad network-manager-pptp-0.6.4+pptp0.6.5~/configure network-manager-pptp-0.6.4+pptp0.6.5/configure +--- network-manager-pptp-0.6.4+pptp0.6.5~/configure 2007-05-13 19:18:41.000000000 +1200 ++++ network-manager-pptp-0.6.4+pptp0.6.5/configure 2007-05-13 19:44:11.000000000 +1200 +@@ -1031,6 +1031,7 @@ + libdir='${exec_prefix}/lib' + localedir='${datarootdir}/locale' + mandir='${datarootdir}/man' ++ppplibdir='${exec_prefix}/lib' + + ac_prev= + ac_dashdash= +@@ -19909,7 +19910,7 @@ + PPPD_CFLAGS="-I ./external/$PPPD_VERSION" + fi + +-PPPD_PLUGIN_DIR="$libexecdir/pppd/$PPPD_VERSION" ++PPPD_PLUGIN_DIR="$ppplibdir/pppd/$PPPD_VERSION" + + + --- network-manager-pptp-0.6.4+svn2574.orig/debian/patches/03_nm_ppp_dialog.glade.dpatch +++ network-manager-pptp-0.6.4+svn2574/debian/patches/03_nm_ppp_dialog.glade.dpatch @@ -0,0 +1,948 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03_nm_ppp_dialog.glade.patch.dpatch by Craig Box +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Remove non-PPTP options from the properties dialog + +@DPATCH@ +diff -urNad network-manager-pptp-0.6.4+pptp0.6.5~/properties/nm-ppp-dialog.glade network-manager-pptp-0.6.4+pptp0.6.5/properties/nm-ppp-dialog.glade +--- network-manager-pptp-0.6.4+pptp0.6.5~/properties/nm-ppp-dialog.glade 2007-04-21 16:42:23.000000000 +1200 ++++ network-manager-pptp-0.6.4+pptp0.6.5/properties/nm-ppp-dialog.glade 2007-05-13 18:28:23.000000000 +1200 +@@ -16,6 +16,8 @@ + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST ++ True ++ False + + + +@@ -66,6 +68,10 @@ + 0.5 + 0 + 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 + + + 0 +@@ -126,6 +132,10 @@ + 0 + 40 + 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 + + + 0 +@@ -213,6 +223,10 @@ + 0.5 + 0 + 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 + + + 0 +@@ -225,6 +239,8 @@ + + True + ++ False ++ True + + + 0 +@@ -287,6 +303,10 @@ + 0 + 0 + pptp-remote ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 + + + 0 +@@ -328,260 +348,6 @@ + True + + +- +- +- +- False +- 4 +- +- +- +- True +- False +- 12 +- +- +- +- True +- _Telephone Number: +- True +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 1 +- 0.5 +- 0 +- 0 +- pptp-remote +- +- +- 0 +- False +- False +- +- +- +- +- +- True +- Host name or IP address of the PPTP server +- True +- True +- True +- 0 +- +- True +- * +- False +- +- Telephone number to dial +- +- +- +- 0 +- True +- True +- +- +- +- +- 0 +- False +- False +- +- +- +- +- 0 +- True +- True +- +- +- +- +- +- False +- 4 +- +- +- +- True +- 2 +- 2 +- False +- 5 +- 10 +- +- +- +- True +- True +- Find Device +- True +- GTK_RELIEF_NORMAL +- True +- +- +- 1 +- 2 +- 1 +- 2 +- fill +- +- +- +- +- +- +- True +- False +- 12 +- +- +- +- True +- _Channel: +- True +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 1 +- 0.5 +- 0 +- 0 +- pptp-remote +- +- +- 0 +- False +- False +- +- +- +- +- +- True +- True +- True +- True +- 3 +- +- True +- * +- False +- +- +- 0 +- True +- True +- +- +- +- +- 1 +- 2 +- 0 +- 1 +- fill +- +- +- +- +- +- True +- False +- 12 +- +- +- +- True +- _Device Address: +- True +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 1 +- 0.5 +- 0 +- 0 +- pptp-remote +- +- +- 0 +- False +- False +- +- +- +- +- +- True +- Host name or IP address of the PPTP server +- True +- True +- True +- 17 +- 00:00:00:00 +- True +- * +- False +- +- +- 0 +- True +- True +- +- +- +- +- 0 +- 1 +- 0 +- 1 +- fill +- +- +- +- +- +- True +- +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0 +- 0.5 +- 0 +- 0 +- +- +- 0 +- 1 +- 1 +- 2 +- fill +- +- +- +- +- +- 0 +- False +- False +- +- +- +- +- 0 +- True +- True +- +- + + + 0 +@@ -659,6 +425,10 @@ + 0.5 + 0 + 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 + + + 0 +@@ -699,258 +469,10 @@ + 0.5 + 0 + 0 +- +- +- tab +- +- +- +- +- +- 10 +- True +- False +- 0 +- +- +- +- True +- False +- 4 +- +- +- +- True +- False +- 12 +- +- +- +- True +- _Access Point Name: +- True +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 1 +- 0.5 +- 0 +- 0 +- pptp-remote +- +- +- 0 +- False +- False +- +- +- +- +- +- True +- Service providers GPRS access point from device config +- True +- True +- True +- 0 +- +- True +- * +- False +- +- +- 0 +- True +- True +- +- +- +- +- 0 +- False +- False +- +- +- +- +- +- True +- False +- 12 +- +- +- +- True +- _IP Address: +- True +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 1 +- 0.5 +- 0 +- 0 +- pptp-remote +- +- +- 0 +- False +- False +- +- +- +- +- +- True +- Service providers IP address +- True +- True +- True +- 0 +- +- True +- * +- False +- +- +- 0 +- True +- True +- +- +- +- +- 0 +- True +- True +- +- +- +- +- +- True +- False +- 12 +- +- +- +- True +- _Packet Type +- True +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 1 +- 0.5 +- 0 +- 0 +- pptp-remote +- +- +- 0 +- False +- False +- +- +- +- +- +- True +- True +- True +- True +- 0 +- +- True +- * +- False +- 9 +- +- +- 0 +- True +- True +- +- +- +- +- +- True +- _Context Num +- True +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 1 +- 0.5 +- 0 +- 0 +- pptp-remote +- +- +- 0 +- False +- False +- +- +- +- +- +- True +- True +- True +- True +- 0 +- +- True +- * +- False +- 3 +- +- +- 0 +- True +- True +- +- +- +- +- 0 +- True +- True +- +- +- +- +- 0 +- False +- False +- +- +- +- +- False +- True +- +- +- +- +- +- True +- GPRS Options +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 + + + tab +@@ -1118,6 +640,10 @@ + 0.5 + 0 + 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 + + + tab +@@ -1150,6 +676,10 @@ + 0.5 + 0 + 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 + + + 0 +@@ -1261,6 +791,10 @@ + 0.5 + 0 + 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 + + + 1 +@@ -1294,6 +828,10 @@ + 0.5 + 0 + 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 + + + 0 +@@ -1425,6 +963,10 @@ + 0.5 + 0 + 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 + + + tab +@@ -1489,6 +1031,10 @@ + 0 + 0 + pptp-remote ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 + + + 0 +@@ -1513,6 +1059,10 @@ + 0.5 + 6 + 4 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 + + + 1 +@@ -1537,6 +1087,10 @@ + 0.5 + 0 + 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 + + + 0 +@@ -1568,6 +1122,10 @@ + 0.5 + 0 + 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 + + + 0 +@@ -1784,6 +1342,10 @@ + 0.5 + 0 + 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 + + + 0 +@@ -1832,6 +1394,10 @@ + 0.5 + 0 + 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 + + + 0 +@@ -1888,6 +1454,10 @@ + 0.5 + 0 + 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 + + + 0 +@@ -1947,6 +1517,10 @@ + 0.5 + 0 + 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 + + + 0 +@@ -1989,6 +1563,10 @@ + 0.5 + 0 + 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 + + + 0 +@@ -2013,6 +1591,10 @@ + 0.5 + 0 + 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 + + + 0 +@@ -2059,6 +1641,10 @@ + 0.5 + 0 + 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 + + + 0 +@@ -2149,138 +1735,10 @@ + 0.5 + 0 + 0 +- +- +- tab +- +- +- +- +- +- 10 +- True +- False +- 0 +- +- +- +- True +- False +- 4 +- +- +- +- True +- False +- 4 +- +- +- +- True +- 0.5 +- 0.5 +- 1 +- 1 +- 0 +- 0 +- 18 +- 0 +- +- +- +- True +- 1 +- 2 +- False +- 4 +- 13 +- +- +- +- True +- True +- Modem Connection +- True +- GTK_RELIEF_NORMAL +- True +- False +- False +- True +- +- +- 0 +- 1 +- 0 +- 1 +- fill +- +- +- +- +- +- +- True +- True +- Hardware RTS/CTS +- True +- GTK_RELIEF_NORMAL +- True +- False +- False +- True +- +- +- 1 +- 2 +- 0 +- 1 +- fill +- +- +- +- +- +- +- +- 0 +- True +- True +- +- +- +- +- 0 +- False +- False +- +- +- +- +- 0 +- True +- True +- +- +- +- +- False +- True +- +- +- +- +- +- True +- Serial Options +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 + + + tab +@@ -2395,6 +1853,10 @@ + 0.5 + 42 + 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 + + + 0 +@@ -2445,6 +1907,10 @@ + 0.5 + 0 + 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 + + + tab --- network-manager-pptp-0.6.4+svn2574.orig/debian/patches/00list +++ network-manager-pptp-0.6.4+svn2574/debian/patches/00list @@ -0,0 +1,3 @@ +03_nm_ppp_dialog.glade +04_nm_ppp_properties.c +05_ppplibdir --- network-manager-pptp-0.6.4+svn2574.orig/debian/patches/04_nm_ppp_properties.c.dpatch +++ network-manager-pptp-0.6.4+svn2574/debian/patches/04_nm_ppp_properties.c.dpatch @@ -0,0 +1,228 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 04_nm_ppp_properties.c.dpatch by Craig Box +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Remove non-PPTP options from the properties dialog + +@DPATCH@ +diff -urNad network-manager-pptp-0.6.4+pptp0.6.5~/properties/nm-ppp-properties.c network-manager-pptp-0.6.4+pptp0.6.5/properties/nm-ppp-properties.c +--- network-manager-pptp-0.6.4+pptp0.6.5~/properties/nm-ppp-properties.c 2007-05-26 12:19:31.000000000 +1200 ++++ network-manager-pptp-0.6.4+pptp0.6.5/properties/nm-ppp-properties.c 2007-05-26 12:18:27.000000000 +1200 +@@ -42,7 +42,7 @@ + + #define BUILD_BLUETOOTH + +-#define VPNUI_DISPLAY_NAME _("pppd tunnel (PPTP, BTGPRS, Dialup)") ++#define VPNUI_DISPLAY_NAME _("PPTP tunnel") + #define VPNUI_SERVICE_NAME "org.freedesktop.NetworkManager.ppp_starter" + #define VPNUI_BASIC_DEFAULTS "connection-name='';" \ + "ppp-debug=no;" \ +@@ -50,7 +50,7 @@ + "usepeerdns-overtunnel=yes;" \ + "ppp-lock=yes;" \ + "ppp-auth-peer=no;" \ +- "ppp-refuse-eap=no;" \ ++ "ppp-refuse-eap=yes;" \ + "ppp-refuse-chap=no;" \ + "ppp-refuse-mschap=no;" \ + "lcp-echo-failure=10;" \ +@@ -59,26 +59,6 @@ + "routes=;" \ + "ppp-debug=no;" \ + "ppp-extra='';" +-#define VPNUI_BTOOTH_DEFAULTS "bt-bdaddr=00:00:00:00:00:00;" \ +- "bt-channel=1;" +-#define VPNUI_GPRS_DEFAULTS "gprs-packet-type=IP;" \ +- "gprs-context-num=1;" \ +- "gprs-ip-address=0.0.0.0;" \ +- "gprs-apn=internet;" \ +- "ppp-crtscts=yes;" \ +- "ppp-noipdefault=yes;" \ +- "ppp-modem=yes;" \ +- "usepeerdns=yes;" \ +- "ppp-connect-delay=5000;" +-#define VPNUI_BTGPRS_DEFAULTS "ppp-connection-type=btgprs;" \ +- "encrypt-mppe=no;" \ +- "encrypt-mppe-128=no;" \ +- "encrypt-mppe-stateful=no;" \ +- "compress-mppc=no;" \ +- "compress-bsd=no;" \ +- "compress-deflate=no;" \ +- "mru=1000;" \ +- "mtu=1000;" + #define VPNUI_PPTP_DEFAULTS "pptp-remote='';" \ + "ppp-connection-type=pptp;" \ + "encrypt-mppe=no;" \ +@@ -89,18 +69,6 @@ + "compress-deflate=no;" \ + "mru=1416;" \ + "mtu=1416;" +-#define VPNUI_DIALUP_DEFAULTS "phone-number=THIS DOESN'T DO ANYTHING;" \ +- "ppp-crtscts=yes;" \ +- "ppp-modem=yes;" \ +- "ppp-connection-type=dialup;" \ +- "encrypt-mppe=no;" \ +- "encrypt-mppe-128=no;" \ +- "encrypt-mppe-stateful=no;" \ +- "compress-mppc=no;" \ +- "compress-bsd=no;" \ +- "compress-deflate=no;" \ +- "mru=1000;" \ +- "mtu=1000;" + + #ifdef NMVPNUI_PPTP_PROPERTIES_C + #endif +@@ -192,51 +160,6 @@ + GTK_SIGNAL_FUNC(&editable_changed), NULL, impl ); + + opt = vpnui_opt_new( +- "phone-number", VPN_UI_OPTTYPE_STRING, +- "phone-number", "Telephone-Number", _("Telephone Number"), +- GTK_SIGNAL_FUNC(&editable_changed), &vld_non_empty, impl ); +- +- opt = vpnui_opt_new( +- "bt-bdaddr", VPN_UI_OPTTYPE_STRING, +- "bt-bdaddr", "Bluetooth-Address", _("Bluetooth Address"), +- GTK_SIGNAL_FUNC(&editable_changed), &vld_non_empty, impl ); +- +- opt = vpnui_opt_new( +- "bt-channel", VPN_UI_OPTTYPE_STRING, +- "bt-channel", "Bluetooth-Channel", _("Bluetooth Channel"), +- GTK_SIGNAL_FUNC(&editable_changed), &vld_non_empty, impl ); +- +- opt = vpnui_opt_new( +- "gprs-apn", VPN_UI_OPTTYPE_STRING, +- "gprs-apn", "GPRS-Access-Point-Name", _("GPRS APN"), +- GTK_SIGNAL_FUNC(&editable_changed), &vld_non_empty, impl ); +- +- opt = vpnui_opt_new( +- "gprs-ip-address", VPN_UI_OPTTYPE_STRING, +- "gprs-ip-address", "GPRS-IP-Address", _("GPRS IP"), +- GTK_SIGNAL_FUNC(&editable_changed), &vld_non_empty, impl ); +- +- opt = vpnui_opt_new( +- "gprs-context-num", VPN_UI_OPTTYPE_STRING, +- "gprs-context-num", "GPRS-Context-Number", _("GPRS Context No."), +- GTK_SIGNAL_FUNC(&editable_changed), &vld_non_empty, impl ); +- +- opt = vpnui_opt_new( +- "gprs-packet-type", VPN_UI_OPTTYPE_STRING, +- "gprs-packet-type", "GPRS-Packet-Type", _("GPRS Packet Type"), +- GTK_SIGNAL_FUNC(&editable_changed), &vld_non_empty, impl ); +- +- opt = vpnui_opt_new( +- "ppp-crtscts", VPN_UI_OPTTYPE_YESNO, +- "ppp-crtscts", "PPP-Hardware-CTSRTS", _("Use CTS/RTS flow control"), +- GTK_SIGNAL_FUNC(&editable_changed), NULL, impl ); +- +- opt = vpnui_opt_new( +- "ppp-modem", VPN_UI_OPTTYPE_YESNO, +- "ppp-modem", "PPP-Modem", _("Connect via a modem"), +- GTK_SIGNAL_FUNC(&editable_changed), NULL, impl ); +- +- opt = vpnui_opt_new( + "ppp-noipdefault", VPN_UI_OPTTYPE_YESNO, + "ppp-noipdefault", "PPP-No-IP-Default", _("Require IP to be provided"), + GTK_SIGNAL_FUNC(&editable_changed), NULL, impl ); +@@ -358,29 +281,14 @@ + VPNUI_BASIC_DEFAULTS VPNUI_PPTP_DEFAULTS, + impl); + +-#ifdef BUILD_BLUETOOTH +- variant = vpnui_variant_new( "btgprs", "GPRS over Bluetooth (via mobile phone)", +- VPNUI_BASIC_DEFAULTS VPNUI_GPRS_DEFAULTS VPNUI_BTOOTH_DEFAULTS VPNUI_BTGPRS_DEFAULTS, +- impl); +-#endif ++ gtk_combo_box_set_active(impl->variant_combo, 0); ++// vpnui_variant_select_byname(impl,"Windows VPN (PPTP)"); + +- variant = vpnui_variant_new( "dialup", "Dialup", +- VPNUI_BASIC_DEFAULTS VPNUI_DIALUP_DEFAULTS, +- impl); + // + // GLADE NAME IMPLEMENTATION_OBJ + // expand= vpnui_expand_new ("routing-expander",impl); +-// expand= vpnui_expand_new ("dialup-expander",impl); + // expand= vpnui_expand_new ("pppd-expander",impl); + // expand= vpnui_expand_new ("pptp-expander",impl); +-// expand= vpnui_expand_new ("bluetooth-expander",impl); +-// expand= vpnui_expand_new ("serial-expander",impl); +-// expand= vpnui_expand_new ("gprs-expander",impl); +- +-// Attach to press event of the Bluetooth "Find Device" button. +-// will need libbtcl +-// impl->w_import_button = GTK_BUTTON (glade_xml_get_widget (impl->xml, +-// "import-button")); + + // Attach an import_button + impl->w_import_button = GTK_BUTTON (glade_xml_get_widget (impl->xml, +@@ -444,15 +352,11 @@ + void + impl_hide_and_show (NetworkManagerVpnUIImpl *impl) + { +- GtkWidget *serial_options = NULL; +- GtkWidget *gprs_options = NULL; + GtkWidget *auth_options = NULL; + GtkWidget *comp_enc_options = NULL; + GtkWidget *routing_options = NULL; + GtkWidget *ppp_options = NULL; +- GtkWidget *bluetooth_front = NULL; + GtkWidget *pptp_front = NULL; +- GtkWidget *dialup_front = NULL; + GtkComboBox *combo = NULL; + char *variant_name; + +@@ -466,17 +370,9 @@ + auth_options = glade_xml_get_widget(impl->xml, "auth-options"); + comp_enc_options = glade_xml_get_widget(impl->xml, "comp-enc-options"); + routing_options = glade_xml_get_widget(impl->xml, "routing-options"); +- gprs_options = glade_xml_get_widget(impl->xml, "gprs-options"); +- serial_options = glade_xml_get_widget(impl->xml, "serial-options"); +- bluetooth_front = glade_xml_get_widget(impl->xml, "bluetooth-front"); +- dialup_front = glade_xml_get_widget(impl->xml, "dialup-front"); + pptp_front = glade_xml_get_widget(impl->xml, "pptp-front"); + + if (pptp_front) gtk_widget_hide(pptp_front); +- if (bluetooth_front) gtk_widget_hide(bluetooth_front); +- if (dialup_front) gtk_widget_hide(dialup_front); +- if (gprs_options) gtk_widget_hide(gprs_options); +- if (serial_options) gtk_widget_hide(serial_options); + if (ppp_options) gtk_widget_hide(ppp_options); + if (auth_options) gtk_widget_hide(auth_options); + if (comp_enc_options) gtk_widget_hide(comp_enc_options); +@@ -491,35 +387,5 @@ + if (auth_options) gtk_widget_show(auth_options); + if (comp_enc_options) gtk_widget_show(comp_enc_options); + if (routing_options) gtk_widget_show(routing_options); +- } else if (strcmp(variant_name,"dialup")==0) { +- if (dialup_front) gtk_widget_show(dialup_front); +- if (serial_options) gtk_widget_show(serial_options); +- if (ppp_options) gtk_widget_show(ppp_options); +- if (auth_options) gtk_widget_show(auth_options); +- if (comp_enc_options) gtk_widget_show(comp_enc_options); +- if (routing_options) gtk_widget_show(routing_options); +- } else if (strcmp(variant_name,"btgprs")==0) { +- if (bluetooth_front) gtk_widget_show(bluetooth_front); +- if (gprs_options) gtk_widget_show(gprs_options); +- if (serial_options) gtk_widget_show(serial_options); +- if (ppp_options) gtk_widget_show(ppp_options); +- if (auth_options) gtk_widget_show(auth_options); +- if (comp_enc_options) gtk_widget_show(comp_enc_options); +- if (routing_options) gtk_widget_show(routing_options); +- } else if (strcmp(variant_name,"dialup")==0) { +- if (dialup_front) gtk_widget_show(dialup_front); +- if (serial_options) gtk_widget_show(serial_options); +- if (ppp_options) gtk_widget_show(ppp_options); +- if (auth_options) gtk_widget_show(auth_options); +- if (comp_enc_options) gtk_widget_show(comp_enc_options); +- if (routing_options) gtk_widget_show(routing_options); +- } else if (strcmp(variant_name,"btgprs")==0) { +- if (bluetooth_front) gtk_widget_show(bluetooth_front); +- if (gprs_options) gtk_widget_show(gprs_options); +- if (serial_options) gtk_widget_show(serial_options); +- if (ppp_options) gtk_widget_show(ppp_options); +- if (auth_options) gtk_widget_show(auth_options); +- if (comp_enc_options) gtk_widget_show(comp_enc_options); +- if (routing_options) gtk_widget_show(routing_options); + } + } --- network-manager-pptp-0.6.4+svn2574.orig/debian/patches/02_nm_ppp_starter_0.62.dpatch +++ network-manager-pptp-0.6.4+svn2574/debian/patches/02_nm_ppp_starter_0.62.dpatch @@ -0,0 +1,22 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_nm_ppp_starter.dpatch by Craig Box +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix for NM 0.6.2. Only required if you are building a package +## DP: for Dapper. + +@DPATCH@ +diff -urNad network-manager-pptp-0.6.4+pptp0.6.5~/src/nm-ppp-starter.c network-manager-pptp-0.6.4+pptp0.6.5/src/nm-ppp-starter.c +--- network-manager-pptp-0.6.4+pptp0.6.5~/src/nm-ppp-starter.c 2007-04-21 16:42:21.000000000 +1200 ++++ network-manager-pptp-0.6.4+pptp0.6.5/src/nm-ppp-starter.c 2007-05-13 18:26:06.000000000 +1200 +@@ -1509,7 +1509,10 @@ + DBUS_TYPE_UINT32, &ip4_netmask, + DBUS_TYPE_ARRAY, DBUS_TYPE_UINT32, &ip4_dns, ip4_dns_len, + DBUS_TYPE_ARRAY, DBUS_TYPE_UINT32, &ip4_nbns, ip4_nbns_len, ++ /* NetworkManager 0.6.2 doesn't have the mss in the connection ++ * info packet. + DBUS_TYPE_UINT32, &mss, ++ */ + DBUS_TYPE_STRING, &empty, + DBUS_TYPE_STRING, &empty, + DBUS_TYPE_INVALID); --- network-manager-pptp-0.6.4+svn2574.orig/debian/patches/01_no_icon.dpatch +++ network-manager-pptp-0.6.4+svn2574/debian/patches/01_no_icon.dpatch @@ -0,0 +1,15 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_no_icon.dpatch by Criag Box +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Do not display an icon in the menu (Closes: #109856) + +@DPATCH@ +diff -urNad network-manager-pptp-0.6.4+pptp0.6.5~/nm-ppp.desktop.in network-manager-pptp-0.6.4+pptp0.6.5/nm-ppp.desktop.in +--- network-manager-pptp-0.6.4+pptp0.6.5~/nm-ppp.desktop.in 2007-04-21 16:42:40.000000000 +1200 ++++ network-manager-pptp-0.6.4+pptp0.6.5/nm-ppp.desktop.in 2007-05-13 20:20:26.000000000 +1200 +@@ -10,3 +10,4 @@ + DocPath= + Categories=GNOME;Application;Network; + MimeType=application/x-ppp-settings ++NoDisplay=true --- network-manager-pptp-0.6.4+svn2574.orig/debian/rules +++ network-manager-pptp-0.6.4+svn2574/debian/rules @@ -0,0 +1,106 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + + +CFLAGS = -Wall -g -fPIC + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +config.status: patch configure + dh_testdir + # Add here commands to configure the package. + # CFLAGS="$(CFLAGS) -Wl,-z,defs" + ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc --localstatedir=/var --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --libexecdir=\$${prefix}/lib/network-manager --libdir=/usr/lib/network-manager --disable-static --enable-nm-vpn-dbus-old + + +build: build-stamp + +build-stamp: config.status + dh_testdir + + # Add here commands to compile the package. + $(MAKE) + #docbook-to-man debian/network-manager-pptp.sgml > network-manager-pptp.1 + + touch build-stamp + +clean: clean-patched unpatch +clean-patched: + dh_testdir + dh_testroot + rm -f build-stamp + + # Add here commands to clean up after the build process. + -$(MAKE) distclean +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + cp -f /usr/share/misc/config.sub config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + cp -f /usr/share/misc/config.guess config.guess +endif + + + dh_clean + +patch: + dpatch apply-all + +unpatch: + dpatch deapply-all + rm -rf debian/patched + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/network-manager-pptp. + $(MAKE) install DESTDIR=$(CURDIR)/debian/network-manager-pptp + # remove .la file + rm $(CURDIR)/debian/network-manager-pptp/usr/lib/network-manager/libnm-ppp-properties.la + + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_installexamples + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms + dh_makeshlibs -n + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- network-manager-pptp-0.6.4+svn2574.orig/debian/docs +++ network-manager-pptp-0.6.4+svn2574/debian/docs @@ -0,0 +1,3 @@ +AUTHORS +README +TODO --- network-manager-pptp-0.6.4+svn2574.orig/debian/postinst +++ network-manager-pptp-0.6.4+svn2574/debian/postinst @@ -0,0 +1,38 @@ +#! /bin/sh +# postinst script for network-manager-pptp + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +case "$1" in + configure) + + # Ask the bus to reload the config file + if [ -x "/etc/init.d/dbus" ]; then + invoke-rc.d dbus force-reload || true + fi + ;; + abort-upgrade|abort-remove|abort-deconfigure) + ;; + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- network-manager-pptp-0.6.4+svn2574.orig/debian/dirs +++ network-manager-pptp-0.6.4+svn2574/debian/dirs @@ -0,0 +1,2 @@ +usr/bin +etc/NetworkManager/VPN/