doc-hackers: Changes to 'master'

[David Nusinow <dnusinow@alioth.debian.org>]

 mrconfig |   24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

New commits:
commit 78e72794418c842744045ee19a654d62c4381c78
Author: David Nusinow <dnusinow@debian.org>
Date:   Tue Sep 1 20:32:05 2009 -0400

    Code motion

diff --git a/mrconfig b/mrconfig
index 1b07590..f7c14bb 100644
--- a/mrconfig
+++ b/mrconfig
@@ -60,18 +60,6 @@ git_debhelper = if [ $@ ]; then
     fi
   fi
 
-git_needsupload = if [ $@ ]; then
-    BRANCH="$@"
-  else
-    BRANCH="debian-unstable"
-  fi
-  TAGNAME=`git describe --abbrev=0 "$BRANCH"`
-  DESCRIPTION=`git describe "$BRANCH"`
-  COMMITDIFF=`echo "$DESCRIPTION" | sed -e "s/$TAGNAME//" -e 's/^-//' | sed -e 's/-.*//'`
-  if [[ "$COMMITDIFF" > '0' ]]; then
-    echo "`basename $MR_REPO` has $COMMITDIFF commits since the last upload" >> $HOME/mr_needsupload.log
-  fi
-
 git_policy = if [ $@ ]; then
     BRANCH="$@"
   else
@@ -86,6 +74,18 @@ git_policy = if [ $@ ]; then
     fi
   fi
 
+git_needsupload = if [ $@ ]; then
+    BRANCH="$@"
+  else
+    BRANCH="debian-unstable"
+  fi
+  TAGNAME=`git describe --abbrev=0 "$BRANCH"`
+  DESCRIPTION=`git describe "$BRANCH"`
+  COMMITDIFF=`echo "$DESCRIPTION" | sed -e "s/$TAGNAME//" -e 's/^-//' | sed -e 's/-.*//'`
+  if [[ "$COMMITDIFF" > '0' ]]; then
+    echo "`basename $MR_REPO` has $COMMITDIFF commits since the last upload" >> $HOME/mr_needsupload.log
+  fi
+
 [debian/xorg/app/compiz]
 dummy = true
 [debian/xorg/app/grandr]

commit 09720360ddc30dfad062988c2e22363018bc00de
Author: David Nusinow <dnusinow@debian.org>
Date:   Tue Sep 1 20:31:29 2009 -0400

    Rename version variables to make sense

diff --git a/mrconfig b/mrconfig
index 3315f2d..1b07590 100644
--- a/mrconfig
+++ b/mrconfig
@@ -43,9 +43,9 @@ git_xsfbs = if [ $@ ]; then
   fi        # Do we have the merge branch (debian-unstable by default)?
 
 git_debhelper = if [ $@ ]; then
-    VERSION=shift "$@"
+    DHVERSION=shift "$@"
   else
-    VERSION=`apt-cache policy debhelper | awk '/Installed:/ { print $2 }' | sed 's/\..*//'`
+    DHVERSION=`apt-cache policy debhelper | awk '/Installed:/ { print $2 }' | sed 's/\..*//'`
   fi
   if [ $@ ]; then
     BRANCH=shift "$@"
@@ -54,9 +54,9 @@ git_debhelper = if [ $@ ]; then
   fi
   git checkout -q "$BRANCH"
   if [ -f "debian/compat" ]; then
-    CURVERSION=`cat debian/compat`
-    if [ "$VERSION" -gt "$CURVERSION" ]; then
-	  echo "`basename $MR_REPO` is at Debhelper Version $CURVERSION" >> $HOME/mr_debhelper.log
+    PKGVERSION=`cat debian/compat`
+    if [ "$DHVERSION" -gt "$PKGVERSION" ]; then
+	  echo "`basename $MR_REPO` is at Debhelper Version $PKGVERSION" >> $HOME/mr_debhelper.log
     fi
   fi
 
@@ -79,10 +79,10 @@ git_policy = if [ $@ ]; then
   fi
   git checkout -q "$BRANCH"
   if [ -e "debian/control" ]; then
-    PACKAGEVERSION=`awk '/^Standards-Version/ { print $2 }' debian/control`
-    VERSION=`apt-cache policy debian-policy | awk '/Installed:/ { print $2 }'`
-    if [ ! `dpkg --compare-versions "$PACKAGEVERSION" eq "$VERSION"` ]; then
-      echo "`basename $MR_REPO` is at standards version $PACKAGEVERSION" >> $HOME/mr_policy.log
+    PKGVERSION=`awk '/^Standards-Version/ { print $2 }' debian/control`
+    CURVERSION=`apt-cache policy debian-policy | awk '/Installed:/ { print $2 }'`
+    if [ ! `dpkg --compare-versions "$PKGVERSION" eq "$CURVERSION"` ]; then
+      echo "`basename $MR_REPO` is at standards version $PKGVERSION" >> $HOME/mr_policy.log
     fi
   fi
 

commit 866d263657135f94b69bd5df4a1b336923f25aff
Author: David Nusinow <dnusinow@debian.org>
Date:   Tue Sep 1 20:26:57 2009 -0400

    Add a policy command to mrconfig
    
    This will look for packages that need an updated standards version

diff --git a/mrconfig b/mrconfig
index bea5dad..3315f2d 100644
--- a/mrconfig
+++ b/mrconfig
@@ -72,6 +72,20 @@ git_needsupload = if [ $@ ]; then
     echo "`basename $MR_REPO` has $COMMITDIFF commits since the last upload" >> $HOME/mr_needsupload.log
   fi
 
+git_policy = if [ $@ ]; then
+    BRANCH="$@"
+  else
+    BRANCH="debian-unstable"
+  fi
+  git checkout -q "$BRANCH"
+  if [ -e "debian/control" ]; then
+    PACKAGEVERSION=`awk '/^Standards-Version/ { print $2 }' debian/control`
+    VERSION=`apt-cache policy debian-policy | awk '/Installed:/ { print $2 }'`
+    if [ ! `dpkg --compare-versions "$PACKAGEVERSION" eq "$VERSION"` ]; then
+      echo "`basename $MR_REPO` is at standards version $PACKAGEVERSION" >> $HOME/mr_policy.log
+    fi
+  fi
+
 [debian/xorg/app/compiz]
 dummy = true
 [debian/xorg/app/grandr]