The branch, master has been updated
       via  597094b43207d4a76208da893b800603286ca150 (commit)
       via  975416504dacd76d7a5590063e641192e628e390 (commit)
      from  41bdec272a6b570e6ab20033c9605bad19a5968f (commit)


- Shortlog ------------------------------------------------------------
597094b Make sure dpkg-dev 1.14.13 and 1.14.14 are upgraded together with dpkg
9754165 Add dpkg-gensymbols in the usertags

Summary of changes:
 ChangeLog        |    7 +++++++
 debian/changelog |    2 ++
 debian/control   |    1 +
 debian/usertags  |    2 ++
 4 files changed, 12 insertions(+), 0 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 597094b43207d4a76208da893b800603286ca150
Author: Raphael Hertzog <[EMAIL PROTECTED]>
Date:   Thu Jan 10 23:15:25 2008 +0100

    Make sure dpkg-dev 1.14.13 and 1.14.14 are upgraded together with dpkg
    
    * debian/control: Add a "Breaks: dpkg-dev (= 1.14.13),
    dpkg-dev (= 1.14.14)" on dpkg to force upgrade of those dpkg-dev
    versions that would break with the move of the compression related
    variables from Dpkg.pm into Dpkg/Compression.pm.

diff --git a/ChangeLog b/ChangeLog
index 0f1178b..c9d2623 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-10  Raphael Hertzog  <[EMAIL PROTECTED]>
+
+       * debian/control: Add a "Breaks: dpkg-dev (= 1.14.13),
+       dpkg-dev (= 1.14.14)" on dpkg to force upgrade of those dpkg-dev
+       versions that would break with the move of the compression related
+       variables from Dpkg.pm into Dpkg/Compression.pm.
+
 2008-01-08  Raphael Hertzog  <[EMAIL PROTECTED]>
 
        * scripts/Dpkg/Version.pm: Import missing error function from
diff --git a/debian/changelog b/debian/changelog
index 11a1c74..5403deb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,8 @@ dpkg (1.14.16) UNRELEASED; urgency=low
     been removed.
   * The code to parse debian/control is available in a perl module
     Dpkg::Control. Closes: #26554
+  * Temporarily add a Breaks: dpkg-dev (= 1.14.13), dpkg-dev (= 1.14.14) on
+    dpkg for the convenience of sid users. Closes: #459815
 
   [ Updated manpages translations ]
   * Fix typo in French. Closes: #460021
diff --git a/debian/control b/debian/control
index 9ff6986..8c42644 100644
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,7 @@ Package: dpkg
 Architecture: any
 Essential: yes
 Pre-Depends: ${shlibs:Depends}, coreutils (>= 5.93-1)
+Breaks: dpkg-dev (= 1.14.13), dpkg-dev (= 1.14.14)
 Conflicts: sysvinit (<< 2.82-1), dpkg-iasearch (<< 0.11), dpkg-static,
  dpkg-dev (<< 1.14.6)
 Replaces: dpkg-doc-ja, dpkg-static, manpages-de (<= 0.4-3),

commit 975416504dacd76d7a5590063e641192e628e390
Author: Raphael Hertzog <[EMAIL PROTECTED]>
Date:   Thu Jan 10 23:09:45 2008 +0100

    Add dpkg-gensymbols in the usertags

diff --git a/debian/usertags b/debian/usertags
index 66c7134..5738959 100644
--- a/debian/usertags
+++ b/debian/usertags
@@ -63,6 +63,7 @@ dpkg-distaddfile      [DPKG-DISTADDFILE]
 dpkg-divert            [DPKG-DIVERT]
 dpkg-genchanges                [DPKG-GENCHANGES]
 dpkg-gencontrol                [DPKG-GENCONTROL]
+dpkg-gensymbols                [DPKG-GENCSYMBOLS]
 dpkg-name              [DPKG-NAME]
 dpkg-parsechangelog    [DPKG-PARSECHANGELOG]
 dpkg-query             [DPKG-QUERY]
@@ -101,6 +102,7 @@ usercategory dpkg-program
   + dpkg-divert [tag=dpkg-divert]
   + dpkg-genchanges [tag=dpkg-genchanges]
   + dpkg-gencontrol [tag=dpkg-gencontrol]
+  + dpkg-gensymbols [tag=dpkg-gensymbols]
   + dpkg-name [tag=dpkg-name]
   + dpkg-parsechangelog [tag=dpkg-parsechangelog]
   + dpkg-query [tag=dpkg-query]

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to