[SCM] phasex packaging branch, master, updated. debian/0.11.1-1-4-g7e201ba

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

The following commit has been merged in the master branch:
commit 7c5cf67f90f01e634d06a9ee15b7016b7297cf92
Merge: 8bbc3af9f8948ad97bf81f985444500239f0badd 974d12e8097401031fbd04918c8d8132e81a213b
Author: d <d at debian.cc955125-A>
Date:   Mon Dec 14 16:07:12 2009 +0100

    Merge commit 'upstream/0.12.0-pre1'
    
    Conflicts:
    	misc/phasex.desktop
    	phasex.desktop

diff --combined debian/changelog
index 96496b8,0000000..43ddcf7
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,0 +1,11 @@@
++phasex (0.12.0-1) unstable; urgency=low
++
++  * new upstream release
++  
++ -- rosea grammostola <rosea.grammostola at gmail.com>  Mon, 14 Dec 2009 15:47:20 +0100
++
 +phasex (0.11.1-1) unstable; urgency=low
 +
 +  * Initial release (Closes: #520231)  
 +
 + -- rosea grammostola <rosea.grammostola at gmail.com>  Thu, 07 May 2009 11:42:14 +0200
diff --combined misc/phasex.desktop
index 0d333ae,b48ff54..822f33c
--- a/misc/phasex.desktop
+++ b/misc/phasex.desktop
@@@ -1,10 -1,11 +1,10 @@@
  [Desktop Entry]
  Name=PHASEX
 -Comment=Phase Harmonic Advanced Synthesis EXperiment
 +Comment=Phase Harmonic Advanced Synthesis Experiment
  Icon=phasex-icon
  Exec=phasex
  Terminal=false
  Type=Application
 -Encoding=UTF-8
  
  X-Desktop-File-Install-Version=0.10
- Categories=X-Jack;X-MIDI;X-Digital_Processing;AudioVideo;Audio;
+ Categories=Application;AudioVideo;Audio;X-MIDI;X-Synthesis;X-JACK;X-Digital_Processing;

-- 
phasex packaging