[Bug 1097100] Re: Please merge bzr 2.6.0~bzr6571-2/experimental

[Andrew Starr-Bochicchio]

** Patch added: "debian->ubuntu.debdiff"
   https://bugs.launchpad.net/ubuntu/+source/bzr/+bug/1097100/+attachment/3476505/+files/debian-%3Eubuntu.debdiff

** Description changed:

  The bzr import from experimental is out of date, so I can't use bzr to
  merge bzr.
  
  bzr (2.6.0~bzr6571-2ubuntu1) raring; urgency=low
  
-   * Merge from experimental Debian. Remaining Ubuntu changes:
-    - Drop build dependencies on python-{meliae,lzma,medusa},
-      which are not in main.
-    - Adjust Vcs field in debian/control for Ubuntu.
+   * Merge from experimental Debian. Remaining Ubuntu changes:
+    - Drop build dependencies on python-{meliae,lzma,medusa},
+      which are not in main.
+    - Adjust Vcs field in debian/control for Ubuntu.
+   * Drop 04_apport_bytesio and 05_tcp_serve_localhost, they are
+     not used in Debian and it seems to build fine without them.
  
   -- Andrew Starr-Bochicchio <a.starr.b at gmail.com>  Mon, 07 Jan 2013
  20:02:12 -0500
  
  bzr (2.6.0~bzr6571-2) experimental; urgency=low
  
-   * Add myself to uploaders.
-   * Fix Vcs-Bzr link and add Vcs-Browser field.
-   * Run wrap-and-sort over the debian/control file and install files.
-   * Bump debian/compat to 9.
-   * Build Sphinx-based docs rather than the plain html ones.
-     The fixes a number of outstanding doc related bugs:
-    - Closes: #670526, #606009
-    - LP: #544149, LP: #1014572, LP: #514609
+   * Add myself to uploaders.
+   * Fix Vcs-Bzr link and add Vcs-Browser field.
+   * Run wrap-and-sort over the debian/control file and install files.
+   * Bump debian/compat to 9.
+   * Build Sphinx-based docs rather than the plain html ones.
+     The fixes a number of outstanding doc related bugs:
+    - Closes: #670526, #606009
+    - LP: #544149, LP: #1014572, LP: #514609
  
-  -- Andrew Starr-Bochicchio <asb at debian.org>  Sun, 06 Jan 2013 19:20:39
+  -- Andrew Starr-Bochicchio <asb at debian.org>  Sun, 06 Jan 2013 19:20:39
  -0500
- 
  
  A "dropped" change that isn't in the changelog is:
  
  Drop 06_new_zlib patch and add build-conflicts for newer versions of
  zlib.
  
  That was actually done in Debian awhile back. It seems as if the line in
  the changelog for the last Ubuntu upload was just cargo-culted.

-- 
You received this bug notification because you are a member of Ubuntu
Foundations Bugs, which is subscribed to bzr in Ubuntu.
https://bugs.launchpad.net/bugs/1097100

Title:
  Please merge bzr 2.6.0~bzr6571-2/experimental

Status in “bzr” package in Ubuntu:
  In Progress

Bug description:
  The bzr import from experimental is out of date, so I can't use bzr to
  merge bzr.

  bzr (2.6.0~bzr6571-2ubuntu1) raring; urgency=low

    * Merge from experimental Debian. Remaining Ubuntu changes:
     - Drop build dependencies on python-{meliae,lzma,medusa},
       which are not in main.
     - Adjust Vcs field in debian/control for Ubuntu.
    * Drop 04_apport_bytesio and 05_tcp_serve_localhost, they are
      not used in Debian and it seems to build fine without them.

   -- Andrew Starr-Bochicchio <a.starr.b at gmail.com>  Mon, 07 Jan 2013
  20:02:12 -0500

  bzr (2.6.0~bzr6571-2) experimental; urgency=low

    * Add myself to uploaders.
    * Fix Vcs-Bzr link and add Vcs-Browser field.
    * Run wrap-and-sort over the debian/control file and install files.
    * Bump debian/compat to 9.
    * Build Sphinx-based docs rather than the plain html ones.
      The fixes a number of outstanding doc related bugs:
     - Closes: #670526, #606009
     - LP: #544149, LP: #1014572, LP: #514609

   -- Andrew Starr-Bochicchio <asb at debian.org>  Sun, 06 Jan 2013
  19:20:39 -0500

  A "dropped" change that isn't in the changelog is:

  Drop 06_new_zlib patch and add build-conflicts for newer versions of
  zlib.

  That was actually done in Debian awhile back. It seems as if the line
  in the changelog for the last Ubuntu upload was just cargo-culted.

To manage notifications about this bug go to:
https://bugs.launchpad.net/ubuntu/+source/bzr/+bug/1097100/+subscriptions