[rkward/releases/0.6.4] /: Remove some legacy code.
Thomas Friedrichsmeier
thomas.friedrichsmeier at ruhr-uni-bochum.de
Fri Dec 11 21:27:47 UTC 2015
Git commit bd3a60b8a6c42de5dd4c6991f8841b854a7edfe7 by Thomas Friedrichsmeier.
Committed on 11/12/2015 at 21:27.
Pushed by tfry into branch 'releases/0.6.4'.
Remove some legacy code.
M +1 -1 debian-official/changelog
M +1 -1 debian-official/compat
M +2 -2 debian-official/control
M +3 -13 debian-official/rules
M +1 -0 debian/changelog
http://commits.kde.org/rkward/bd3a60b8a6c42de5dd4c6991f8841b854a7edfe7
diff --git a/debian-official/changelog b/debian-official/changelog
index 3f06547..9c861bf 100644
--- a/debian-official/changelog
+++ b/debian-official/changelog
@@ -2,7 +2,7 @@ rkward (0.6.4-1) unstable; urgency=low
* new upstream release
* remove obsolete README.Debian file
* upstream has replaced KHTMLPart with QWebKit. As Qt4WebKit is scheduled for
- removal, we revert this change, here
+ removal, revert this change, here. Change to 3.0 (quilt) format for this.
* Make build reproducible (thanks to Philip Rinn)
closes: #783290
diff --git a/debian-official/compat b/debian-official/compat
index 1e8b314..ec63514 100644
--- a/debian-official/compat
+++ b/debian-official/compat
@@ -1 +1 @@
-6
+9
diff --git a/debian-official/control b/debian-official/control
index 6080d4a..7068977 100644
--- a/debian-official/control
+++ b/debian-official/control
@@ -3,10 +3,10 @@ Section: math
Priority: optional
Maintainer: Thomas Friedrichsmeier <tfry at users.sourceforge.net>
Build-Depends: cmake,
- debhelper (>= 6.0.0),
+ debhelper (>= 9.0.0),
kdelibs5-dev,
libx11-dev,
- r-base-dev (>= 2.8.0)
+ r-base-dev (>= 3.0.0)
Standards-Version: 3.9.6
Homepage: http://rkward.kde.org
Vcs-Browser: http://quickgit.kde.org/?p=rkward.git&a=tree&f=debian-official
diff --git a/debian-official/rules b/debian-official/rules
index 3200f21..bc6d496 100755
--- a/debian-official/rules
+++ b/debian-official/rules
@@ -123,21 +123,11 @@ binary-arch: build install
dh_installdeb
dh_shlibdeps
# unfortunately, the r-base-core dependency can not be found by dh_shlibdeps, so we need to get at the version manually
+ # NOTE: This "if" is currently always true (see build-deps), but left here, for convenience, in case we get into trouble
+ # with binary incompatibility (backward / foward) again, in the future.
@if [ "$(RMAJOR)" -eq "3" ] && [ "$(RMINOR)" -ge "0" ] ; then \
echo "rvers=r-base-core (>= 3.0.0)" >> $(CURDIR)/debian/rkward.substvars ; \
- else \
- if [ "$(RMAJOR)" -eq "2" ] && [ "$(RMINOR)" -ge "14" ] ; then \
- echo "rvers=r-base-core (>= 2.9.0), r-base-core (<< 3.0.0)" >> $(CURDIR)/debian/rkward.substvars ; \
- else \
- if [ "$(RMAJOR)" -eq "2" ] && [ "$(RMINOR)" -ge "9" ] ; then \
- echo "rvers=r-base-core (<< 2.14.0), r-base-core (>= 2.9.0)" >> $(CURDIR)/debian/rkward.substvars ; \
- else \
- if [ "$(RMAJOR)" -eq "2" ] && [ "$(RMINOR)" -ge "8" ] ; then \
- echo "rvers=r-base-core (<< 2.9.0), r-base-core (>= 2.8.0)" >> $(CURDIR)/debian/rkward.substvars ; \
- else \
- if [ "$(RMAJOR)" -eq "2" ] && [ "$(RMINOR)" -ge "7" ] ; then \
- echo "rvers=r-base-core (<< 2.8.0), r-base-core (>= 2.7.0)" >> $(CURDIR)/debian/rkward.substvars ; \
- fi; fi ; fi ; fi ; fi
+ fi
dh_gencontrol
dh_md5sums
dh_builddeb
diff --git a/debian/changelog b/debian/changelog
index 65f7181..54a088d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
rkward (0.6.4-1) unstable; urgency=low
* new upstream release
+ * increase debhelper compatibility level to 9 (no changes needed)
* remove obsolete README.Debian file
* now uses QtWebKit module, adjust build-depends, accordingly (in a way that is
backwards compatible with Ubuntu Lucid)
More information about the rkward-tracker
mailing list