[Gnash-commit] /srv/bzr/gnash/trunk r11973: only create the build directory if if doesn't exist. Edit the changelog from srcdir if it isn't in debian/

[Rob Savoye]

------------------------------------------------------------
revno: 11973
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Thu 2010-02-25 18:42:37 -0700
message:
  only create the build directory if if doesn't exist. Edit the changelog from 
srcdir if it isn't in debian/
modified:
  packaging/deb.am
  packaging/debian/rules

=== modified file 'packaging/deb.am'
--- a/packaging/deb.am  2010-02-26 00:23:44 +0000
+++ b/packaging/deb.am  2010-02-26 01:42:37 +0000
@@ -81,6 +81,8 @@
        if test -e $${snapshot_dir}/debian/changelog; then \
          mv -f $${snapshot_dir}/debian/changelog 
$${snapshot_dir}/debian/changelog.orig; \
          sed -e "s:trunk:$${snapshot_version}:" 
$${snapshot_dir}/debian/changelog.orig > $${snapshot_dir}/debian/changelog; \
+       else \
+         sed -e "s:trunk:$${snapshot_version}:" 
$(srcdir)/packaging/debian/changelog > $${snapshot_dir}/debian/changelog; \
        fi; \
        ubuntu=`uname -a | grep -ci ubuntu`; \
        if test $$ubuntu -eq 1; then \

=== modified file 'packaging/debian/rules'
--- a/packaging/debian/rules    2010-02-26 00:23:44 +0000
+++ b/packaging/debian/rules    2010-02-26 01:42:37 +0000
@@ -169,7 +169,9 @@
        fi
 
 #      Make a sub-directory to build all the objects and executables in.
-       mkdir $(BUILD_DIRECTORY)
+       if test ! -d $(BUILD_DIRECTORY); then
+         mkdir $(BUILD_DIRECTORY)
+       fi
 
 #      Configure that build subdirectory.
        printf "\n == CONFIGURE == \n\n"