The branch, dpkg-shlibdeps-buxy has been updated
       via  dca270df7beb27b4ee72a7e54aad7dd9268a5749 (commit)
       via  45a49dd9c087d88378ff56666a503d3ddec00aab (commit)
       via  0fade120552f6b5c9d5f979e84360884ce615f1e (commit)
       via  f4d3e5971e7095865f6a41c2cbabf63ac818bce8 (commit)
       via  cbf3eaeee0e189150a933fbe6854f7256df1d59a (commit)
       via  8d181f5203d579366a1c31a9e0290f656160c6d0 (commit)
       via  a19946b71970f7854f9b15cc639b1a4039e902ff (commit)
       via  530d60533f7f0281d2bd00b93168b91e7dda013c (commit)
       via  482cc83e0404956b88767cde50f744e72c0e9516 (commit)
       via  87c0599e3df4189070c08ffaabb4ff2d89eb2134 (commit)
       via  68bf666f23854a9370175337f5366b947d44eae6 (commit)
       via  4a94ad32336f739cbb7eed250cbea7ea937246f4 (commit)
       via  598ffd4e5f0a40b91ea75199ded4b9056a8cd399 (commit)
       via  b18a771381c72774c82cc7c4120c52ffb7d0d9f5 (commit)
       via  187b15ebf4ccf590752a176a99d8f6702c2a502a (commit)
      from  d131b99fdb144d62cf93a1f3b2d75de4256d3555 (commit)


- Shortlog ------------------------------------------------------------
dca270d Merge branch 'master' into dpkg-shlibdeps-buxy

Summary of changes:
 ChangeLog                    |   25 +
 debian/changelog             |   13 +-
 m4/perl.m4                   |    2 +-
 man/ChangeLog                |    9 +
 man/dpkg-buildpackage.1      |   11 +
 man/po/sv.add                |    2 +-
 scripts/Dpkg/BuildOptions.pm |   38 ++
 scripts/Makefile.am          |    3 +-
 scripts/dpkg-buildpackage.pl |  443 ++++++++++++++++
 scripts/dpkg-buildpackage.sh |  297 -----------
 scripts/dpkg-source.pl       |    2 +-
 scripts/po/ChangeLog         |    9 +
 scripts/po/POTFILES.in       |    1 +
 scripts/po/ca.po             |  855 ++++++++++++++++++------------
 scripts/po/dpkg-dev.pot      |  851 ++++++++++++++++++------------
 scripts/po/fr.po             |  865 ++++++++++++++++++-------------
 scripts/po/sv.po             | 1201 ++++++++++++++++++++++++------------------
 17 files changed, 2765 insertions(+), 1862 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit dca270df7beb27b4ee72a7e54aad7dd9268a5749
Merge: d131b99fdb144d62cf93a1f3b2d75de4256d3555 
45a49dd9c087d88378ff56666a503d3ddec00aab
Author: Raphael Hertzog <[EMAIL PROTECTED]>
Date:   Mon Sep 24 20:54:54 2007 +0200

    Merge branch 'master' into dpkg-shlibdeps-buxy
    
    Conflicts:
    
        scripts/Makefile.am

diff --combined scripts/Makefile.am
index d5e54b2,87ea060..9a338fc
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@@ -10,7 -10,6 +10,7 @@@ bin_SCRIPTS = 
        dpkg-distaddfile \
        dpkg-genchanges \
        dpkg-gencontrol \
 +      dpkg-gensymbols \
        dpkg-name \
        dpkg-parsechangelog \
        dpkg-scanpackages \
@@@ -32,12 -31,11 +32,12 @@@ EXTRA_DIST = 
        README.alternatives \
        822-date.pl \
        dpkg-architecture.pl \
-       dpkg-buildpackage.sh \
+       dpkg-buildpackage.pl \
        dpkg-checkbuilddeps.pl \
        dpkg-distaddfile.pl \
        dpkg-genchanges.pl \
        dpkg-gencontrol.pl \
 +      dpkg-gensymbols.pl \
        dpkg-name.sh \
        dpkg-parsechangelog.pl \
        dpkg-scanpackages.pl \
@@@ -57,12 -55,8 +57,13 @@@ CLEANFILES = 
  
  perllibdir = $(PERL_LIBDIR)
  nobase_dist_perllib_DATA = \
 +      Dpkg/Shlibs.pm \
 +      Dpkg/Shlibs/Objdump.pm \
 +      Dpkg/Shlibs/SymbolFile.pm \
 +      Dpkg/ErrorHandling.pm \
+       Dpkg/BuildOptions.pm \
        Dpkg/Gettext.pm \
 +      Dpkg/Version.pm \
        Dpkg.pm
  
  dist_pkglib_SCRIPTS = \
@@@ -115,9 -109,3 +116,9 @@@ install-data-hook
  uninstall-local:
        rm -f $(DESTDIR)$(sysconfdir)/alternatives/README
        rm -f $(DESTDIR)$(sbindir)/install-info
 +
 +TEST_FILES= t/*.t
 +TEST_VERBOSE= 0
 +
 +test:
 +      PERL_DL_NONLAZY=1 $(PERL) "-MExtUtils::Command::MM" "-e" 
"test_harness($(TEST_VERBOSE), '.')" $(TEST_FILES)
diff --combined scripts/po/POTFILES.in
index 0966a08,69a4031..197539e
--- a/scripts/po/POTFILES.in
+++ b/scripts/po/POTFILES.in
@@@ -3,19 -3,15 +3,20 @@@
  scripts/822-date.pl
  scripts/controllib.pl
  scripts/dpkg-architecture.pl
+ scripts/dpkg-buildpackage.pl
  scripts/dpkg-checkbuilddeps.pl
  scripts/dpkg-distaddfile.pl
  scripts/dpkg-genchanges.pl
  scripts/dpkg-gencontrol.pl
 +scripts/dpkg-gensymbols.pl
  scripts/dpkg-parsechangelog.pl
  scripts/dpkg-scanpackages.pl
  scripts/dpkg-scansources.pl
  scripts/dpkg-shlibdeps.pl
  scripts/dpkg-source.pl
  scripts/changelog/debian.pl
 -
 +scripts/Dpkg/Shlibs.pm
 +scripts/Dpkg/Shlibs/Objdump.pm
 +scripts/Dpkg/Shlibs/SymbolFile.pm
 +scripts/Dpkg/Version.pm
 +scripts/Dpkg/ErrorHandling.pm

-- 
dpkg's main repository


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

Reply via email to