summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2007-12-25 15:52:48 +0000
committerMichael Biebl <biebl@debian.org>2007-12-25 15:52:48 +0000
commit001add6140068afaa0edc1bc4579ef2e0f73b236 (patch)
tree7c96571db62821d2eac254124dc18fb62c1cb288
parent645642682faedc926ecb79c83a0306202dd2f6a7 (diff)
* debian/patches/12_readme_format.patchdebian/0.6.5-4
- Fix line break in README file. (Closes: #444038) git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2001 ceb527fc-18e6-0310-9fe2-813c157c29e7
-rw-r--r--debian/changelog6
-rw-r--r--debian/patches/12_readme_format.patch14
2 files changed, 18 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index f358ca8ec..e7e86f046 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-network-manager (0.6.5-4) UNRELEASED; urgency=low
+network-manager (0.6.5-4) unstable; urgency=low
* debian/control
- The Vcs-* fields are now officially supported, so remove the XS- prefix.
@@ -10,8 +10,10 @@ network-manager (0.6.5-4) UNRELEASED; urgency=low
* debian/network-manager-dispatcher.script
- Set PHASE="post-up" for scripts in if-up.d and PHASE="pre-down" for
scripts in if-down.d to be compliant with ifupdown. (Closes: #452371)
+ * debian/patches/12_readme_format.patch
+ - Fix line break in README file. (Closes: #444038)
- -- Michael Biebl <biebl@debian.org> Sun, 23 Dec 2007 16:27:30 +0100
+ -- Michael Biebl <biebl@debian.org> Tue, 25 Dec 2007 16:51:00 +0100
network-manager (0.6.5-3) unstable; urgency=low
diff --git a/debian/patches/12_readme_format.patch b/debian/patches/12_readme_format.patch
new file mode 100644
index 000000000..5fa39d247
--- /dev/null
+++ b/debian/patches/12_readme_format.patch
@@ -0,0 +1,14 @@
+Index: README
+===================================================================
+--- README (Revision 3190)
++++ README (Arbeitskopie)
+@@ -20,7 +20,8 @@
+ For wireless networking support, NetworkManager keeps a list of wireless
+ networks, the preferred list. Preferred Networks are wireless networks that
+ the user has explicitly made NetworkManager associate with at some previous
+-time. So if the user walks into a Starbucks and explicitly asks NetworkManager to associate with that Starbucks network, NetworkManager will remember the
++time. So if the user walks into a Starbucks and explicitly asks NetworkManager
++to associate with that Starbucks network, NetworkManager will remember the
+ Starbucks network information from that point on. Upon returning to that
+ Starbucks, NetworkManager will attempt to associate _automatically_ with the
+ Starbucks network since it is now in the Preferred Networks list. The point of