[SCM] naspro-bridges-bad/master: naspro-bridges-bad -> naspro-bridges

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 982c8bffcbac9a4b490c2bdd11879d10ad26b7aa
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Apr 1 09:28:09 2011 +0200

    naspro-bridges-bad -> naspro-bridges

diff --git a/debian/changelog b/debian/changelog
index 5b55ce2..0fcb12a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,5 @@
-naspro-bridges-bad (0.2.0-2) unstable; urgency=low
+naspro-bridges (0.2.90-1) unstable; urgency=low
 
-  * Force the inclusion of -I/usr/include/rasqal to fix the build
-    failure with GCC4.5.
+  * Initial release.
 
- -- Alessio Treglia <alessio at debian.org>  Sat, 04 Dec 2010 12:25:43 +0100
-
-naspro-bridges-bad (0.2.0-1) unstable; urgency=low
-
-  * Initial release (Closes: #594075).
-
- -- Alessio Treglia <alessio at debian.org>  Sat, 16 Oct 2010 11:27:26 +0200
+ -- Alessio Treglia <alessio at debian.org>  Fri, 01 Apr 2011 09:26:37 +0200
diff --git a/debian/control b/debian/control
index 701747a..7fbec16 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: naspro-bridges-bad
+Source: naspro-bridges
 Section: libs
 Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
@@ -17,11 +17,13 @@ Homepage: http://naspro.atheme.org/naspro-bridges/about
 Vcs-Git: git://git.debian.org/pkg-multimedia/naspro-bridges-bad.git
 Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/naspro-bridges-bad.git
 
-Package: naspro-bridges-bad
+Package: naspro-bridges
 Architecture: any
 Depends: ${shlibs:Depends},
  ${misc:Depends}
-Description: The "bad" NASPRO bridges
+Replaces: naspro-bridges-bad
+Conflicts: naspro-bridges-bad
+Description: collection of bridges to LV2
  This is a collection of <API>-to-LV2 bridges which work fine,
  but do not completely support the original APIs.
  .
@@ -31,7 +33,6 @@ Description: The "bad" NASPRO bridges
  The LADSPA bridge supports every feature of LADSPA and LRDF except:
   * run_adding() and set_run_adding_gain().
   * LRDF factory presets.
- .
  The DSSI bridge does not support:
   * GUIs;
   * MIDI programs;
diff --git a/debian/watch b/debian/watch
index 628e761..d0a344b 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://sf.net/naspro/naspro-bridges-bad-(.*)\.tar\.gz
+http://sf.net/naspro/naspro-bridges-(.*)\.tar\.bz2

-- 
naspro-bridges-bad packaging