Selaa lähdekoodia

debian/control: cleanup old Conflicts/Replaces

Actually most of the changes have already been commited by mistake by
Helge in f48f5839df913802f7d70e77d66d3348bd90ddb7.
Raphaël Hertzog 16 vuotta sitten
vanhempi
commit
7fc590339e
2 muutettua tiedostoa jossa 2 lisäystä ja 3 poistoa
  1. 1 0
      debian/changelog
  2. 1 3
      debian/control

+ 1 - 0
debian/changelog

@@ -26,6 +26,7 @@ dpkg (1.15.6.2) UNRELEASED; urgency=low
     exports them to not break packages currently relying on them but packages
     exports them to not break packages currently relying on them but packages
     should now start using dpkg-buildflags instead. Closes: #560070
     should now start using dpkg-buildflags instead. Closes: #560070
   * For Ubuntu set default value of LDFLAGS to -Wl,-Bsymbolic-functions.
   * For Ubuntu set default value of LDFLAGS to -Wl,-Bsymbolic-functions.
+  * Cleanup some old Conflicts/Replaces, thanks to Helge Kreutzmann.
 
 
   [ Colin Watson ]
   [ Colin Watson ]
   * Modern tar files typically use NormalFile1 rather than NormalFile0 for
   * Modern tar files typically use NormalFile1 rather than NormalFile0 for

+ 1 - 3
debian/control

@@ -31,9 +31,7 @@ Architecture: any
 Essential: yes
 Essential: yes
 Pre-Depends: ${shlibs:Depends}, coreutils (>= 5.93-1), xz-utils
 Pre-Depends: ${shlibs:Depends}, coreutils (>= 5.93-1), xz-utils
 Depends: ${misc:Depends}
 Depends: ${misc:Depends}
-Conflicts: dpkg-iasearch (<< 0.11),
- dpkg-dev (<< 1.14.16), apt (<< 0.7.7), aptitude (<< 0.4.7-1)
-Replaces: 
+Conflicts: dpkg-dev (<< 1.14.16), apt (<< 0.7.7), aptitude (<< 0.4.7-1)
 # install-info transition
 # install-info transition
 # see http://wiki.debian.org/Transitions/DpkgToGnuInstallInfo
 # see http://wiki.debian.org/Transitions/DpkgToGnuInstallInfo
 Breaks: jed (<< 1:0.99.18+dfsg.1-13), xjed (<< 1:0.99.18+dfsg.1-13),
 Breaks: jed (<< 1:0.99.18+dfsg.1-13), xjed (<< 1:0.99.18+dfsg.1-13),