about summary refs log tree commit diff
path: root/debian
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2008-06-18 22:21:18 +0000
committerMichael Biebl <biebl@debian.org>2008-06-18 22:21:18 +0000
commitea0e9c81f08f312774fee15a6b891679e9f5ed99 (patch)
tree86cb4887ebac7fc1a35abdfbf36b59719d554b1f /debian
parentd5fc2a7f95ccfd111c2e1bb412e68ea2b7551574 (diff)
Merge changelog. 0.7.0~svn3747-1 was never released.
A more complete changelog will follow...


git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2322 ceb527fc-18e6-0310-9fe2-813c157c29e7
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog18
1 files changed, 6 insertions, 12 deletions
diff --git a/debian/changelog b/debian/changelog
index f8eaa6d4..baff8566 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,16 +1,12 @@
 network-manager (0.7.0~svn3758-1) UNRELEASED; urgency=low
 
-  * New SVN snapshot
-  * debian/patches/03-system-settings-conf.patch
-    - Removed. Merged upstream
+  * SVN snapshot of the upcoming 0.7 release.
+
+  [ Sjoerd Simons ]
   * Split out libnm-glib-vpn from libnm-glib
   * debian/rules: Use list-missing
 
- -- Sjoerd Simons <sjoerd@debian.org>  Wed, 18 Jun 2008 15:50:59 +0100
-
-network-manager (0.7.0~svn3747-1) experimental; urgency=low
-
-  * SVN snapshot of the upcoming 0.7 release.
+  [ Michael Biebl ]
   * Drop patches which are either obsolete, merged upstream or not yet ported
     - 01-supplicant_timeout.patch
     - 13-validate_mac_addr.patch
@@ -18,12 +14,10 @@ network-manager (0.7.0~svn3747-1) experimental; urgency=low
     - Updated for 0.7.
   * debian/patches/02-dbus_access_network_manager.patch
     - Updated for 0.7.
-  * debian/patches/03-system-settings-conf.patch
-    - Added. Put system settings config file in /etc/NetworkManager
   * debian/control: Updated dependencies and build-depends
   * debian/rules:
     - Switch to quilt as a patch system
-     - Update for the 0.7 build
+    - Update for the 0.7 build
   * debian/copyright: Updated
   * debian/nm-vpn-properties.sgml: Dropped, obsolete
   * debian/watch: Updated to match both the current 0.6 and the upcoming 0.7
@@ -33,7 +27,7 @@ network-manager (0.7.0~svn3747-1) experimental; urgency=low
   * debian/*.install: Updated
   * debian/*.symbols: Updated
 
- -- Michael Biebl <biebl@debian.org>  Fri, 25 Jan 2008 15:35:15 +0100
+ -- Michael Biebl <biebl@debian.org>  Thu, 19 Jun 2008 00:11:17 +0200
 
 network-manager (0.6.6-1) unstable; urgency=low