lp:~noskcaj/ubuntu/trusty/network-manager-vpnc/merge
- Get this branch:
- bzr branch lp:~noskcaj/ubuntu/trusty/network-manager-vpnc/merge
Branch merges
- Ubuntu branches: Pending requested
-
Diff: 8206 lines (+2410/-2396)28 files modified.pc/01-fix-path-to-connection-editor-plugin-in-service-file.patch/Makefile.am (+0/-50)
.pc/01-fix-path-to-connection-editor-plugin-in-service-file.patch/nm-vpnc-service.name.in (+0/-9)
.pc/applied-patches (+0/-2)
.pc/gtk_table_to_gtk_grid.patch/auth-dialog/vpn-password-dialog.c (+0/-443)
Makefile.in (+176/-147)
NEWS (+21/-0)
aclocal.m4 (+389/-286)
auth-dialog/Makefile.in (+173/-99)
auth-dialog/vpn-password-dialog.c (+6/-6)
compile (+7/-3)
config.guess (+106/-78)
config.sub (+60/-45)
configure (+319/-237)
configure.ac (+1/-1)
debian/changelog (+19/-0)
debian/control (+2/-0)
debian/patches/01-fix-path-to-connection-editor-plugin-in-service-file.patch (+0/-37)
debian/patches/series (+0/-1)
depcomp (+269/-186)
install-sh (+7/-7)
missing (+159/-275)
po/it.po (+75/-61)
properties/Makefile.am (+1/-2)
properties/Makefile.in (+193/-152)
properties/nm-vpnc.c (+3/-0)
properties/tests/Makefile.in (+189/-151)
properties/tests/pcf/Makefile.in (+77/-36)
src/Makefile.in (+158/-82)
Branch information
- Owner:
- Jackson Doak
- Status:
- Development
Recent revisions
- 12. By Jackson Doak
-
* Merge from Debian. Remaining changes:
- debian/control:
+ Have network-manager- vpnc recommend network- manager- vpnc-gnome |
plasma- widget- networkmanageme nt
- debian/patches/ gtk_table_ to_gtk_ grid.patch: port the uses of GtkTable to
a GtkGrid, since GtkTable is now deprecated - 11. By Jeremy Bícha
-
* Sync with Debian. Remaining changes:
- debian/control:
+ Have network-manager- vpnc recommend network- manager- vpnc-gnome |
plasma-widget- networkmanageme nt
- debian/patches/ gtk_table_ to_gtk_ grid.patch: port the uses of GtkTable to
a GtkGrid, since GtkTable is now deprecated
* Dropped changes:
- debian/rules:
+ re-add code to grab git snapshots
- debian/patches/ auth-dialog- libexecdir. patch: Applied in new version - 10. By Jeremy Bícha
-
* Sync with Debian (LP: #1155551). Remaining changes:
- debian/control:
+ Have network-manager- vpnc recommend network- manager- vpnc-gnome |
plasma-widget- networkmanageme nt
+ Use autoreconf
- debian/rules:
+ re-add code to grab git snapshots
- debian/patches/ gtk_table_ to_gtk_ grid.patch: port the uses of GtkTable to
a GtkGrid, since GtkTable is now deprecated
- debian/patches/ auth-dialog- libexecdir. patch:
+ Backport patch to set libexecdir for the auth dialog for GNOME Shell
* Dropped changes:
- debian/patches/ deprecated_ g_type_ init.patch: Applied in new version - 8. By Michael Biebl
-
* New upstream release (0.9 rc1).
* debian/control
- Bump Build-Depends on libnm-*-dev and network-manager-dev to
(>= 0.8.998).
- Bump Build-Depends on libgtk2.0-dev to (>= 2.20).
* debian/rules
- Build against GTK+ version 2. - 7. By Michael Biebl
-
* Switch from cdbs to dh
- Drop Build-Depends on cdbs.
- Bump Build-Depends on debhelper to (>= 7.0.50~) for override targets.
- Convert debian/rules to use dh.
- Rename debian/docs to debian/network- manager- vpnc.docs so it is
correctly picked up by dh_installdocs. - 6. By Michael Biebl
-
* New upstream release.
* Update Vcs-* fields: Move packaging from svn to git.
* debian/control
- Bump Build-Depends on libnm-* packages to (>= 0.8.2). - 5. By Michael Biebl
-
* New upstream release (0.8 RC3).
- Fixes misleading error message when sending the IPv4 configuration
fails. (Closes: #529747)
* debian/control
- Bump Build-Depends on libnm-* packages to (>= 0.7.999).
- Bump Build-Depends on libdbus-glib-1-dev to (>= 0.74).
* debian/patches/ 02_add_ disable_ natt_and_ 1des.diff
- Drop, patch has been disabled for quite a while and equivalent
functionality has been added upstream. - 4. By Michael Biebl
-
[ Soren Hansen ]
* Remove myself from Uploaders.[ Michael Biebl ]
* New upstream release.
* debian/control
- Bump build dependencies on nm packages to (>= 0.7.2).
- Bump Standards-Version to 3.8.3. No further changes.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/trusty/network-manager-vpnc