doc-hackers: Changes to 'master'

2009-09-13 Thread David Nusinow 
 mrconfig |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit bbfada0bbc799c80e6537941b75e659797898136
Author: David Nusinow 
Date:   Sun Sep 13 19:27:15 2009 -0400

Fix checkout target for things not in the app subdir

diff --git a/mrconfig b/mrconfig
index f7c14bb..52144ab 100644
--- a/mrconfig
+++ b/mrconfig
@@ -2,7 +2,8 @@
 [DEFAULT]
 git_gc = git gc "$@"
 checkout = REPONAME=`basename $MR_REPO`;
-  git clone "git+ssh://dnusi...@git.debian.org/git/pkg-xorg/app/$REPONAME" &&
+  REPOCATEGORY=`echo "$MR_REPO" | perl -na -F'/' -e 'print $F[-3]'`
+  git clone 
"git+ssh://dnusi...@git.debian.org/git/pkg-xorg/$REPOCATEGORY/$REPONAME" &&
   cd $MR_REPO &&
   git remote add xsfbs git+ssh://dnusi...@git.debian.org/git/pkg-xorg/xsfbs &&
   git remote update xsfbs &&


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

doc-hackers: Changes to 'master'

2009-09-01 Thread David Nusinow 
 mrconfig |   24 +++-
 1 file changed, 19 insertions(+), 5 deletions(-)

New commits:
commit 78e72794418c842744045ee19a654d62c4381c78
Author: David Nusinow 
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 
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 
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]


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

doc-hackers: Changes to 'master'

2009-09-01 Thread David Nusinow 
 mrconfig |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b71ebb73faeca2d36efa381ecda12a97df68646a
Author: David Nusinow 
Date:   Tue Sep 1 19:44:11 2009 -0400

Fix thinko with greater than redirection. Yay shell.

diff --git a/mrconfig b/mrconfig
index 810b4e1..bea5dad 100644
--- a/mrconfig
+++ b/mrconfig
@@ -68,7 +68,7 @@ git_needsupload = if [ $@ ]; then
   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
+  if [[ "$COMMITDIFF" > '0' ]]; then
 echo "`basename $MR_REPO` has $COMMITDIFF commits since the last upload" 
>> $HOME/mr_needsupload.log
   fi
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

doc-hackers: Changes to 'master'

2009-09-01 Thread David Nusinow 
 mrconfig |   12 
 1 file changed, 12 insertions(+)

New commits:
commit 2e2d2738b1c7f1212ba4dd9fc865d01acc3cdd40
Author: David Nusinow 
Date:   Tue Sep 1 19:34:37 2009 -0400

Add a needsupload command to mrconfig

This will let us know if we have a bunch of commits in a package since its
last upload

diff --git a/mrconfig b/mrconfig
index b339df6..810b4e1 100644
--- a/mrconfig
+++ b/mrconfig
@@ -60,6 +60,18 @@ 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
+
 [debian/xorg/app/compiz]
 dummy = true
 [debian/xorg/app/grandr]


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

doc-hackers: Changes to 'master'

2009-09-01 Thread David Nusinow 
 mrconfig |   18 ++
 1 file changed, 18 insertions(+)

New commits:
commit dbc56e92c054d8127a51e022802addc423a2c83a
Author: David Nusinow 
Date:   Tue Sep 1 19:16:04 2009 -0400

Add debhelper function

This will help determine which packages need debhelper updates

diff --git a/mrconfig b/mrconfig
index 9dd8958..b339df6 100644
--- a/mrconfig
+++ b/mrconfig
@@ -42,6 +42,24 @@ git_xsfbs = if [ $@ ]; then
 fi  # Do we have debian/xsfbs and we're not xsfbs itself?
   fi# Do we have the merge branch (debian-unstable by default)?
 
