diff -Nru /tmp/xBdyDJU69y/bzr-builddeb-0.90ubuntu1/debian/changelog /tmp/EqMmp9gaB0/bzr-builddeb-0.90ubuntu2/debian/changelog --- /tmp/xBdyDJU69y/bzr-builddeb-0.90ubuntu1/debian/changelog 2007-09-08 23:16:00.000000000 +0200 +++ /tmp/EqMmp9gaB0/bzr-builddeb-0.90ubuntu2/debian/changelog 2007-10-23 02:18:41.000000000 +0200 @@ -1,3 +1,13 @@ +bzr-builddeb (0.90ubuntu2) hardy; urgency=low + + * Fix import-dsc for .dsc files. (LP: #156029) + * Fix path to documentation in README. (LP: #145019) + * Fix typos in doc, link to mode pages from configuration and minor polishing. + * Modify Maintainer value to match the DebianMaintainerField + specification. + + -- dAniel hAhler Tue, 23 Oct 2007 02:18:08 +0200 + bzr-builddeb (0.90ubuntu1) gutsy; urgency=low * upload to gutsy. Verified it still works with bzr 0.18 diff -Nru /tmp/xBdyDJU69y/bzr-builddeb-0.90ubuntu1/debian/control /tmp/EqMmp9gaB0/bzr-builddeb-0.90ubuntu2/debian/control --- /tmp/xBdyDJU69y/bzr-builddeb-0.90ubuntu1/debian/control 2007-08-27 15:00:52.000000000 +0200 +++ /tmp/EqMmp9gaB0/bzr-builddeb-0.90ubuntu2/debian/control 2007-10-22 22:09:29.000000000 +0200 @@ -1,7 +1,8 @@ Source: bzr-builddeb Section: devel Priority: optional -Maintainer: Debian Bazaar Maintainers +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian Bazaar Maintainers Uploaders: Reinhard Tartler , James Westby Build-Depends: debhelper (>= 5.0.37.2), python-all-dev (>= 2.3.5-11) Build-Depends-Indep: bzr (>= 0.18~), python-central (>= 0.5.8), python-docutils, python-debian (>= 0.1.4), bzrtools (>= 0.18), patchutils diff -Nru /tmp/xBdyDJU69y/bzr-builddeb-0.90ubuntu1/doc/user_manual/building.rst /tmp/EqMmp9gaB0/bzr-builddeb-0.90ubuntu2/doc/user_manual/building.rst --- /tmp/xBdyDJU69y/bzr-builddeb-0.90ubuntu1/doc/user_manual/building.rst 2007-08-27 15:00:52.000000000 +0200 +++ /tmp/EqMmp9gaB0/bzr-builddeb-0.90ubuntu2/doc/user_manual/building.rst 2007-10-22 23:50:18.000000000 +0200 @@ -18,7 +18,7 @@ By default it uses ``dpkg-buildpackage -uc -us -rfakeroot`` to build the package. If you would prefer to use something else then you can use the -``--builder`` option to control this. For instance to build in a chroot +``--builder`` option to control this. For instance to build in a pbuilder you can run :: @@ -32,7 +32,7 @@ .. _Configuration Files: configuration.html If you have some changes to the package that you would like to test before -commiting then you can use the ``-w`` option to ``builddeb`` which tells the +committing then you can use the ``-w`` option to ``builddeb`` which tells the plugin to build the working tree, rather than the latest version committed to the branch @@ -52,7 +52,7 @@ $ bzr builddeb --quick -Uses the quick-builder. This command defaults to ``fakeroot debian/rules +uses the quick-builder. This command defaults to ``fakeroot debian/rules binary``, but you can set the ``quick-builder`` option in a configuration file if you wish to customise it. diff -Nru /tmp/xBdyDJU69y/bzr-builddeb-0.90ubuntu1/doc/user_manual/configuration.rst /tmp/EqMmp9gaB0/bzr-builddeb-0.90ubuntu2/doc/user_manual/configuration.rst --- /tmp/xBdyDJU69y/bzr-builddeb-0.90ubuntu1/doc/user_manual/configuration.rst 2007-08-27 15:00:52.000000000 +0200 +++ /tmp/EqMmp9gaB0/bzr-builddeb-0.90ubuntu2/doc/user_manual/configuration.rst 2007-10-22 23:59:56.000000000 +0200 @@ -29,7 +29,7 @@ The following options are read from the configuration files. Most can also be used as command line arguments by prepending ``--`` to the names and not using -the ``\=`` symbol. There are a few exceptions to this that are noted in the +the ``=`` symbol. There are a few exceptions to this that are noted in the descriptions. Directories @@ -57,18 +57,19 @@ These change the way in which the plugin operates. They can be set depending on the type of package you are building. +If none of these are set, `normal mode`_ is used. * ``merge = True`` - Turns on merge mode. This is where only the ``debian/`` directory is - versioned. It uses and ``orig.tar.gz`` for the upstream and combines the + Turns on `merge mode`_. This is where only the ``debian/`` directory is + versioned. It uses ``orig.tar.gz`` for the upstream and combines the two before building. It works with both the ``debian/`` directory in the branch, or the contents of ``debian/`` (e.g. ``rules``, ``control``) directly in the top level directory of the branch. (Defaults to ``False``). * ``native = True`` - If you want to build a native package from a branch then turn on this + If you want to build a `native package`_ from a branch then turn on this option. It will stop the plugin from looking for an ``orig.tar.gz`` and build a native package instead. This has no effect if merge mode is on, as I don't think it makes any sense to version the ``debian/`` separately @@ -79,11 +80,11 @@ This takes a package from a branch that includes both the upstream source and the ``debian/`` dir and creates a non-native package from it by creating an ``orig.tar.gz`` from the code outside of ``debian/``. This - is probably most useful if you are bot upstream and Debian maintainer + is probably most useful if you are both upstream and Debian maintainer of a non-native package. This has no effect if ``merge`` or ``native`` are true, the former is for use when you don't version the full source, the second for when you don't need an ``orig.tar.gz`` so they make no sense - to be used together. + to be used together. See `split mode`_. * ``export-upstream = path`` @@ -91,7 +92,13 @@ the upstream code. If this is set then the plugin will export the code from that branch to create the ``.orig.tar.gz``. This option only has any effect if ``merge`` is set, and causes any ``orig-dir`` setting to be - ignored. + ignored. See `Export-upstream mode`_. + +.. _normal mode: normal.html +.. _merge mode: merge.html +.. _native package: native.html +.. _split mode: split.html +.. _Export-upstream mode: export_upstream.html Interaction with an upstream branch ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -114,7 +121,7 @@ local branch before exporting it. It is your responsibility to setup the default pull location for the branch. It probably doesn't make too much sense to use this option with the ``export-upstream-revision`` one - as this will change the tip, but then wont use it. However this is allowed. + as this will change the tip, but then won't use it. However this is allowed. This option only has an effect if ``export-upstream`` is set. Also note that this option cannot be used when ``export-upstream`` is set to a remote branch. [Not a command line option.] @@ -135,22 +142,22 @@ * ``builder = command`` - The command to use to build the package. Defaults to ``dpkg-buildpackage - -rfakeroot -uc -us``). Will only be read from the file in your home + The command to use to build the package. (Defaults to ``dpkg-buildpackage + -rfakeroot -uc -us``). Will only be read from the config file in your home directory. * ``quick-builder = command`` The command used to build the package if the ``--quick`` option is used. (Defaults to ``fakeroot debian/rules binary``). Will only be read from - the file in your home directory. + the config file in your home directory. * ``source-builder = command`` The command used to build a source package if the ``--short`` or ``-S`` options are used. Overriden if ``--builder`` or ``--quick`` are given on the command line. (Defaults to ``dpkg-buildpackage -rfakeroot -uc -us - -S``). Will only be read from the file in your home directory. + -S``). Will only be read from the config file in your home directory. Others ^^^^^^ @@ -170,5 +177,5 @@ ``~/.bazaar/builddeb.conf``. They can override it for the package if they want (e.g. they have a different location for upstream tarballs of a package if they are involved with upstream as well, so they set ``orig_dir = -/home/.../releases/``), this can be done in ``.bzr-builddeb/local.conf``). +/home/.../releases/``), this can be done in ``.bzr-builddeb/local.conf``. diff -Nru /tmp/xBdyDJU69y/bzr-builddeb-0.90ubuntu1/doc/user_manual/export_upstream.rst /tmp/EqMmp9gaB0/bzr-builddeb-0.90ubuntu2/doc/user_manual/export_upstream.rst --- /tmp/xBdyDJU69y/bzr-builddeb-0.90ubuntu1/doc/user_manual/export_upstream.rst 2007-08-27 15:00:52.000000000 +0200 +++ /tmp/EqMmp9gaB0/bzr-builddeb-0.90ubuntu2/doc/user_manual/export_upstream.rst 2007-10-22 23:07:14.000000000 +0200 @@ -39,7 +39,7 @@ you need to set is the ``export-upstream`` value. When this value is given then it enables export-upstream mode. The value that you set for this should be the URI of the branch that you wish to build against. This can be any URI -or path, as you would use for ``bzr branch`` say. The second value to set is +or path, as you would use for ``bzr branch``. The second value to set is ``export-upstream-revision``. This is the revision of the upstream branch that you would like to build the package against. It can be specified in any format that can be passed to a ``--r`` argument to a Bazaar command. This @@ -75,7 +75,7 @@ To update to a new upstream version you need to do three things. The first of these is to tell `bzr-builddeb` to build against the new version of the -upstream code. To do this edit ``.bzr-builddeb/default.con`` and set +upstream code. To do this edit ``.bzr-builddeb/default.conf`` and set ``export-upstream-revision`` to the revision of the new version of the code that you want to build. @@ -83,10 +83,10 @@ ``dch`` tool from ``devscripts`` can help you here, to update to version ``0.2`` you can run:: - $ dch -v 0.2-1 + $ dch -v 0.2 The last step is to adapt the packaging to any changes in the upstream code. -There are some comments in the documentation of ``merge mode`` about doing +There are some comments in the documentation of `merge mode`_ about doing this that also apply here. .. _merge mode: merge.html diff -Nru /tmp/xBdyDJU69y/bzr-builddeb-0.90ubuntu1/doc/user_manual/merge.rst /tmp/EqMmp9gaB0/bzr-builddeb-0.90ubuntu2/doc/user_manual/merge.rst --- /tmp/xBdyDJU69y/bzr-builddeb-0.90ubuntu1/doc/user_manual/merge.rst 2007-08-27 15:00:52.000000000 +0200 +++ /tmp/EqMmp9gaB0/bzr-builddeb-0.90ubuntu2/doc/user_manual/merge.rst 2007-10-22 22:57:28.000000000 +0200 @@ -96,7 +96,7 @@ .. _Configuration Files: configuration.html -One the tarballs are in place then you are ready to build the package. See +Once the tarballs are in place then you are ready to build the package. See the `Building the package`_ section for more details on this. .. _Building the package: building.html @@ -122,7 +122,7 @@ The last step is to update the packaging. The first part of this is changing any files to reflect changes in the upstream build, for instance updating ``debian/rules``, or ``debian/install``. The last part is updating any -patches that have against the upstream code to work against the latest +patches against the upstream code to work against the latest version. This is currently quite troublesome, as you need an unpacked source to apply them against. The easiest way to do this is to use the ``--export`` option of ``builddeb`` to get the unpacked source:: diff -Nru /tmp/xBdyDJU69y/bzr-builddeb-0.90ubuntu1/doc/user_manual/native.rst /tmp/EqMmp9gaB0/bzr-builddeb-0.90ubuntu2/doc/user_manual/native.rst --- /tmp/xBdyDJU69y/bzr-builddeb-0.90ubuntu1/doc/user_manual/native.rst 2007-08-27 15:00:52.000000000 +0200 +++ /tmp/EqMmp9gaB0/bzr-builddeb-0.90ubuntu2/doc/user_manual/native.rst 2007-10-22 22:29:15.000000000 +0200 @@ -4,7 +4,7 @@ Native mode is, unsurprisingly, the mode used for maintaining a native package. The main difference to normal mode is that an upstream tarball is not needed. The consequence of this is that most operations, such as -importing a new upstream are not needed. +importing a new upstream release are not needed. Setting up the package ###################### diff -Nru /tmp/xBdyDJU69y/bzr-builddeb-0.90ubuntu1/doc/user_manual/normal.rst /tmp/EqMmp9gaB0/bzr-builddeb-0.90ubuntu2/doc/user_manual/normal.rst --- /tmp/xBdyDJU69y/bzr-builddeb-0.90ubuntu1/doc/user_manual/normal.rst 2007-08-27 15:00:52.000000000 +0200 +++ /tmp/EqMmp9gaB0/bzr-builddeb-0.90ubuntu2/doc/user_manual/normal.rst 2007-10-22 22:26:11.000000000 +0200 @@ -79,7 +79,7 @@ upstream tarball is named ``scruff-0.1.tar.gz`` and the version number is ``0.1``. As there is not code in the branch yet the plugin does not know what package you are creating. So you must also supply the package name -usinf the ``--package`` option. This means that once you have downloaded +using the ``--package`` option. This means that once you have downloaded the tarball you should run:: $ cd scruff/ @@ -213,7 +213,7 @@ #################### When a new upstream version is released then the package needs to be updated -to deal use the new code. To do this, first the new upstream version is +to use the new code. To do this, first the new upstream version is imported on top of the last one, as it is a direct descendant of it. Then your current packaging changes are merged in to the new version, which may cause conflicts that need to be resolved. diff -Nru /tmp/xBdyDJU69y/bzr-builddeb-0.90ubuntu1/doc/user_manual/split.rst /tmp/EqMmp9gaB0/bzr-builddeb-0.90ubuntu2/doc/user_manual/split.rst --- /tmp/xBdyDJU69y/bzr-builddeb-0.90ubuntu1/doc/user_manual/split.rst 2007-08-27 15:00:52.000000000 +0200 +++ /tmp/EqMmp9gaB0/bzr-builddeb-0.90ubuntu2/doc/user_manual/split.rst 2007-10-22 23:27:44.000000000 +0200 @@ -2,29 +2,30 @@ ---------- Split mode is quite a specialised mode. It is for people who are both the -upstream author and maintainer of a package. It allows you to maintiain both +upstream author and maintainer of a package. It allows you to maintain both in a single branch, but have a separation during the build, and not have to create the upstream tarball by hand. -.. _normal mode: normal.html -.. _export-upstream mode: export_upstream.html - Some people like this way of working, but it does make it harder for someone -else to take over maintainance of the package at a later date. +else to take over maintenance of the package at a later date. This mode should not be used by those who are not the upstream author of a package, and who are not making the upstream tarball releases. This mode is a mixture of most of the other modes. You have the upstream -code and the packaging in the same branch like normal mode and native mode, -but the only packaging changes can be in the ``debian/`` directory, like -merge mode. It also saves you having to manually create an upstream tarball, -like export-upstream mode. +code and the packaging in the same branch like `normal mode`_ and +`native mode`_, but the only packaging changes can be in the ``debian/`` +directory, like merge mode. It also saves you having to manually create +an upstream tarball, like `export-upstream mode`_. + +.. _normal mode: normal.html +.. _native mode: native.html +.. _export-upstream mode: export_upstream.html Setting up the package ###################### -Before creating the package you it may be beneficial to set up a shared +Before creating the package it may be beneficial to set up a shared repository for the package. Shared in this context means shared between your branches, rather than shared between users in a public location, the latter can be done later. To set up a repository then you should run (for a package diff -Nru /tmp/xBdyDJU69y/bzr-builddeb-0.90ubuntu1/doc/user_manual/upstream_tarballs.rst /tmp/EqMmp9gaB0/bzr-builddeb-0.90ubuntu2/doc/user_manual/upstream_tarballs.rst --- /tmp/xBdyDJU69y/bzr-builddeb-0.90ubuntu1/doc/user_manual/upstream_tarballs.rst 2007-08-27 15:00:52.000000000 +0200 +++ /tmp/EqMmp9gaB0/bzr-builddeb-0.90ubuntu2/doc/user_manual/upstream_tarballs.rst 2007-10-22 23:54:55.000000000 +0200 @@ -2,10 +2,10 @@ ----------------- When you are building a version of a package that uses a version of the -upstream package that you have not used in a build before the upstream +upstream package that you have not used in a build yet, the upstream tarball for that version needs to be fetched from somewhere. It can be tedious to track the correct file down, download it and rename or repack it -to have the correct name and be in the correct format. +to have the correct name and format. To ease this step a bit the plugin will use ``uscan`` from the ``devscripts`` package to obtain the file for you if it needs it and your diff -Nru /tmp/xBdyDJU69y/bzr-builddeb-0.90ubuntu1/doc/user_manual/user_manual.css /tmp/EqMmp9gaB0/bzr-builddeb-0.90ubuntu2/doc/user_manual/user_manual.css --- /tmp/xBdyDJU69y/bzr-builddeb-0.90ubuntu1/doc/user_manual/user_manual.css 2007-08-27 15:00:52.000000000 +0200 +++ /tmp/EqMmp9gaB0/bzr-builddeb-0.90ubuntu2/doc/user_manual/user_manual.css 2007-10-22 23:48:04.000000000 +0200 @@ -48,6 +48,10 @@ color: #000088; } +a:visited { + color: #23335e; +} + a:hover { text-decoration: underline; color: black; diff -Nru /tmp/xBdyDJU69y/bzr-builddeb-0.90ubuntu1/__init__.py /tmp/EqMmp9gaB0/bzr-builddeb-0.90ubuntu2/__init__.py --- /tmp/xBdyDJU69y/bzr-builddeb-0.90ubuntu1/__init__.py 2007-08-27 15:00:52.000000000 +0200 +++ /tmp/EqMmp9gaB0/bzr-builddeb-0.90ubuntu2/__init__.py 2007-10-23 02:21:09.000000000 +0200 @@ -427,7 +427,7 @@ if to is None: raise BzrCommandError("You must specify the name of the " "destination branch using the --to option.") - importer = DscImporter(files) + importer = DscImporter(files_list) else: if to is None: to = snapshot diff -Nru /tmp/xBdyDJU69y/bzr-builddeb-0.90ubuntu1/README /tmp/EqMmp9gaB0/bzr-builddeb-0.90ubuntu2/README --- /tmp/xBdyDJU69y/bzr-builddeb-0.90ubuntu1/README 2007-08-27 15:00:52.000000000 +0200 +++ /tmp/EqMmp9gaB0/bzr-builddeb-0.90ubuntu2/README 2007-10-22 22:07:36.000000000 +0200 @@ -11,7 +11,7 @@ .. _Debian: http://www.debian.org/ Note that there is a user manual available at -/usr/share/doc/bzr-builddeb/docs/user_manual/index.html that gives more +/usr/share/doc/bzr-builddeb/user_manual/index.html that gives more information than this file. Installation