[SCM] pd-markex/master: Merge branch 'master' of ssh://git.debian.org/git/pkg-multimedia/pd-markex

[eighthave-guest at users.alioth.debian.org]

Revert "Suggest pd-libdir rather than Depend on it"
Updated changelog
cosmetic descrption fixes
Added Vcs-* fields
Suggest pd-libdir rather than Depend on it
Added .gitignore
Makefile-fixes for non-linux (Closes: #609777)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 025bdf3030ba639c5026ab97f31f37f31b68314a
X-Git-Newrev: 8cdae9a1723528360b8f6c50ba33d2a08493a2e1

The following commit has been merged in the master branch:
commit 3f1bb5ac8d119526add20fbffd7dde7dc30446f4
Merge: bf21187e1a1758a440abd5d746260d8f2a80d2eb 025bdf3030ba639c5026ab97f31f37f31b68314a
Author: Hans-Christoph Steiner <hans at eds.org>
Date:   Wed Apr 27 00:24:49 2011 -0400

    Merge branch 'master' of ssh://git.debian.org/git/pkg-multimedia/pd-markex
    
    Conflicts:
    	debian/control

diff --combined debian/control
index e26305c,85ae030..ec9b1d5
--- a/debian/control
+++ b/debian/control
@@@ -7,6 -7,8 +7,8 @@@ Build-Depends: debhelper (>= 7.0.50~)
                 puredata
  Standards-Version: 3.9.1
  Homepage: http://puredata.info
+ Vcs-Git: git://git.debian.org/pkg-multimedia/pd-markex
+ Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/pd-markex.git
  
  Package: pd-markex
  Architecture: any
@@@ -14,8 -16,7 +16,8 @@@ Depends: ${shlibs:Depends}
           pd,
           ${misc:Depends},
           pd-libdir
 -Description: misc objects from Mark Danks for Pd
 +Recommends: pd-pddp
- Description: a library Pd of misc objects from Mark Danks
++Description: a Pd library of misc objects from Mark Danks
   Markex is an external library of miscellaneous objects that was begun in 1994
   and originally included in GEM.  It is largely here for the sake of old
   projects that might still rely on it.  The included functionality has been

-- 
pd-markex packaging