Author: tille
Date: 2012-05-22 09:07:44 +0000 (Tue, 22 May 2012)
New Revision: 10937
Added:
trunk/packages/cain/trunk/debian/bin/
trunk/packages/cain/trunk/debian/bin/cain
trunk/packages/cain/trunk/debian/patches/hardening.patch
Removed:
trunk/packages/cain/trunk/debian/cain.sh
trunk/packages/cain/trunk/debian/dirs
trunk/packages/cain/trunk/debian/docs
Modified:
trunk/packages/cain/trunk/debian/cain-examples.install
trunk/packages/cain/trunk/debian/cain-examples.links
trunk/packages/cain/trunk/debian/cain-solvers.install
trunk/packages/cain/trunk/debian/cain-solvers.links
trunk/packages/cain/trunk/debian/cain.install
trunk/packages/cain/trunk/debian/cain.links
trunk/packages/cain/trunk/debian/changelog
trunk/packages/cain/trunk/debian/compat
trunk/packages/cain/trunk/debian/control
trunk/packages/cain/trunk/debian/patches/cain.patch
trunk/packages/cain/trunk/debian/patches/eigen.patch
trunk/packages/cain/trunk/debian/patches/series
trunk/packages/cain/trunk/debian/rules
Log:
Try hard to get hardening applied which needs a Makefile patch and a
debian/rules rewrite; at least success in simplifying debian/rules was
approached; remaining lintian warnings might be false positives because the
build options are in effect
Copied: trunk/packages/cain/trunk/debian/bin/cain (from rev 10931,
trunk/packages/cain/trunk/debian/cain.sh)
===================================================================
--- trunk/packages/cain/trunk/debian/bin/cain (rev 0)
+++ trunk/packages/cain/trunk/debian/bin/cain 2012-05-22 09:07:44 UTC (rev
10937)
@@ -0,0 +1,3 @@
+#!/bin/sh
+mkdir -p ~/.cain
+python /usr/share/cain/Cain.py
Modified: trunk/packages/cain/trunk/debian/cain-examples.install
===================================================================
--- trunk/packages/cain/trunk/debian/cain-examples.install 2012-05-22
08:01:48 UTC (rev 10936)
+++ trunk/packages/cain/trunk/debian/cain-examples.install 2012-05-22
09:07:44 UTC (rev 10937)
@@ -1 +1 @@
-usr/share/cain/examples
+examples usr/share/cain
Modified: trunk/packages/cain/trunk/debian/cain-examples.links
===================================================================
--- trunk/packages/cain/trunk/debian/cain-examples.links 2012-05-22
08:01:48 UTC (rev 10936)
+++ trunk/packages/cain/trunk/debian/cain-examples.links 2012-05-22
09:07:44 UTC (rev 10937)
@@ -1 +1 @@
-/usr/share/cain/examples /usr/share/doc/cain-examples/examples
+usr/share/cain/examples usr/share/doc/cain-examples/examples
Modified: trunk/packages/cain/trunk/debian/cain-solvers.install
===================================================================
--- trunk/packages/cain/trunk/debian/cain-solvers.install 2012-05-22
08:01:48 UTC (rev 10936)
+++ trunk/packages/cain/trunk/debian/cain-solvers.install 2012-05-22
09:07:44 UTC (rev 10937)
@@ -1 +1 @@
-usr/lib
+solvers usr/lib/cain
Modified: trunk/packages/cain/trunk/debian/cain-solvers.links
===================================================================
--- trunk/packages/cain/trunk/debian/cain-solvers.links 2012-05-22 08:01:48 UTC
(rev 10936)
+++ trunk/packages/cain/trunk/debian/cain-solvers.links 2012-05-22 09:07:44 UTC
(rev 10937)
@@ -1 +1 @@
-/usr/lib/solvers /usr/share/cain/solvers
+/usr/lib/cain/solvers /usr/share/cain/solvers
Modified: trunk/packages/cain/trunk/debian/cain.install
===================================================================
--- trunk/packages/cain/trunk/debian/cain.install 2012-05-22 08:01:48 UTC
(rev 10936)
+++ trunk/packages/cain/trunk/debian/cain.install 2012-05-22 09:07:44 UTC
(rev 10937)
@@ -1,9 +1,9 @@
-usr/bin
-usr/include/cain
-usr/share/applications
-usr/share/cain/fio
-usr/share/cain/gui
-usr/share/cain/help
-usr/share/cain/simulation
-usr/share/cain/state
-usr/share/cain/*.py
+gui usr/share/cain
+help usr/share/cain/
+fio usr/share/cain
+src/* usr/include/cain
+simulation usr/share/cain
+state usr/share/cain
+*.py usr/share/cain/
+debian/*.desktop usr/share/applications
+debian/bin usr
Modified: trunk/packages/cain/trunk/debian/cain.links
===================================================================
--- trunk/packages/cain/trunk/debian/cain.links 2012-05-22 08:01:48 UTC (rev
10936)
+++ trunk/packages/cain/trunk/debian/cain.links 2012-05-22 09:07:44 UTC (rev
10937)
@@ -1,2 +1,2 @@
-/usr/share/cain/help /usr/share/doc/cain/help
-/usr/include/cain /usr/share/cain/src
+usr/share/cain/help usr/share/doc/cain/help
+usr/include/cain usr/share/cain/src
Deleted: trunk/packages/cain/trunk/debian/cain.sh
===================================================================
--- trunk/packages/cain/trunk/debian/cain.sh 2012-05-22 08:01:48 UTC (rev
10936)
+++ trunk/packages/cain/trunk/debian/cain.sh 2012-05-22 09:07:44 UTC (rev
10937)
@@ -1,3 +0,0 @@
-#!/bin/sh
-mkdir -p ~/.cain
-python /usr/share/cain/Cain.py
Modified: trunk/packages/cain/trunk/debian/changelog
===================================================================
--- trunk/packages/cain/trunk/debian/changelog 2012-05-22 08:01:48 UTC (rev
10936)
+++ trunk/packages/cain/trunk/debian/changelog 2012-05-22 09:07:44 UTC (rev
10937)
@@ -8,6 +8,16 @@
* debian/patches/gcc-4.7.patch: Fix build failure with GCC 4.7.
(Thanks for the patch to Matthias Klose <[email protected]>)
Closes: #672045
+ * debian/patches/*: DEP3 descriptions for patches
+ * debian/control: Standards-Version: 3.9.3 (no changes needed)
+ * debhelper 9 (control+compat)
+ * debian/{dirs,docs}: deleted because unused
+ * debian/patches/hardening.patch: Propagate hardening flags
+ * debian/rules: Rewritten to use short dh which finally cares for
+ the propagation of hardening flags (when doing so use installation
+ via direct debhelper control files: *.install)
+ * debian/cain-solvers.{install,links}: install solvers into
+ usr/lib/cain/solvers rather than usr/lib/solvers
-- Andreas Tille <[email protected]> Tue, 22 May 2012 07:59:45 +0200
Modified: trunk/packages/cain/trunk/debian/compat
===================================================================
--- trunk/packages/cain/trunk/debian/compat 2012-05-22 08:01:48 UTC (rev
10936)
+++ trunk/packages/cain/trunk/debian/compat 2012-05-22 09:07:44 UTC (rev
10937)
@@ -1 +1 @@
-7
+9
Modified: trunk/packages/cain/trunk/debian/control
===================================================================
--- trunk/packages/cain/trunk/debian/control 2012-05-22 08:01:48 UTC (rev
10936)
+++ trunk/packages/cain/trunk/debian/control 2012-05-22 09:07:44 UTC (rev
10937)
@@ -2,13 +2,14 @@
Section: science
Priority: extra
Maintainer: Debian Med Packaging Team
<[email protected]>
-Uploaders: Ivo Maintz <[email protected]>
-Build-Depends: debhelper (>= 7),
+Uploaders: Ivo Maintz <[email protected]>,
+ Andreas Tille <[email protected]>
+Build-Depends: debhelper (>= 9),
python-all-dev,
quilt,
python (<< 3.0),
libeigen2-dev
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
Homepage: http://cain.sourceforge.net
DM-Upload-Allowed: yes
Vcs-Browser: http://svn.debian.org/viewvc/debian-med/trunk/packages/cain/trunk/
Deleted: trunk/packages/cain/trunk/debian/dirs
===================================================================
Deleted: trunk/packages/cain/trunk/debian/docs
===================================================================
Modified: trunk/packages/cain/trunk/debian/patches/cain.patch
===================================================================
--- trunk/packages/cain/trunk/debian/patches/cain.patch 2012-05-22 08:01:48 UTC
(rev 10936)
+++ trunk/packages/cain/trunk/debian/patches/cain.patch 2012-05-22 09:07:44 UTC
(rev 10937)
@@ -1,28 +1,11 @@
-Description: <short summary of the patch>
- TODO: Put a short summary on the line above and replace this paragraph
- with a longer explanation of this change. Complete the meta-information
- with other relevant fields (see below for details). To make it easier, the
- information below has been extracted from the changelog. Adjust it or drop
- it.
- .
- cain (1.9-1) unstable; urgency=low
- .
- * New upstream release
+Description: Fix some build issues
+ - Propagate options into Makefile
+ - fix clean target in Makefile
+ - Add misssing header files
+ - Enable local error logging in user homedir
Author: Ivo Maintz <[email protected]>
+Date: Wed, 28 Sep 2011 12:02:11 +0200
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
--- cain-1.9.orig/Makefile
+++ cain-1.9/Makefile
@@ -2,7 +2,7 @@
Modified: trunk/packages/cain/trunk/debian/patches/eigen.patch
===================================================================
--- trunk/packages/cain/trunk/debian/patches/eigen.patch 2012-05-22
08:01:48 UTC (rev 10936)
+++ trunk/packages/cain/trunk/debian/patches/eigen.patch 2012-05-22
09:07:44 UTC (rev 10937)
@@ -1,28 +1,7 @@
-Description: <short summary of the patch>
- TODO: Put a short summary on the line above and replace this paragraph
- with a longer explanation of this change. Complete the meta-information
- with other relevant fields (see below for details). To make it easier, the
- information below has been extracted from the changelog. Adjust it or drop
- it.
- .
- cain (1.9-1) unstable; urgency=low
- .
- * New upstream release
+Description: Use Debian packaged libeigen
Author: Ivo Maintz <[email protected]>
+Date: Wed, 28 Sep 2011 12:02:11 +0200
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
--- cain-1.9.orig/src/stochastic/TauLeapingImplicit.h
+++ cain-1.9/src/stochastic/TauLeapingImplicit.h
@@ -13,8 +13,8 @@
Added: trunk/packages/cain/trunk/debian/patches/hardening.patch
===================================================================
--- trunk/packages/cain/trunk/debian/patches/hardening.patch
(rev 0)
+++ trunk/packages/cain/trunk/debian/patches/hardening.patch 2012-05-22
09:07:44 UTC (rev 10937)
@@ -0,0 +1,15 @@
+Description: Propagate hardening flags
+Author: Andreas Tille <[email protected]>
+Date: Tue, 22 May 2012 07:59:45 +0200
+
+--- cain-1.9.orig/src/solvers/Makefile
++++ cain-1.9/src/solvers/Makefile
+@@ -51,7 +51,7 @@
+ # Implicit rules.
+
+ .cc.d:
+- $(CXX) -MM $(CXXINCLUDE) $< > $@.$$$$; \
++ $(CXX) $(CPPFLAGS) -MM $(CXXFLAGS) $(LDFLAGS) $< > $@.$$$$; \
+ sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
+ $(RM) $@.$$$$
+
Modified: trunk/packages/cain/trunk/debian/patches/series
===================================================================
--- trunk/packages/cain/trunk/debian/patches/series 2012-05-22 08:01:48 UTC
(rev 10936)
+++ trunk/packages/cain/trunk/debian/patches/series 2012-05-22 09:07:44 UTC
(rev 10937)
@@ -1,3 +1,4 @@
cain.patch
eigen.patch
gcc-4.7.patch
+hardening.patch
Modified: trunk/packages/cain/trunk/debian/rules
===================================================================
--- trunk/packages/cain/trunk/debian/rules 2012-05-22 08:01:48 UTC (rev
10936)
+++ trunk/packages/cain/trunk/debian/rules 2012-05-22 09:07:44 UTC (rev
10937)
@@ -1,19 +1,25 @@
#!/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
SRC_TMP=$(CURDIR)/SRC_TMP
debtmp := $(CURDIR)/debian/tmp
-UVERSION=1_9
-VERSION=1.9
+pkg := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
+VERSION := $(shell dpkg-parsechangelog | grep Version | cut -d\ -f2 | cut -d-
-f1)
+UVERSION := $(shell dpkg-parsechangelog | grep Version | cut -d\ -f2 | cut
-d- -f1 | sed 's/\./_/g')
+
+%:
+ dh $@ --with python2
+
+override_dh_install:
+ dh_install
+ rm -f debian/$(pkg)/usr/share/cain/help/Licen*
+ find debian/$(pkg)/usr/share/cain/ -type f -executable -exec chmod 644
{} +
+
+override_dh_auto_test:
+ echo "no tests implemented"
+
get-orig-source:
rm -rf $(SRC_TMP) && mkdir $(SRC_TMP)
#[ -f ../cain_$(VERSION).zip ] || wget -O ../cain_$(VERSION).zip
http://sf.net/cain/Cain-$(UVERSION).zip # URL did not work
@@ -27,85 +33,3 @@
rm -rf $(SRC_TMP)/cain-$(VERSION)/src/third-party/*
cd $(SRC_TMP) && tar cvzf ../../cain_$(VERSION).orig.tar.gz
cain-$(VERSION)
rm -rf $(SRC_TMP)
-
-config.status: configure
- dh_testdir
-
-#build: build-stamp
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-build-stamp:
-build-stamp:
-
- # Add here commands to compile the package.
- $(MAKE)
-
- touch $@
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- # Add here commands to clean up after the build process.
- [ ! -f Makefile ] || $(MAKE) distclean
- rm -f config.sub config.guess
- rm -rf $(debtmp)
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
-
- # Add here commands to install the package into debian/cain
- mkdir -p $(debtmp)/usr/share/applications
- mkdir -p $(debtmp)/usr/bin
- mkdir -p $(debtmp)/usr/share/cain
- mkdir -p $(debtmp)/usr/lib
- mkdir -p $(debtmp)/usr/include/cain
- cp -a examples $(debtmp)/usr/share/cain/
- cp -a gui $(debtmp)/usr/share/cain
- cp -a help $(debtmp)/usr/share/cain/
- rm -f $(debtmp)/usr/share/cain/help/Licen*
- cp -a fio $(debtmp)/usr/share/cain
- cp -a src/* $(debtmp)/usr/include/cain
- cp -a simulation $(debtmp)/usr/share/cain
- cp -a solvers $(debtmp)/usr/lib/
- cp -a state $(debtmp)/usr/share/cain
- cp -a Cain.py $(debtmp)/usr/share/cain/
- cp -a resourcePath.py $(debtmp)/usr/share/cain/
- find $(debtmp)/usr/share/cain/ -type f -executable -exec chmod 644 {} +
- rm -f $(debtmp)/usr/share/cain/help/License.*
- cp -a debian/cain.desktop $(debtmp)/usr/share/applications
- cp -a debian/cain.sh $(debtmp)/usr/bin/cain
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_installexamples
- dh_install
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_makeshlibs
- dh_python2 --no-guessing-versions
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
