[ELPA-diffs] /srv/bzr/emacs/elpa r382: Fix up copyright names in ENWC; tweak packages/README.

[Stefan Monnier]

------------------------------------------------------------
revno: 382
committer: Stefan Monnier <address@hidden>
branch nick: elpa
timestamp: Sat 2013-04-06 09:04:30 -0400
message:
  Fix up copyright names in ENWC; tweak packages/README.
modified:
  packages/README
  packages/enwc/enwc-cm.el
  packages/enwc/enwc-nm.el
  packages/enwc/enwc-setup.el
  packages/enwc/enwc-wicd.el
  packages/enwc/enwc.el

=== modified file 'packages/README'
--- a/packages/README   2012-12-05 15:31:58 +0000
+++ b/packages/README   2013-04-06 13:04:30 +0000
@@ -5,7 +5,30 @@
 
 A nightly cron job refreshes the GNU ELPA archive from this repository.
 
-This cron job only creates a new package when the "version" of a package
-is modified.  This means that you can safely work on the next version here
-without worrying about the unstable code making it to GNU ELPA, and simply
-update the "version" when you want to release the new code.
+This cron job only creates a new package when the "version" (as specified in
+the foo-pkg.el or in the "Version:" header) of a package is modified.
+This means that you can safely work on the next version here without
+worrying about the unstable code making it to GNU ELPA, and simply update
+the "version" when you want to release the new code.
+
+* External branches:
+
+Some packages have an external upstream branch.
+You should ideally be able to "bzr merge <URL>" from them, and it often
+works, but it generally requires some hand-holding to set it up.
+More specifically, the first "bzr merge" (ideally done when installing the
+package into `elpa') needs to be a "bzr join" since there's no
+common ancestor.  Worse, "bzr join" doesn't work so well with bzr-git, so
+you need to do a bit of gymnastics:
+
+   git clone <giturl>   # Done because bzr-git works better locally
+   bzr branch <localgit> tmp
+   cd tmp
+   bzr mkdir .newroot
+   bzr mv * .newroot/
+   ... maybe other bzr mv .<blabla> .newroot/ ...
+   bzr split .newroot
+   mv .newroot .../elpa/packages/<package>
+   cd .../elpa/packages/
+   bzr join <package>
+   

=== modified file 'packages/enwc/enwc-cm.el'
--- a/packages/enwc/enwc-cm.el  2013-04-05 11:45:26 +0000
+++ b/packages/enwc/enwc-cm.el  2013-04-06 13:04:30 +0000
@@ -1,6 +1,6 @@
 ;; enwc-cm.el
 
-;; Copyright (C) 2012,2013 Free Software Foundation
+;; Copyright (C) 2012,2013 Free Software Foundation, Inc.
 
 ;; Author: Ian Dunn
 ;; Keywords: enwc, network, wicd, manager, nm

=== modified file 'packages/enwc/enwc-nm.el'
--- a/packages/enwc/enwc-nm.el  2013-04-05 11:45:26 +0000
+++ b/packages/enwc/enwc-nm.el  2013-04-06 13:04:30 +0000
@@ -1,6 +1,6 @@
 ;;; enwc-nm.el - The NetworkManager backend to ENWC
 
-;; Copyright (C) 2012,2013 Free Software Foundation
+;; Copyright (C) 2012,2013 Free Software Foundation, Inc.
 
 ;; Author: Ian Dunn
 ;; Keywords: enwc, network, wicd, manager, nm

=== modified file 'packages/enwc/enwc-setup.el'
--- a/packages/enwc/enwc-setup.el       2013-04-05 11:45:26 +0000
+++ b/packages/enwc/enwc-setup.el       2013-04-06 13:04:30 +0000
@@ -1,6 +1,6 @@
 ;; enwc-setup.el - Setup routines for ENWC
 
-;; Copyright (C) 2012,2013 Free Software Foundation
+;; Copyright (C) 2012,2013 Free Software Foundation, Inc.
 
 ;; Author: Ian Dunn
 ;; Keywords: enwc, network, wicd, manager, nm

=== modified file 'packages/enwc/enwc-wicd.el'
--- a/packages/enwc/enwc-wicd.el        2013-04-05 19:10:39 +0000
+++ b/packages/enwc/enwc-wicd.el        2013-04-06 13:04:30 +0000
@@ -1,6 +1,6 @@
 ;;; enwc-wicd.el --- The Wicd backend to ENWC
 
-;; Copyright (C) 2012,2013 Free Software Foundation
+;; Copyright (C) 2012,2013 Free Software Foundation, Inc.
 
 ;; Author: Ian Dunn
 ;; Keywords: enwc, network, wicd, manager, nm

=== modified file 'packages/enwc/enwc.el'
--- a/packages/enwc/enwc.el     2013-04-05 11:45:26 +0000
+++ b/packages/enwc/enwc.el     2013-04-06 13:04:30 +0000
@@ -1,6 +1,6 @@
 ;;; enwc.el --- The Emacs Network Client
 
-;; Copyright (C) 2012,2013 Free Software Foundation
+;; Copyright (C) 2012,2013 Free Software Foundation, Inc.
 
 ;; Author: Ian Dunn
 ;; Keywords: enwc, network, wicd, manager, nm