r46268 - in /packages/scalasca/trunk/debian: changelog compat control docs patches/disabledocinstall.diff patches/series rules scalasca-examples.install scalasca.lintian-overrides scalasca.manpages

sylvestre at users.alioth.debian.org sylvestre at users.alioth.debian.org
Tue Sep 10 13:03:06 UTC 2013 

Author: sylvestre
Date: Tue Sep 10 13:03:00 2013
New Revision: 46268

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46268
Log:
* New upstream release (Closes
* Make scalasca conflicts with dvb-apps which conflicts on /usr/bin/scan
  (Closes: #704809)
* scalasca-examples removed
* hardening flags added
* manpages added
* Standards-Version updated to 3.9.4

Added:
    packages/scalasca/trunk/debian/scalasca.lintian-overrides
    packages/scalasca/trunk/debian/scalasca.manpages
Removed:
    packages/scalasca/trunk/debian/scalasca-examples.install
Modified:
    packages/scalasca/trunk/debian/changelog
    packages/scalasca/trunk/debian/compat
    packages/scalasca/trunk/debian/control
    packages/scalasca/trunk/debian/docs
    packages/scalasca/trunk/debian/patches/disabledocinstall.diff
    packages/scalasca/trunk/debian/patches/series
    packages/scalasca/trunk/debian/rules

Modified: packages/scalasca/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scalasca/trunk/debian/changelog?rev=46268&op=diff
==============================================================================
--- packages/scalasca/trunk/debian/changelog	(original)
+++ packages/scalasca/trunk/debian/changelog	Tue Sep 10 13:03:00 2013
@@ -1,6 +1,12 @@
 scalasca (2.0-1) unstable; urgency=low
 
-  * New upstream release
+  * New upstream release (Closes
+  * Make scalasca conflicts with dvb-apps which conflicts on /usr/bin/scan
+    (Closes: #704809)
+  * scalasca-examples removed
+  * hardening flags added
+  * manpages added
+  * Standards-Version updated to 3.9.4
 
  -- Sylvestre Ledru <sylvestre at debian.org>  Wed, 28 Aug 2013 10:16:40 +0200
 

Modified: packages/scalasca/trunk/debian/compat
URL: http://svn.debian.org/wsvn/debian-science/packages/scalasca/trunk/debian/compat?rev=46268&op=diff
==============================================================================
--- packages/scalasca/trunk/debian/compat	(original)
+++ packages/scalasca/trunk/debian/compat	Tue Sep 10 13:03:00 2013
@@ -1 +1 @@
-8
+9

Modified: packages/scalasca/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/scalasca/trunk/debian/control?rev=46268&op=diff
==============================================================================
--- packages/scalasca/trunk/debian/control	(original)
+++ packages/scalasca/trunk/debian/control	Tue Sep 10 13:03:00 2013
@@ -3,31 +3,19 @@
 Priority: extra
 Maintainer: Sylvestre Ledru <sylvestre at debian.org>
 Build-Depends: debhelper (>= 8.0.0), autotools-dev, mpi-default-dev,
- binutils-dev, gfortran
-Standards-Version: 3.9.3
+ binutils-dev, gfortran, help2man
+Standards-Version: 3.9.4
 Homepage: http://www.scalasca.org/
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/scalasca/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/scalasca/trunk/
 
 Package: scalasca
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, python
+Conflicts: dvb-apps
 Description: Scalable performance Analysis of Large-Scale parallel Applications
  Tool that supports the performance optimization of parallel programs by
  measuring and analyzing their runtime behavior. The analysis identifies
  potential performance bottlenecks - in particular those concerning
  communication and synchronization - and offers guidance in exploring their
  causes.
-
-
-Package: scalasca-examples
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Scalable performance Analysis of Large-Scale parallel Applications
- Tool that supports the performance optimization of parallel programs by
- measuring and analyzing their runtime behavior. The analysis identifies
- potential performance bottlenecks - in particular those concerning
- communication and synchronization - and offers guidance in exploring their
- causes.
- .
- This package contains examples.

Modified: packages/scalasca/trunk/debian/docs
URL: http://svn.debian.org/wsvn/debian-science/packages/scalasca/trunk/debian/docs?rev=46268&op=diff
==============================================================================
--- packages/scalasca/trunk/debian/docs	(original)
+++ packages/scalasca/trunk/debian/docs	Tue Sep 10 13:03:00 2013
@@ -1 +1 @@
-README.1st
+README

Modified: packages/scalasca/trunk/debian/patches/disabledocinstall.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scalasca/trunk/debian/patches/disabledocinstall.diff?rev=46268&op=diff
==============================================================================
--- packages/scalasca/trunk/debian/patches/disabledocinstall.diff	(original)
+++ packages/scalasca/trunk/debian/patches/disabledocinstall.diff	Tue Sep 10 13:03:00 2013
@@ -1,24 +1,24 @@
-Index: scalasca-1.4.2/cube-3.0/src/GUI-qt/Makefile
+Index: scalasca-2.0/Makefile.am
 ===================================================================
---- scalasca-1.4.2.orig/cube-3.0/src/GUI-qt/Makefile	2012-07-11 10:44:03.000000000 +0200
-+++ scalasca-1.4.2/cube-3.0/src/GUI-qt/Makefile	2013-01-20 22:48:50.372376334 +0100
-@@ -56,4 +56,4 @@
+--- scalasca-2.0.orig/Makefile.am	2013-08-13 12:35:53.000000000 +0200
++++ scalasca-2.0/Makefile.am	2013-09-10 11:06:36.666875148 +0200
+@@ -158,7 +158,6 @@
+ 	        rm -f $$i; \
+ 	        cd -; \
+ 	    done
+-	$(INSTALL_DATA) $(srcdir)/doc/UserGuide.pdf $(DESTDIR)$(docdir)/manual
  
- install-doc:
- 	$(MKDIR) -m 755 $(DOCDIR)/manuals
--	$(INSTALL) -c -m 644 ../../doc/CubeGuide.pdf $(DOCDIR)/manuals
-+
-Index: scalasca-1.4.2/utils/build/RealMakefile
+ endif !SVN_CONTROLLED
+ 
+Index: scalasca-2.0/Makefile.in
 ===================================================================
---- scalasca-1.4.2.orig/utils/build/RealMakefile	2012-07-11 10:43:59.000000000 +0200
-+++ scalasca-1.4.2/utils/build/RealMakefile	2013-01-20 22:48:33.184376717 +0100
-@@ -242,9 +242,6 @@
- 	$(INSTALL) -c -m 644 LICENSE                $(DOCDIR)
- 	$(INSTALL) -c -m 644 README.1st             $(DOCDIR)
- 	$(INSTALL) -c -m 644 OPEN_ISSUES            $(DOCDIR)
--	$(INSTALL) -c -m 644 doc/UserGuide.pdf      $(DOCDIR)/manuals
--	$(INSTALL) -c -m 644 doc/QuickReference.pdf $(DOCDIR)/manuals
--	$(INSTALL) -c -m 644 doc/index.html         $(DOCDIR)/html
+--- scalasca-2.0.orig/Makefile.in	2013-08-13 12:36:31.000000000 +0200
++++ scalasca-2.0/Makefile.in	2013-09-10 11:06:49.362874655 +0200
+@@ -1008,7 +1008,6 @@
+ @SVN_CONTROLLED_FALSE@	        rm -f $$i; \
+ @SVN_CONTROLLED_FALSE@	        cd -; \
+ @SVN_CONTROLLED_FALSE@	    done
+- at SVN_CONTROLLED_FALSE@	$(INSTALL_DATA) $(srcdir)/doc/UserGuide.pdf $(DESTDIR)$(docdir)/manual
  
- install-config:
- 	$(MKDIR) -m 755 ${DOCDIR}
+ @HAVE_DOXYGEN_TRUE at doxygen-covers: doxygen-manual-cover
+ 

Modified: packages/scalasca/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/scalasca/trunk/debian/patches/series?rev=46268&op=diff
==============================================================================
--- packages/scalasca/trunk/debian/patches/series	(original)
+++ packages/scalasca/trunk/debian/patches/series	Tue Sep 10 13:03:00 2013
@@ -1,3 +1 @@
-fix_security_format.diff
-FLAGS_MGMT.diff
 disabledocinstall.diff

Modified: packages/scalasca/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/scalasca/trunk/debian/rules?rev=46268&op=diff
==============================================================================
--- packages/scalasca/trunk/debian/rules	(original)
+++ packages/scalasca/trunk/debian/rules	Tue Sep 10 13:03:00 2013
@@ -1,6 +1,8 @@
 #!/usr/bin/make -f
 # Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
 
 %:
 	dh $@
@@ -12,6 +14,19 @@
 override_dh_auto_build:
 	make OPTCFLAGS="$$(dpkg-buildflags --get CFLAGS)" OPTCXXXFLAGS="-OX `dpkg-buildflags --get CXXFLAGS`" OPTFFLAGS="`dpkg-buildflags --get FFLAGS`" OPTLDFLAGS="`dpkg-buildflags --get LDFLAGS`" V=1
 
+override_dh_auto_install:
+	dh_auto_install -v --destdir=/
+	rm `find $(CURDIR)/debian/tmp -name '*.la'`
+
+override_dh_installdocs:
+	for f in otf2-config otf2-marker otf2-print otf2-snapshots salsa.mpi square; do \
+		help2man --no-discard-stderr debian/tmp/usr/bin/$$f > debian/$$f.1; \
+	done
+	for f in scalasca scan; do \
+		help2man --no-discard-stderr --help-option=-h debian/tmp/usr/bin/$$f > debian/$$f.1; \
+	done
+	dh_installdocs
+
 override_dh_clean:
-	rm -rf build-*
+	rm -rf debian/*.1
 	dh_clean

Added: packages/scalasca/trunk/debian/scalasca.lintian-overrides
URL: http://svn.debian.org/wsvn/debian-science/packages/scalasca/trunk/debian/scalasca.lintian-overrides?rev=46268&op=file
==============================================================================
--- packages/scalasca/trunk/debian/scalasca.lintian-overrides	(added)
+++ packages/scalasca/trunk/debian/scalasca.lintian-overrides	Tue Sep 10 13:03:00 2013
@@ -0,0 +1,9 @@
+scalasca: manpage-has-useless-whatis-entry usr/share/man/man1/otf2-config.1.gz
+scalasca: manpage-has-useless-whatis-entry usr/share/man/man1/otf2-marker.1.gz
+scalasca: manpage-has-useless-whatis-entry usr/share/man/man1/otf2-print.1.gz
+scalasca: manpage-has-useless-whatis-entry usr/share/man/man1/otf2-snapshots.1.gz
+scalasca: manpage-has-useless-whatis-entry usr/share/man/man1/salsa.mpi.1.gz
+scalasca: manpage-has-useless-whatis-entry usr/share/man/man1/scalasca.1.gz
+scalasca: manpage-has-useless-whatis-entry usr/share/man/man1/scan.1.gz
+scalasca: manpage-has-useless-whatis-entry usr/share/man/man1/square.1.gz
+

Added: packages/scalasca/trunk/debian/scalasca.manpages
URL: http://svn.debian.org/wsvn/debian-science/packages/scalasca/trunk/debian/scalasca.manpages?rev=46268&op=file
==============================================================================
--- packages/scalasca/trunk/debian/scalasca.manpages	(added)
+++ packages/scalasca/trunk/debian/scalasca.manpages	Tue Sep 10 13:03:00 2013
@@ -0,0 +1,9 @@
+debian/otf2-config.1
+debian/otf2-marker.1
+debian/otf2-print.1
+debian/otf2-snapshots.1
+debian/salsa.mpi.1
+debian/scalasca.1
+debian/scan.1
+debian/square.1
+

More information about the debian-science-commits mailing list