+git_debhelper = if [ $@ ]; then
+VERSION=shift "$@"
+  else
+VERSION=`apt-cache policy debhelper | awk '/Installed:/ { print $2 }' | 
sed 's/\..*//'`
+  fi
+  if [ $@ ]; then
+BRANCH=shift "$@"
+  else
+BRANCH="debian-unstable"
+  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
+fi
+  fi
+
 [debian/xorg/app/compiz]
 dummy = true
 [debian/xorg/app/grandr]


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Re: doc-hackers: Changes to 'master'

2009-08-31 Thread David Nusinow 
David Nusinow wrote:
>  mrconfig |  408 
> +++
>  1 file changed, 408 insertions(+)
> 
> New commits:
> commit ee3683624bd5a4ea0253013a24a689ea4e1c5b02
> Author: David Nusinow 
> Date:   Mon Aug 31 21:53:58 2009 -0400
> 
> Add mrconfig

This is the beginning of a config file for Joey Hess's mr program that
will hopefully save us a lot of pain and drudgery. My shell scripting
abilities are pretty weak, so please tear it apart and critique it. I've
got a few more features I'd like to add to what's here as well that I'll
be writing and uploading in the next week or two.

 - David Nusinow


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

doc-hackers: Changes to 'master'

2009-08-31 Thread David Nusinow 
 mrconfig |  408 +++
 1 file changed, 408 insertions(+)

New commits:
commit ee3683624bd5a4ea0253013a24a689ea4e1c5b02
Author: David Nusinow 
Date:   Mon Aug 31 21:53:58 2009 -0400

Add mrconfig

