[python-debian/master] Change examples and control file to refer to debian instead of deban_bundle
John Wright
jsw at debian.org
Tue Mar 16 02:00:07 UTC 2010
---
README.changelog | 4 ++--
debian/changelog | 2 ++
debian/control | 8 ++++----
examples/changelog/changelog_to_file | 2 +-
examples/changelog/simple_changelog | 2 +-
examples/deb822/depgraph | 2 +-
examples/deb822/grep-maintainer | 2 +-
examples/deb822/grep_native_packages.py | 2 +-
examples/deb822/render-dctrl | 2 +-
examples/debfile/ar | 2 +-
examples/debfile/changelog_head | 2 +-
examples/debfile/dpkg-info | 2 +-
examples/debfile/extract_cron | 2 +-
examples/debtags/pkgwalk | 2 +-
examples/debtags/reverse | 2 +-
examples/debtags/smartsearch | 2 +-
examples/debtags/tagminer | 2 +-
examples/debtags/tagsbyrelevance | 2 +-
examples/debtags/wxssearch | 2 +-
lib/debian/deprecation.py | 2 +-
20 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/README.changelog b/README.changelog
index d745f8c..b8f1caf 100644
--- a/README.changelog
+++ b/README.changelog
@@ -1,5 +1,5 @@
-README for debian_bundle.changelog
-----------------------------------
+README for debian.changelog
+---------------------------
The aim of this module is to provide programmatic access to Debian changelogs
to query and manipulate them.
diff --git a/debian/changelog b/debian/changelog
index 79b460a..62af05f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ python-debian (0.1.16) UNRELEASED; urgency=low
available (Closes: #573934)
* Use the warnings system to report deprecation warnings
(Closes: #573945)
+ * Change examples and control file to refer to debian instead of
+ deban_bundle
-- John Wright <jsw at debian.org> Sun, 14 Mar 2010 05:31:54 -0600
diff --git a/debian/control b/debian/control
index d4aec87..3315ae7 100644
--- a/debian/control
+++ b/debian/control
@@ -25,12 +25,12 @@ Replaces: python-deb822
Description: Python modules to work with Debian-related data formats
This package provides Python modules that abstract many formats of Debian
related files. Currently handled are:
- * Debtags information (debian_bundle.debtags module)
- * debian/changelog (debian_bundle.changelog module)
- * Packages files, pdiffs (debian_bundle.debian_support module)
+ * Debtags information (debian.debtags module)
+ * debian/changelog (debian.changelog module)
+ * Packages files, pdiffs (debian.debian_support module)
* Control files of single or multiple RFC822-style paragraphs, e.g.
debian/control, .changes, .dsc, Packages, Sources, Release, etc.
- (debian_bundle.deb822 module)
+ (debian.deb822 module)
* Raw .deb and .ar files, with (read-only) access to contained
files and meta-information
diff --git a/examples/changelog/changelog_to_file b/examples/changelog/changelog_to_file
index 640027d..03ab4a9 100755
--- a/examples/changelog/changelog_to_file
+++ b/examples/changelog/changelog_to_file
@@ -16,7 +16,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-from debian_bundle.changelog import Changelog, Version
+from debian.changelog import Changelog, Version
import sys
changelog = Changelog()
diff --git a/examples/changelog/simple_changelog b/examples/changelog/simple_changelog
index 1d5b0ff..86de0f7 100755
--- a/examples/changelog/simple_changelog
+++ b/examples/changelog/simple_changelog
@@ -16,7 +16,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-from debian_bundle.changelog import Changelog, Version
+from debian.changelog import Changelog, Version
changelog = Changelog()
diff --git a/examples/deb822/depgraph b/examples/deb822/depgraph
index 150662c..d2b6782 100755
--- a/examples/deb822/depgraph
+++ b/examples/deb822/depgraph
@@ -17,7 +17,7 @@ graphviz graph suitable to be processed by dot (for an unstable/main Packages
file, generating the final graph will take a while ...)."""
import sys
-from debian_bundle import deb822
+from debian import deb822
__fresh_id = 0
diff --git a/examples/deb822/grep-maintainer b/examples/deb822/grep-maintainer
index 44316c4..24f2f84 100755
--- a/examples/deb822/grep-maintainer
+++ b/examples/deb822/grep-maintainer
@@ -12,7 +12,7 @@
import re
import sys
-from debian_bundle import deb822
+from debian import deb822
try:
maint_RE = re.compile(sys.argv[1])
diff --git a/examples/deb822/grep_native_packages.py b/examples/deb822/grep_native_packages.py
index 46b2799..ab8c5cc 100755
--- a/examples/deb822/grep_native_packages.py
+++ b/examples/deb822/grep_native_packages.py
@@ -10,7 +10,7 @@
import sys
-from debian_bundle import deb822
+from debian import deb822
for fname in sys.argv[1:]:
f = file(fname)
diff --git a/examples/deb822/render-dctrl b/examples/deb822/render-dctrl
index 3d17467..081bd4e 100755
--- a/examples/deb822/render-dctrl
+++ b/examples/deb822/render-dctrl
@@ -24,7 +24,7 @@ Warning: beware of #525525 and thus avoid using "-s Description" alone."""
import re
import string
import sys
-from debian_bundle import deb822
+from debian import deb822
from markdown import markdown
from optparse import OptionParser
diff --git a/examples/debfile/ar b/examples/debfile/ar
index 3d8e952..ee99140 100755
--- a/examples/debfile/ar
+++ b/examples/debfile/ar
@@ -19,7 +19,7 @@
import os
import sys
-from debian_bundle import arfile
+from debian import arfile
if __name__ == '__main__':
if len(sys.argv) < 3:
diff --git a/examples/debfile/changelog_head b/examples/debfile/changelog_head
index 90ce4e4..4410f1c 100755
--- a/examples/debfile/changelog_head
+++ b/examples/debfile/changelog_head
@@ -14,7 +14,7 @@ shipped in a .deb file."""
import string
import sys
-from debian_bundle import debfile
+from debian import debfile
if __name__ == '__main__':
if len(sys.argv) > 3 or len(sys.argv) < 2:
diff --git a/examples/debfile/dpkg-info b/examples/debfile/dpkg-info
index 054e431..b060bf4 100755
--- a/examples/debfile/dpkg-info
+++ b/examples/debfile/dpkg-info
@@ -17,7 +17,7 @@ import stat
import string
import sys
-from debian_bundle import debfile
+from debian import debfile
if __name__ == '__main__':
if len(sys.argv) != 2:
diff --git a/examples/debfile/extract_cron b/examples/debfile/extract_cron
index 837616c..2de005b 100755
--- a/examples/debfile/extract_cron
+++ b/examples/debfile/extract_cron
@@ -14,7 +14,7 @@ import os
import re
import sys
-from debian_bundle import debfile
+from debian import debfile
def is_cron(fname):
return re.match(r'^etc/cron\.(d|daily|hourly|monthly|weekly)\b', fname)
diff --git a/examples/debtags/pkgwalk b/examples/debtags/pkgwalk
index c8900b2..ed02aa4 100755
--- a/examples/debtags/pkgwalk
+++ b/examples/debtags/pkgwalk
@@ -12,7 +12,7 @@
import sys
# Requires python-extractor, python-magic and python-debtags
-from debian_bundle import debtags
+from debian import debtags
import re
from optparse import OptionParser
import apt
diff --git a/examples/debtags/reverse b/examples/debtags/reverse
index b3b8144..b741f81 100755
--- a/examples/debtags/reverse
+++ b/examples/debtags/reverse
@@ -19,7 +19,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
import sys
-from debian_bundle import debtags
+from debian import debtags
input = sys.stdin
if len(sys.argv) > 1:
diff --git a/examples/debtags/smartsearch b/examples/debtags/smartsearch
index 62581d2..ec298cf 100755
--- a/examples/debtags/smartsearch
+++ b/examples/debtags/smartsearch
@@ -21,7 +21,7 @@
import sys
import re
import subprocess
-from debian_bundle import debtags
+from debian import debtags
import apt
class SmartSearcher:
diff --git a/examples/debtags/tagminer b/examples/debtags/tagminer
index c34f30e..ced2876 100755
--- a/examples/debtags/tagminer
+++ b/examples/debtags/tagminer
@@ -14,7 +14,7 @@ import sys
# Requires python-extractor, python-magic and python-debtags
import extractor
import magic
-from debian_bundle import debtags
+from debian import debtags
import re
from optparse import OptionParser
import apt
diff --git a/examples/debtags/tagsbyrelevance b/examples/debtags/tagsbyrelevance
index 3757506..2633c12 100644
--- a/examples/debtags/tagsbyrelevance
+++ b/examples/debtags/tagsbyrelevance
@@ -20,7 +20,7 @@
import sys
import re
-from debian_bundle import debtags
+from debian import debtags
if len(sys.argv) < 2:
print sys.stderr, "Usage: %s tagdb [packagelist]" % (sys.argv[0])
diff --git a/examples/debtags/wxssearch b/examples/debtags/wxssearch
index e1a7af1..4fb3c4c 100755
--- a/examples/debtags/wxssearch
+++ b/examples/debtags/wxssearch
@@ -24,7 +24,7 @@ import wx.lib.dialogs
import sys
import re
import subprocess
-from debian_bundle import debtags
+from debian import debtags
import apt
from optparse import OptionParser
diff --git a/lib/debian/deprecation.py b/lib/debian/deprecation.py
index 6ed7e5a..b9e4c09 100644
--- a/lib/debian/deprecation.py
+++ b/lib/debian/deprecation.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- vim: fileencoding=utf-8 :
#
-# debian_bundle/deprecation.py
+# debian/deprecation.py
# Utility module to deprecate features
#
# Copyright © Ben Finney <ben+debian at benfinney.id.au>
--
1.6.3.3
More information about the pkg-python-debian-commits
mailing list