The following commit has been merged in the master branch:
commit aaaab9b08ff5ea433b5d5334c6f9763167f3ec96
Author: James Vega <[email protected]>
Date: Sun Apr 4 21:30:48 2010 -0400
debian/control: Remove Conflicts on kdesdk-scripts from Etch.
diff --git a/debian/changelog b/debian/changelog
index ec8d001..bde5c1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,7 +21,9 @@ devscripts (2.10.62) UNRELEASED; urgency=low
+ Use Dpkg::Version to perform version comparisons.
* Devscripts::Versort: Use Dpkg::Version::version_compare instead of
invoking “dpkg --compare-versions”.
- * debian/control: Update Vcs-* to point to the new Git repository.
+ * debian/control:
+ + Update Vcs-* to point to the new Git repository.
+ + Remove Conflicts on kdesdk-scripts from Etch.
* dcmd: Allow capital letters for the section and priority fields. (Closes:
#565159)
* debcheckout: Ensure "/git/" is at the start of the URL's path when
diff --git a/debian/control b/debian/control
index bba370a..1fe7451 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,6 @@ Vcs-Git: git://git.debian.org/devscripts/devscripts.git
Package: devscripts
Architecture: any
-Conflicts: kdesdk-scripts (<< 4:3.5.6-2)
Depends: dpkg-dev, perl, ${shlibs:Depends}, ${misc:Depends}
Recommends: at, curl | wget, dctrl-tools, debian-keyring, debian-maintainers,
dput | dupload, equivs, fakeroot, gnupg, libauthen-sasl-perl,
--
Git repository for devscripts
--
To unsubscribe, send mail to [email protected].
