The following commit has been merged in the master branch:
commit cb4288636728df2a9187d042eea8f57f24790d29
Author: Raphael Hertzog <[email protected]>
Date:   Sat Mar 21 18:05:03 2009 +0100

    Small fixes so that a build from a clean checkout works again
    
    Remove origin/Makefile from configure.ac.
    
    Fix debian/rules so that it works even if the auto-generated ChangeLog is
    not there yet.
    
    Reported-by: Bill Allombert <[email protected]>

diff --git a/configure.ac b/configure.ac
index ebd7570..719843c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -113,7 +113,6 @@ AC_CONFIG_FILES([ Makefile
                  lib/Makefile
                  lib/test/Makefile
                  man/Makefile
-                 origins/Makefile
                  po/Makefile.in
                  scripts/Makefile
                  scripts/po/Makefile.in
diff --git a/debian/rules b/debian/rules
index 3539cb3..05c08ca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -89,7 +89,7 @@ binary-arch: install
        install -d debian/dpkg/sbin
        mv debian/dpkg/usr/sbin/start-stop-daemon debian/dpkg/sbin
 
-       dh_installchangelogs -a ChangeLog ChangeLog.old
+       dh_installchangelogs -a ChangeLog*
        dh_installdocs -a
        dh_link -a
        dh_lintian -a
@@ -108,7 +108,7 @@ binary-indep: install
        dh_testroot -i
        dh_install --sourcedir=debian/tmp -i -XDpkg/Gettext.pm
 
-       dh_installchangelogs -i ChangeLog ChangeLog.old
+       dh_installchangelogs -i ChangeLog*
        dh_installdocs -i
        dh_link -i
        dh_lintian -i

-- 
dpkg's main repository


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

Reply via email to