~ubuntu-branches/ubuntu/precise/mercurial/precise-updates

« back to all changes in this revision

Viewing changes to debian/patches/deb_specific__install-mo-fhs.patch

  • Committer: Bazaar Package Importer
  • Author(s): Vincent Danjean, Javi Merino, Vincent Danjean
  • Date: 2010-07-04 09:55:28 UTC
  • mfrom: (1.2.12 upstream)
  • Revision ID: james.westby@ubuntu.com-20100704095528-bzag1mhfylss9zth
Tags: 1.6-1
[ Javi Merino ]
* New upstream release (1.6). Many bug fixes and improvements. Among
    them:
  - push: break infinite http recursion bug with Python 2.6.5
       (issue2179 and issue2255) (Closes: #586907)
  - zeroconf: Don't use string exceptions (Closes: #585250)
* Removed patch for_upstream__bashism_in_examples.patch since a fix for
    #581122 is included upstream.
* Updated Standards-Version to 3.9 (no change needed)

[ Vincent Danjean ]
* debian/control:
  + Use Breaks instead of Conflicts
  + Use a fixed version in Replaces
    I put 1.4 but it has been a long time since nothing has been moved
    from mercurial to mercurial-common

Show diffs side-by-side

added added

removed removed

Lines of Context:
12
12
         break
13
13
--- a/setup.py
14
14
+++ b/setup.py
15
 
@@ -263,7 +263,7 @@
16
 
                                      ['hgext/inotify/linux/_inotify.c']))
 
15
@@ -280,7 +280,7 @@
 
16
         extmodules.append(inotify)
17
17
         packages.extend(['hgext.inotify', 'hgext.inotify.linux'])
18
18
 
19
19
-packagedata = {'mercurial': ['locale/*/LC_MESSAGES/hg.mo']}