[bzr-fastimport] update to 0.11.0
Dan Callaghan
dcallagh at fedoraproject.org
Fri Oct 14 00:37:19 UTC 2011
commit 81a6ca54ebdf345d2f27a198d5d29c606c6bfc0f
Author: Dan Callaghan <dcallagh at redhat.com>
Date: Thu Oct 6 09:11:18 2011 +1000
update to 0.11.0
.gitignore | 2 +-
bzr-fastimport-fsf-address.patch | 301 ++++++++++++++++++++++++++++++++++++++
bzr-fastimport.spec | 17 ++-
sources | 2 +-
4 files changed, 313 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a3daea8..ce1b300 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/bzr-fastimport-0.10.0.tar.gz
+/bzr-fastimport-0.11.0.tar.gz
diff --git a/bzr-fastimport-fsf-address.patch b/bzr-fastimport-fsf-address.patch
new file mode 100644
index 0000000..25f0d18
--- /dev/null
+++ b/bzr-fastimport-fsf-address.patch
@@ -0,0 +1,301 @@
+diff -ur bzr-fastimport-0.11.0.orig/branch_mapper.py bzr-fastimport-0.11.0/branch_mapper.py
+--- bzr-fastimport-0.11.0.orig/branch_mapper.py 2011-08-23 02:50:16.000000000 +1000
++++ bzr-fastimport-0.11.0/branch_mapper.py 2011-10-06 09:10:34.331911179 +1000
+@@ -11,8 +11,7 @@
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ """An object that maps git ref names to bzr branch names. Note that it is not
+ used to map git ref names to bzr tag names."""
+diff -ur bzr-fastimport-0.11.0.orig/branch_updater.py bzr-fastimport-0.11.0/branch_updater.py
+--- bzr-fastimport-0.11.0.orig/branch_updater.py 2011-08-23 02:50:16.000000000 +1000
++++ bzr-fastimport-0.11.0/branch_updater.py 2011-10-06 09:10:34.331911179 +1000
+@@ -11,8 +11,7 @@
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ """An object that updates a bunch of branches based on data imported."""
+
+diff -ur bzr-fastimport-0.11.0.orig/bzr_commit_handler.py bzr-fastimport-0.11.0/bzr_commit_handler.py
+--- bzr-fastimport-0.11.0.orig/bzr_commit_handler.py 2011-08-23 02:50:16.000000000 +1000
++++ bzr-fastimport-0.11.0/bzr_commit_handler.py 2011-10-06 09:10:34.332911202 +1000
+@@ -11,8 +11,7 @@
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ """CommitHandlers that build and save revisions & their inventories."""
+
+diff -ur bzr-fastimport-0.11.0.orig/cache_manager.py bzr-fastimport-0.11.0/cache_manager.py
+--- bzr-fastimport-0.11.0.orig/cache_manager.py 2011-08-23 02:50:16.000000000 +1000
++++ bzr-fastimport-0.11.0/cache_manager.py 2011-10-06 09:10:34.332911202 +1000
+@@ -11,8 +11,7 @@
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ """A manager of caches."""
+
+diff -ur bzr-fastimport-0.11.0.orig/cmds.py bzr-fastimport-0.11.0/cmds.py
+--- bzr-fastimport-0.11.0.orig/cmds.py 2011-08-23 02:50:16.000000000 +1000
++++ bzr-fastimport-0.11.0/cmds.py 2011-10-06 09:10:34.332911202 +1000
+@@ -11,8 +11,7 @@
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ """Fastimport/fastexport commands."""
+
+diff -ur bzr-fastimport-0.11.0.orig/exporter.py bzr-fastimport-0.11.0/exporter.py
+--- bzr-fastimport-0.11.0.orig/exporter.py 2011-08-23 02:50:16.000000000 +1000
++++ bzr-fastimport-0.11.0/exporter.py 2011-10-06 09:10:34.332911202 +1000
+@@ -13,8 +13,7 @@
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
+ #
+ # Original Copyright (c) 2008 Adeodato Simó
+ # Original License: MIT (See exporters/bzr-fast-export.LICENSE)
+diff -ur bzr-fastimport-0.11.0.orig/exporters/darcs/d2x bzr-fastimport-0.11.0/exporters/darcs/d2x
+--- bzr-fastimport-0.11.0.orig/exporters/darcs/d2x 2011-08-23 02:50:16.000000000 +1000
++++ bzr-fastimport-0.11.0/exporters/darcs/d2x 2011-10-06 09:10:34.333911225 +1000
+@@ -15,9 +15,7 @@
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+-# USA.
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
+ #
+
+ usage()
+diff -ur bzr-fastimport-0.11.0.orig/exporters/darcs/git-darcs bzr-fastimport-0.11.0/exporters/darcs/git-darcs
+--- bzr-fastimport-0.11.0.orig/exporters/darcs/git-darcs 2011-08-23 02:50:16.000000000 +1000
++++ bzr-fastimport-0.11.0/exporters/darcs/git-darcs 2011-10-06 09:10:34.345911503 +1000
+@@ -19,9 +19,7 @@
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+-# USA.
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
+ #
+
+ add()
+diff -ur bzr-fastimport-0.11.0.orig/exporters/darcs/x2d bzr-fastimport-0.11.0/exporters/darcs/x2d
+--- bzr-fastimport-0.11.0.orig/exporters/darcs/x2d 2011-08-23 02:50:16.000000000 +1000
++++ bzr-fastimport-0.11.0/exporters/darcs/x2d 2011-10-06 09:10:34.346911526 +1000
+@@ -15,9 +15,7 @@
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+-# USA.
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
+ #
+
+ usage()
+diff -ur bzr-fastimport-0.11.0.orig/exporters/__init__.py bzr-fastimport-0.11.0/exporters/__init__.py
+--- bzr-fastimport-0.11.0.orig/exporters/__init__.py 2011-08-23 02:50:16.000000000 +1000
++++ bzr-fastimport-0.11.0/exporters/__init__.py 2011-10-06 09:10:34.346911526 +1000
+@@ -11,8 +11,7 @@
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ """Simplified and unified access to the various xxx-fast-export tools."""
+
+diff -ur bzr-fastimport-0.11.0.orig/helpers.py bzr-fastimport-0.11.0/helpers.py
+--- bzr-fastimport-0.11.0.orig/helpers.py 2011-08-23 02:50:16.000000000 +1000
++++ bzr-fastimport-0.11.0/helpers.py 2011-10-06 09:10:34.347911549 +1000
+@@ -11,8 +11,7 @@
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ """Miscellaneous useful stuff."""
+
+diff -ur bzr-fastimport-0.11.0.orig/__init__.py bzr-fastimport-0.11.0/__init__.py
+--- bzr-fastimport-0.11.0.orig/__init__.py 2011-08-23 02:50:16.000000000 +1000
++++ bzr-fastimport-0.11.0/__init__.py 2011-10-06 09:10:34.347911549 +1000
+@@ -11,8 +11,7 @@
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ r"""FastImport Plugin
+ =================
+diff -ur bzr-fastimport-0.11.0.orig/marks_file.py bzr-fastimport-0.11.0/marks_file.py
+--- bzr-fastimport-0.11.0.orig/marks_file.py 2011-08-23 02:50:16.000000000 +1000
++++ bzr-fastimport-0.11.0/marks_file.py 2011-10-06 09:10:34.348911572 +1000
+@@ -11,8 +11,7 @@
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ """Routines for reading/writing a marks file."""
+
+diff -ur bzr-fastimport-0.11.0.orig/processors/generic_processor.py bzr-fastimport-0.11.0/processors/generic_processor.py
+--- bzr-fastimport-0.11.0.orig/processors/generic_processor.py 2011-08-23 02:50:16.000000000 +1000
++++ bzr-fastimport-0.11.0/processors/generic_processor.py 2011-10-06 09:10:34.349911595 +1000
+@@ -11,8 +11,7 @@
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ """Import processor that supports all Bazaar repository formats."""
+
+diff -ur bzr-fastimport-0.11.0.orig/processors/__init__.py bzr-fastimport-0.11.0/processors/__init__.py
+--- bzr-fastimport-0.11.0.orig/processors/__init__.py 2011-08-23 02:50:16.000000000 +1000
++++ bzr-fastimport-0.11.0/processors/__init__.py 2011-10-06 09:10:34.350911618 +1000
+@@ -11,7 +11,6 @@
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ """Actual import processors."""
+diff -ur bzr-fastimport-0.11.0.orig/revision_store.py bzr-fastimport-0.11.0/revision_store.py
+--- bzr-fastimport-0.11.0.orig/revision_store.py 2011-08-23 02:50:16.000000000 +1000
++++ bzr-fastimport-0.11.0/revision_store.py 2011-10-06 09:10:34.351911641 +1000
+@@ -11,8 +11,7 @@
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ """An abstraction of a repository providing just the bits importing needs."""
+
+diff -ur bzr-fastimport-0.11.0.orig/tests/__init__.py bzr-fastimport-0.11.0/tests/__init__.py
+--- bzr-fastimport-0.11.0.orig/tests/__init__.py 2011-08-23 02:50:16.000000000 +1000
++++ bzr-fastimport-0.11.0/tests/__init__.py 2011-10-06 09:07:09.172162206 +1000
+@@ -10,8 +10,7 @@
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
+ #
+
+ """Tests for bzr-fastimport."""
+diff -ur bzr-fastimport-0.11.0.orig/tests/test_branch_mapper.py bzr-fastimport-0.11.0/tests/test_branch_mapper.py
+--- bzr-fastimport-0.11.0.orig/tests/test_branch_mapper.py 2011-08-23 02:50:16.000000000 +1000
++++ bzr-fastimport-0.11.0/tests/test_branch_mapper.py 2011-10-06 09:10:34.351911641 +1000
+@@ -11,8 +11,7 @@
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ """Test the BranchMapper methods."""
+
+diff -ur bzr-fastimport-0.11.0.orig/tests/test_commands.py bzr-fastimport-0.11.0/tests/test_commands.py
+--- bzr-fastimport-0.11.0.orig/tests/test_commands.py 2011-08-23 02:50:16.000000000 +1000
++++ bzr-fastimport-0.11.0/tests/test_commands.py 2011-10-06 09:10:34.352911664 +1000
+@@ -11,8 +11,7 @@
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ """Test the command implementations."""
+
+diff -ur bzr-fastimport-0.11.0.orig/tests/test_exporter.py bzr-fastimport-0.11.0/tests/test_exporter.py
+--- bzr-fastimport-0.11.0.orig/tests/test_exporter.py 2011-08-23 02:50:16.000000000 +1000
++++ bzr-fastimport-0.11.0/tests/test_exporter.py 2011-10-06 09:10:34.352911664 +1000
+@@ -11,8 +11,7 @@
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ """Test the exporter."""
+
+diff -ur bzr-fastimport-0.11.0.orig/tests/test_generic_processor.py bzr-fastimport-0.11.0/tests/test_generic_processor.py
+--- bzr-fastimport-0.11.0.orig/tests/test_generic_processor.py 2011-08-23 02:50:16.000000000 +1000
++++ bzr-fastimport-0.11.0/tests/test_generic_processor.py 2011-10-06 09:10:34.352911664 +1000
+@@ -11,8 +11,7 @@
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ import time
+
+diff -ur bzr-fastimport-0.11.0.orig/tests/test_revision_store.py bzr-fastimport-0.11.0/tests/test_revision_store.py
+--- bzr-fastimport-0.11.0.orig/tests/test_revision_store.py 2011-08-23 02:50:16.000000000 +1000
++++ bzr-fastimport-0.11.0/tests/test_revision_store.py 2011-10-06 09:07:13.496262300 +1000
+@@ -11,8 +11,7 @@
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ """Direct tests of the revision_store classes."""
+
+diff -ur bzr-fastimport-0.11.0.orig/user_mapper.py bzr-fastimport-0.11.0/user_mapper.py
+--- bzr-fastimport-0.11.0.orig/user_mapper.py 2011-08-23 02:50:16.000000000 +1000
++++ bzr-fastimport-0.11.0/user_mapper.py 2011-10-06 09:10:34.354911710 +1000
+@@ -11,8 +11,7 @@
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ from email import Utils
+
diff --git a/bzr-fastimport.spec b/bzr-fastimport.spec
index 5654f52..46939ff 100644
--- a/bzr-fastimport.spec
+++ b/bzr-fastimport.spec
@@ -1,17 +1,21 @@
Name: bzr-fastimport
-Version: 0.10.0
-Release: 2%{?dist}
+Version: 0.11.0
+Release: 1%{?dist}
Summary: Bzr plugin for fast loading of data from other VCS tools
Group: Development/Languages
# some modules in the exporters/ subdir are MIT-licensed
License: GPLv2+ and MIT
URL: https://launchpad.net/bzr-fastimport
Source0: http://launchpad.net/%{name}/trunk/%{version}/+download/%{name}-%{version}.tar.gz
+# https://bugs.launchpad.net/bzr-fastimport/+bug/868795
Patch0: %{name}-shebang.patch
+# https://bugs.launchpad.net/bzr-fastimport/+bug/868789
+Patch1: %{name}-fsf-address.patch
BuildArch: noarch
BuildRequires: python-setuptools-devel
BuildRequires: bzr
Requires: bzr
+Requires: python-fastimport
%description
Bazaar Fast Import is a plugin providing fast loading of revision control data
@@ -25,26 +29,25 @@ for teams needing a custom migration solution.
%prep
%setup -q
%patch0 -p1 -b .shebang
+%patch1 -p1 -b .fsf-address
%build
%{__python} setup.py build
%install
-rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
chmod 0755 $RPM_BUILD_ROOT%{python_sitelib}/bzrlib/plugins/fastimport/exporters/hg-fast-export.py
chmod 0755 $RPM_BUILD_ROOT%{python_sitelib}/bzrlib/plugins/fastimport/exporters/svn-fast-export.py
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
-%defattr(-,root,root,-)
%doc COPYING.txt NEWS README.txt
%{python_sitelib}/bzr_fastimport-*.egg-info
%{python_sitelib}/bzrlib/plugins/fastimport
%changelog
+* Thu Oct 06 2011 Dan Callaghan <dcallagh at redhat.com> - 0.11.0-1
+- update to 0.11.0
+
* Wed Aug 10 2011 Dan Callaghan <dcallagh at redhat.com> - 0.10.0-2
- use a patch instead of sed for removing erroneous shebangs
diff --git a/sources b/sources
index 35e153d..8908135 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ed9dba180cd73e5fc312bc75c30a56d1 bzr-fastimport-0.10.0.tar.gz
+c3ba588120f346d9f72773e512c8ef34 bzr-fastimport-0.11.0.tar.gz
More information about the scm-commits
mailing list