Package: bzrtools
Version: 0.8.1-1
Severity: normal
Tags: patch
Hi,
Attached is the diff for my bzrtools 0.8.1-1.1 NMU, uploaded according
to the Low Threshold NMU rules (thanks).
Cheers,
--
Adeodato Simó dato at net.com.org.es
Debian Developer adeodato at debian.org
I try to keep an open mind, but not so open that my brains fall out.
diff -u bzrtools-0.8.1/debian/changelog bzrtools-0.8.1/debian/changelog
--- bzrtools-0.8.1/debian/changelog
+++ bzrtools-0.8.1/debian/changelog
@@ -1,3 +1,12 @@
+bzrtools (0.8.1-1.1) unstable; urgency=low
+
+ * Low threshold NMU.
+ * Add patch to make bzrtools 0.8 not use DEFAULT_IGNORE, which is deprecated
+ in bzr 0.9 (now in the archive), and made bzr print a couple warnings in
+ every operation.
+
+ -- Adeodato Simó <[EMAIL PROTECTED]> Wed, 9 Aug 2006 18:24:30 +0200
+
bzrtools (0.8.1-1) unstable; urgency=low
* New upstream release. Thanks Arnaud (Closes: #368201)
only in patch2:
unchanged:
--- bzrtools-0.8.1.orig/__init__.py
+++ bzrtools-0.8.1/__init__.py
@@ -15,11 +15,21 @@
from bzrlib.errors import BzrCommandError
sys.path.insert(0, os.path.realpath(os.path.join(os.path.dirname(__file__),
"external")))
-from bzrlib import DEFAULT_IGNORE
-
-DEFAULT_IGNORE.append('./.shelf')
-DEFAULT_IGNORE.append('./.bzr-shelf*')
+try:
+ import bzrlib.ignores
+except ImportError:
+ # Bzr 0.8 we had to modify the DEFAULT_IGNORE list to
+ # auto ignore certain files
+ from bzrlib import DEFAULT_IGNORE
+ DEFAULT_IGNORE.append('./.shelf')
+ DEFAULT_IGNORE.append('./.bzr-shelf*')
+else:
+ # bzr 0.9 introduced add_runtime_ignores as a more explicit method
+ # of ignoring certain files
+ _add_runtime_ignores = getattr(bzrlib.ignores, 'add_runtime_ignores', None)
+ if _add_runtime_ignores:
+ _add_runtime_ignores(['./.shelf', './.bzr-shelf*'])
Option.OPTIONS['ignored'] = Option('ignored',
