The branch, master has been updated
       via  45a49dd9c087d88378ff56666a503d3ddec00aab (commit)
       via  0fade120552f6b5c9d5f979e84360884ce615f1e (commit)
      from  f4d3e5971e7095865f6a41c2cbabf63ac818bce8 (commit)


- Shortlog ------------------------------------------------------------
45a49dd dpkg-buildpackage: Fix typo in usage
0fade12 scripts/po/ChangeLog: Fix merge mess

Summary of changes:
 scripts/dpkg-buildpackage.pl |    2 +-
 scripts/po/ChangeLog         |   34 +++++++++++++++++++++++++++++++++-
 2 files changed, 34 insertions(+), 2 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 45a49dd9c087d88378ff56666a503d3ddec00aab
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date:   Mon Sep 24 14:32:36 2007 +0200

    dpkg-buildpackage: Fix typo in usage
    
    s/simultaniously/simultaneously/

diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index 73b7e9a..f412492 100644
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -40,7 +40,7 @@ Options:
   -p<sign-command>
   -d             do not check build dependencies and conflicts.
   -D             check build dependencies and conflicts.
-  -j[<number>]   specify jobs to run simultaniously } passed to debian/rules
+  -j[<number>]   specify jobs to run simultaneously } passed to debian/rules
   -k<keyid>      the key to use for signing.
   -sgpg          the sign-command is called like GPG.
   -spgp          the sign-command is called like PGP.

commit 0fade120552f6b5c9d5f979e84360884ce615f1e
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date:   Mon Sep 24 14:31:17 2007 +0200

    scripts/po/ChangeLog: Fix merge mess

diff --git a/scripts/po/ChangeLog b/scripts/po/ChangeLog
index 9c924ea..bb2d46c 100644
--- a/scripts/po/ChangeLog
+++ b/scripts/po/ChangeLog
@@ -5,7 +5,39 @@
 
 2007-09-20  Christian Perrier  <[EMAIL PROTECTED]>
 
-       * fr.po: Typo correcion
+       * fr.po: Typo correction
+
+2007-08-30  Peter Karlsson  <[EMAIL PROTECTED]>
+
+       * LINGUAS, sv.po: Added Swedish.
+
+2007-08-18  Guillem Jover  <[EMAIL PROTECTED]>
+
+       * dpkg-dev.pot: Regenerated.
+       * *.po: Merged with dpkg-dev.pot.
+
+2007-07-08  Frédéric Bothamy  <[EMAIL PROTECTED]>
+
+       * fr.po: Proofread.
+
+2007-07-06  Christian Perrier  <[EMAIL PROTECTED]>
+
+       * fr.po: Re-re-re-re-completed (438t).
+
+2007-07-02  Frank Lichtenheld  <[EMAIL PROTECTED]>
+
+       * dpkg-dev.pot: Regenerated.
+       * *.po: Merged with dpkg-dev.pot.
+
+2007-05-24  Guillem Jover  <[EMAIL PROTECTED]>
+
+       * dpkg-dev.pot: Regenerated.
+       * *.po: Merged with dpkg-dev.pot.
+
+2007-05-15  Guillem Jover  <[EMAIL PROTECTED]>
+
+       * dpkg-dev.pot: Regenerated.
+       * *.po: Merged with dpkg-dev.pot.
 
 2007-05-11  Frédéric Bothamy  <[EMAIL PROTECTED]>
 

-- 
dpkg's main repository


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

Reply via email to