[rkward-cvs] rkward/debian changelog,1.17,1.18 copyright,1.1,1.2 rules,1.11,1.12
Thomas Friedrichsmeier
tfry at users.sourceforge.net
Tue Apr 25 10:42:29 UTC 2006
Update of /cvsroot/rkward/rkward/debian
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18668
Modified Files:
changelog copyright rules
Log Message:
Clean up rules some, fix detection of r-base-core version (thanks to Roland Rutschmann)
Index: rules
===================================================================
RCS file: /cvsroot/rkward/rkward/debian/rules,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** rules 21 Apr 2006 15:11:59 -0000 1.11
--- rules 25 Apr 2006 10:42:27 -0000 1.12
***************
*** 1,14 ****
#!/usr/bin/make -f
# -*- makefile -*-
! # Sample debian/rules that uses debhelper.
! # This file was originally written by Joey Hess and Craig Small.
! # As a special exception, when this file is copied by dh-make into a
! # dh-make output file, you may use that output file without restriction.
! # This special exception was added by Craig Small in version 0.37 of dh-make.
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
--- 1,9 ----
#!/usr/bin/make -f
# -*- makefile -*-
! # Based on the sample debian/rules of dh_make
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
***************
*** 16,19 ****
--- 11,16 ----
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+ #we need to know the R version
+ RVERS = $(shell dpkg-query -W --showformat='$${Version}' r-base-core)
CFLAGS = -Wall -g
***************
*** 38,42 ****
# Add here commands to compile the package.
$(MAKE)
- #docbook-to-man debian/rkward.sgml > rkward.1
touch build-stamp
--- 35,38 ----
***************
*** 45,49 ****
dh_testdir
dh_testroot
! rm -f build-stamp
# Add here commands to clean up after the build process.
--- 41,47 ----
dh_testdir
dh_testroot
! rm -f build-stamp
! # remove any CVS subdir included by accident
! rm -rf $(CURDIR)/debian/CVS
# Add here commands to clean up after the build process.
***************
*** 56,68 ****
endif
-
dh_clean
install: build
- # Link manpage for rkward.bin to rkward
- @if test ! -e "$(CURDIR)/debian/rkward.bin.1" ; then \
- ln -s $(CURDIR)/debian/rkward.1 $(CURDIR)/debian/rkward.bin.1; \
- fi
-
dh_testdir
dh_testroot
--- 54,60 ----
***************
*** 70,77 ****
dh_installdirs
- # Add lintian exceptions
- #dh_installdirs usr/share/lintian/overrides
- #cp $(CURDIR)/debian/lintian.bin.overrides $(CURDIR)/debian/rkward/usr/share/lintian/overrides/rkward
-
# Add here commands to install the package into debian/rkward.
$(MAKE) install kde_htmldir=/usr/share/doc/kde/HTML DESTDIR=$(CURDIR)/debian/rkward
--- 62,65 ----
***************
*** 105,112 ****
# dh_installcron
# dh_installinfo
! dh_installman debian/rkward.1 debian/rkward.bin.1
dh_link
dh_strip
! #do not compress KDE HTML help
dh_compress -Xusr/share/doc/kde/HTML
dh_fixperms
--- 93,102 ----
# dh_installcron
# dh_installinfo
! dh_installman debian/rkward.1
! # Link manpage for rkward.bin to rkward
! ln -sf rkward.1.gz debian/rkward/usr/share/man/man1/rkward.bin.1.gz
dh_link
dh_strip
! # do not compress KDE HTML help
dh_compress -Xusr/share/doc/kde/HTML
dh_fixperms
***************
*** 117,123 ****
dh_shlibdeps
# unfortunately, the r-base-core dependency can not be found by dh_shlibdeps, so we need to get at the version manually
- RVERS=`dpkg-query -W -f='$${Version}' r-base-core`
@if [[ "$(RVERS)" > "2.2.1.svn37823" ]] ; then \
! echo "rvers=r-base-core (>= 2.2.1.svn37824)" >> $(CURDIR)/debian/rkward.substvars ; \
else \
echo "rvers=r-base-core (<= 2.2.1-6), r-base-core (>= 2.1.0)" >> $(CURDIR)/debian/rkward.substvars ; \
--- 107,112 ----
dh_shlibdeps
# unfortunately, the r-base-core dependency can not be found by dh_shlibdeps, so we need to get at the version manually
@if [[ "$(RVERS)" > "2.2.1.svn37823" ]] ; then \
! echo "rvers=r-base-core (>= 2.3.0)" >> $(CURDIR)/debian/rkward.substvars ; \
else \
echo "rvers=r-base-core (<= 2.2.1-6), r-base-core (>= 2.1.0)" >> $(CURDIR)/debian/rkward.substvars ; \
Index: copyright
===================================================================
RCS file: /cvsroot/rkward/rkward/debian/copyright,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** copyright 27 Apr 2005 20:57:00 -0000 1.1
--- copyright 25 Apr 2006 10:42:27 -0000 1.2
***************
*** 8,10 ****
License:
You are free to distribute this software under the terms of the GNU General Public License.
! On Debian systems, the complete text of the GNU General Public License can be found in the file `/usr/share/common-licenses/GPL'.
\ No newline at end of file
--- 8,10 ----
License:
You are free to distribute this software under the terms of the GNU General Public License.
! On Debian systems, the complete text of the GNU General Public License can be found in the file `/usr/share/common-licenses/GPL'.
Index: changelog
===================================================================
RCS file: /cvsroot/rkward/rkward/debian/changelog,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** changelog 23 Apr 2006 17:31:17 -0000 1.17
--- changelog 25 Apr 2006 10:42:26 -0000 1.18
***************
*** 1,2 ****
--- 1,18 ----
+ rkward (0.3.6-3) unstable; urgency=low
+
+ * fix detection of r-base-core dependency when compiled with r-base-core >= 2.3.0
+ * clean up rules somewhat
+
+ -- Thomas Friedrichsmeier <tfry at users.sourceforge.net> Tue, 25 Apr 2006 12:45:00 +0200
+
+ rkward (0.3.6-2) unstable; urgency=low
+
+ * link manpage directly in installation instead of debian-dir
+ * use --show-format instead of -f in call to dpkg-query (to work on stable)
+ * delete any debian/CVS subdir included by accident during clean
+ * add newline to copyright file
+
+ -- Thomas Friedrichsmeier <tfry at users.sourceforge.net> Mon, 24 Apr 2006 14:45:00 +0200
+
rkward (0.3.6-1) unstable; urgency=low
More information about the rkward-tracker
mailing list