From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Sat, 6 Apr 2013 13:04:30 +0000 (-0400)
Subject: Fix up copyright names in ENWC; tweak packages/README.
X-Git-Url: https://code.delx.au/gnu-emacs-elpa/commitdiff_plain/905431b60a22138830eec2d8600e90f7691b0b89

Fix up copyright names in ENWC; tweak packages/README.
---

diff --git a/packages/README b/packages/README
index 80cd97542..426de05dc 100644
--- a/packages/README
+++ b/packages/README
@@ -5,7 +5,30 @@ either a single-file package or a multifile package.
 
 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>
+   
diff --git a/packages/enwc/enwc-cm.el b/packages/enwc/enwc-cm.el
index 975c9f971..91f002a42 100644
--- a/packages/enwc/enwc-cm.el
+++ b/packages/enwc/enwc-cm.el
@@ -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
diff --git a/packages/enwc/enwc-nm.el b/packages/enwc/enwc-nm.el
index 790eaec94..9ba8c5e72 100644
--- a/packages/enwc/enwc-nm.el
+++ b/packages/enwc/enwc-nm.el
@@ -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
diff --git a/packages/enwc/enwc-setup.el b/packages/enwc/enwc-setup.el
index c0e3ac2c7..e88dc0378 100644
--- a/packages/enwc/enwc-setup.el
+++ b/packages/enwc/enwc-setup.el
@@ -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
diff --git a/packages/enwc/enwc-wicd.el b/packages/enwc/enwc-wicd.el
index e7388d2fd..c8eeb6122 100644
--- a/packages/enwc/enwc-wicd.el
+++ b/packages/enwc/enwc-wicd.el
@@ -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
diff --git a/packages/enwc/enwc.el b/packages/enwc/enwc.el
index a131516c1..69517ca69 100644
--- a/packages/enwc/enwc.el
+++ b/packages/enwc/enwc.el
@@ -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