* Specify source version 1

* No need to conflict with ancient versions of lilypond anymore

diff --git a/debian/changelog b/debian/changelog
index c3d1c67c16b2b77ae737293e8a69d4860e694c98..96b89724eebd78e30b37353484d47966404bf793 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,10 @@ lilypond (2.14.2-1) unstable; urgency=low
   * Add parts of patch f113bf2f (Benjamin Peterson <benjamin@python.org>)
     to fix segfaults on invalid engraver names.
   * Update standards version; no changes
+  * Specify source version 1
+  * No need to conflict with ancient versions of lilypond anymore
 
- -- Don Armstrong <don@debian.org>  Fri, 29 Jul 2011 18:22:50 -0700
+ -- Don Armstrong <don@debian.org>  Tue, 02 Aug 2011 13:14:29 -0700
 
 lilypond (2.12.3-7) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index c070da2817908b77c6c5de09bb57997843fe6eb2..640ba56c72796f21234a69398e6645c554a6d8e0 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -52,7 +52,6 @@ Package: lilypond-data
 Architecture: all
 Depends: texinfo | texlive-texinfo, texlive-base-bin, ${python:Depends}, ${misc:Depends}
 Recommends: lilypond (>= ${source:Version})
-Conflicts: lilypond (<< 2.2.2-2)
 Description: LilyPond music typesetter (data files)
  LilyPond is a music typesetter, an automated engraving system.  It
  produces beautiful sheet music using a high level description file as input.
@@ -64,7 +63,6 @@ Section: doc
 Architecture: all
 Depends: ${misc:Depends}, dpkg (>= 1.15.4) | install-info
 Suggests: lilypond (>= ${source:Version}), gv | postscript-viewer, mozilla-browser | www-browser
-Replaces: lilypond (<= 2.2.3-1), lilypond-data (<= 2.2.3-1)
 Description: LilyPond Documentation in HTML, PS and DVI formats
  LilyPond is a music typesetter, an automated engraving system.  It
  produces beautiful sheet music using a high level description file as input.

diff --git a/debian/source/format b/debian/source/format
new file mode 100644 (file)
index 0000000..d00491f
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+1