diff --git a/mrconfig b/mrconfig
new file mode 100644
index 000..9dd8958
--- /dev/null
+++ b/mrconfig
@@ -0,0 +1,408 @@
+# Let emacs know how to highlite this file: -*-shell-script-*-
+[DEFAULT]
+git_gc = git gc "$@"
+checkout = REPONAME=`basename $MR_REPO`;
+  git clone "git+ssh://dnusi...@git.debian.org/git/pkg-xorg/app/$REPONAME" &&
+  cd $MR_REPO &&
+  git remote add xsfbs git+ssh://dnusi...@git.debian.org/git/pkg-xorg/xsfbs &&
+  git remote update xsfbs &&
+  for REPO in upstream-unstable debian-experimental upstream-experimental
+  do
+if [ `git branch -a | grep "$REPO"` ]; then
+  git branch --track "$REPO" "origin/$REPO"
+fi
+  done
+
+# git_addxsfbs = cd $MR_REPO && 
+#   git remote add xsfbs git+ssh://dnusi...@git.debian.org/git/pkg-xorg/xsfbs 
&&
+#   git remote update xsfbs
+
+git_xsfbs = if [ $@ ]; then
+BRANCH="$@"
+  else 
+BRANCH="debian-unstable" 
+  fi
+  if git branch | grep "$BRANCH"; then
+git checkout "$BRANCH"
+if [[ "$MR_REPO" != "xsfbs" && -d debian/xsfbs ]]; then
+  git remote update xsfbs
+ COMMITMSG="Merge xsfbs in to $BRANCH"
+ git merge -m "$COMMITMSG" xsfbs/debian-unstable
+ LASTCOMMIT=`git log -1 --pretty='%s'`
+ if [ "$LASTCOMMIT" = "$COMMITMSG" ]; then
+COMMITHASH=`git log -1 --pretty='%H' xsfbs/debian-unstable`
+   if head -n1 debian/changelog | awk '{print $3}' | grep 'UNRELEASED' 
> /dev/null; then
+ dch -a "Update xsfbs to $COMMITHASH"
+   else
+ dch -i -D UNRELEASED "Update xsfbs to $COMMITHASH"
+   fi
+   git add debian/changelog
+git commit -m "Update xsfbs to $COMMITHASH"
+  fi# Did the merge actually provide new commits?
+fi  # Do we have debian/xsfbs and we're not xsfbs itself?
+  fi# Do we have the merge branch (debian-unstable by default)?
+
+[debian/xorg/app/compiz]
+dummy = true
+[debian/xorg/app/grandr]
+dummy = true
+[debian/xorg/app/twm]
+dummy = true
+[debian/xorg/app/x11-apps]
+dummy = true
+[debian/xorg/app/x11-session-utils]
+dummy = true
+[debian/xorg/app/x11-utils]
+dummy = true
+[debian/xorg/app/x11-xfs-utils]
+dummy = true
+[debian/xorg/app/x11-xkb-utils]
+dummy = true
+[debian/xorg/app/x11-xserver-utils]
+dummy = true
+[debian/xorg/app/xauth]
+dummy = true
+[debian/xorg/app/xbacklight]
+dummy = true
+[debian/xorg/app/xdm]
+dummy = true
+[debian/xorg/app/xfs]
+dummy = true
+[debian/xorg/app/xinit]
+dummy = true
+[debian/xorg/app/xprint-utils]
+dummy = true
+[debian/xorg/app/xterm]
+dummy = true
+[debian/xorg/app/xutils]
+dummy = true
+[debian/xorg/app/xutils-dev]
+dummy = true
+[debian/xorg/bling/ccsm]
+dummy = true
+[debian/xorg/bling/compizconfig-backend-gconf]
+dummy = true
+[debian/xorg/bling/compizconfig-backend-kconfig]
+dummy = true
+[debian/xorg/bling/compizconfig-backend-kconfig4]
+dummy = true
+[debian/xorg/bling/compizconfig-python]
+dummy = true
+[debian/xorg/bling/compiz-fusion-bcop]
+dummy = true
+[debian/xorg/bling/compiz-fusion-plugins-extra]
+dummy = true
+[debian/xorg/bling/compiz-fusion-plugins-main]
+dummy = true
+[debian/xorg/bling/compiz-fusion-plugins-unsupported]
+dummy = true
+[debian/xorg/bling/libcompizconfig]
+dummy = true
+[debian/xorg/data/xbitmaps]
+dummy = true
+[debian/xorg/data/xcursor-themes]
+dummy = true
+[debian/xorg/data/xkb-data]
+dummy = true
+[debian/xorg/debian/xorg]
+dummy = true
+[debian/xorg/doc-hackers]
+dummy = true
+[debian/xorg/doc/xorg-docs]
+dummy = true
+[debian/xorg/doc/xorg-sgml-doctools]
+dummy = true
+[debian/xorg/driver/xserver-xorg-input-acecad]
+dummy = true
+[debian/xorg/driver/xserver-xorg-input-aiptek]
+dummy = true
+[debian/xorg/driver/xserver-xorg-input-citron]
+dummy = true
+[debian/xorg/driver/xserver-xorg-input-elographics]
+dummy = true
+[debian/xorg/driver/xserver-xorg-input-evdev]
+dummy = true
+[debian/xorg/driver/xserver-xorg-input-evtouch]
+dummy = true
+[debian/xorg/driver/xserver-xorg-input-fpit]
+dummy = true
+[debian/xorg/driver/xserver-xorg-input-hyperpen]
+dummy = true
+[debian/xorg/driver/xserver-xorg-input-joystick]
+dummy = true
+[debian/xorg/driver/xserver-xorg-input-keyboard]
+dummy = true
+[debian/xorg/driver/xserver-xorg-input-mouse]
+dummy = true
+[debian/xorg/driver/xserver-xorg-input-mutouch]
+dummy = true
+[debian/xorg/driver/xserver-xorg-input-penmount]
+dummy = true
+[debian/xorg/driver/xserver-xorg-input-synaptics]
+dummy = true
+[debian/xorg/driver/xserver-xorg-input-vmmouse]
+dummy = true
+[debian/xorg/driver/xserver-xorg-input-void]
+dummy = true
+[debian/xorg/driver/xserver-xorg-video-amd]
+dummy = true
+[debian/xorg/driver/xserver-xorg-video-apm]
+dummy = true
+[debian/xorg/driver/xserver-xorg-video-ark]
+dummy = true
+[debian/xorg/driv