r35856 - in /packages/libmei/trunk/debian: changelog control patches/ patches/copyPythonTest.diff rules

sylvestre-guest at users.alioth.debian.org sylvestre-guest at users.alioth.debian.org
Tue Sep 15 22:01:58 UTC 2009


Author: sylvestre-guest
Date: Tue Sep 15 22:01:58 2009
New Revision: 35856

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35856
Log:
* Patch to fix a copy issue
* right itp
* soname says 0, not 1

Added:
    packages/libmei/trunk/debian/patches/
    packages/libmei/trunk/debian/patches/copyPythonTest.diff
Modified:
    packages/libmei/trunk/debian/changelog
    packages/libmei/trunk/debian/control
    packages/libmei/trunk/debian/rules

Modified: packages/libmei/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/libmei/trunk/debian/changelog?rev=35856&op=diff
==============================================================================
--- packages/libmei/trunk/debian/changelog (original)
+++ packages/libmei/trunk/debian/changelog Tue Sep 15 22:01:58 2009
@@ -1,6 +1,6 @@
 libmei (1.0.0-1) unstable; urgency=low
 
-  * Initial release (Closes: #501614)
+  * Initial release (Closes: #546816)
 
  -- Sylvestre Ledru <sylvestre at debian.org>  Tue, 15 Sep 2009 22:53:59 +0200
 

Modified: packages/libmei/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/libmei/trunk/debian/control?rev=35856&op=diff
==============================================================================
--- packages/libmei/trunk/debian/control (original)
+++ packages/libmei/trunk/debian/control Tue Sep 15 22:01:58 2009
@@ -12,7 +12,7 @@
 Package: libmei-dev
 Section: libdevel
 Architecture: any
-Depends:  libmei1 (= ${binary:Version}), ${misc:Depends} 
+Depends:  libmei0 (= ${binary:Version}), ${misc:Depends} 
 Description: Code_Saturne Mathematical Expression Interpreter
  MEI stands for Mathematical Expression Interpreter.
  It is intended to provide interpretation of mathematical formula in a string.
@@ -22,7 +22,7 @@
  This package contains the development files needed to compile software to
  use the libmei API.
 
-Package: libmei1
+Package: libmei0
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends} 
 Description: Code_Saturne Mathematical Expression Interpreter
@@ -31,11 +31,11 @@
  It is destined to be used by scientific codes (Computational Fluid
  Dynamics).
 
-Package: libmei1-dbg
+Package: libmei0-dbg
 Section: debug
 Priority: extra
 Architecture: any
-Depends: libmei1 (= ${binary:Version}), ${misc:Depends} 
+Depends: libmei0 (= ${binary:Version}), ${misc:Depends} 
 Description: Code_Saturne Mathematical Expression Interpreter
  MEI stands for Mathematical Expression Interpreter.
  It is intended to provide interpretation of mathematical formula in a string.

Added: packages/libmei/trunk/debian/patches/copyPythonTest.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/libmei/trunk/debian/patches/copyPythonTest.diff?rev=35856&op=file
==============================================================================
--- packages/libmei/trunk/debian/patches/copyPythonTest.diff (added)
+++ packages/libmei/trunk/debian/patches/copyPythonTest.diff Tue Sep 15 22:01:58 2009
@@ -1,0 +1,171 @@
+--- mei-1.0.0.orig/pytests/Makefile.am	2009-07-27 18:26:30.000000000 +0200
++++ mei-1.0.0/pytests/Makefile.am	2009-09-15 23:14:41.000000000 +0200
+@@ -20,5 +20,5 @@
+ #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ #------------------------------------------------------------------------------
+ 
+-all:
+-	@\cp -p $(top_srcdir)/pytests/mei_test.py $(top_builddir)/pytests/mei_test.py
++#all:
++#	@\cp -p $(top_srcdir)/pytests/mei_test.py $(top_builddir)/pytests/mei_test.py
+--- mei-1.0.0.orig/pytests/Makefile.in	2009-07-28 17:17:19.000000000 +0200
++++ mei-1.0.0/pytests/Makefile.in	2009-09-15 23:52:09.000000000 +0200
+@@ -1,8 +1,9 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.11 from Makefile.am.
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
++# Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -37,8 +38,9 @@
+ #------------------------------------------------------------------------------
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkglibexecdir = $(libexecdir)/@PACKAGE@
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+@@ -58,6 +60,11 @@
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/config/ac_pkg_swig.m4 \
++	$(top_srcdir)/config/libtool.m4 \
++	$(top_srcdir)/config/ltoptions.m4 \
++	$(top_srcdir)/config/ltsugar.m4 \
++	$(top_srcdir)/config/ltversion.m4 \
++	$(top_srcdir)/config/lt~obsolete.m4 \
+ 	$(top_srcdir)/config/mei_bft.m4 \
+ 	$(top_srcdir)/config/mei_config_info.m4 \
+ 	$(top_srcdir)/config/mei_config_publ.m4 \
+@@ -66,6 +73,7 @@
+ 	$(ACLOCAL_M4)
+ mkinstalldirs = $(install_sh) -d
+ CONFIG_CLEAN_FILES =
++CONFIG_CLEAN_VPATH_FILES =
+ SOURCES =
+ DIST_SOURCES =
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+@@ -132,6 +140,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ POW_LIB = @POW_LIB@
+@@ -221,14 +230,14 @@
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+ 	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
++	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++	        && { if test -f $@; then exit 0; else break; fi; }; \
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  pytests/Makefile'; \
+-	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  pytests/Makefile
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu pytests/Makefile'; \
++	$(am__cd) $(top_srcdir) && \
++	  $(AUTOMAKE) --gnu pytests/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+@@ -246,6 +255,7 @@
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(am__aclocal_m4_deps):
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -275,13 +285,17 @@
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ 	  if test -d $$d/$$file; then \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
++	    if test -d "$(distdir)/$$file"; then \
++	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
++	    fi; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
++	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
++	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ 	    fi; \
+-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
++	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ 	  else \
+-	    test -f $(distdir)/$$file \
+-	    || cp -p $$d/$$file $(distdir)/$$file \
++	    test -f "$(distdir)/$$file" \
++	    || cp -p $$d/$$file "$(distdir)/$$file" \
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+@@ -309,6 +323,7 @@
+ 
+ distclean-generic:
+ 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -327,6 +342,8 @@
+ 
+ html: html-am
+ 
++html-am:
++
+ info: info-am
+ 
+ info-am:
+@@ -335,18 +352,28 @@
+ 
+ install-dvi: install-dvi-am
+ 
++install-dvi-am:
++
+ install-exec-am:
+ 
+ install-html: install-html-am
+ 
++install-html-am:
++
+ install-info: install-info-am
+ 
++install-info-am:
++
+ install-man:
+ 
+ install-pdf: install-pdf-am
+ 
++install-pdf-am:
++
+ install-ps: install-ps-am
+ 
++install-ps-am:
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -381,8 +408,9 @@
+ 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+ 
+ 
+-all:
+-	@\cp -p $(top_srcdir)/pytests/mei_test.py $(top_builddir)/pytests/mei_test.py
++#all:
++#	@\cp -p $(top_srcdir)/pytests/mei_test.py $(top_builddir)/pytests/mei_test.py
++
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:

Modified: packages/libmei/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/libmei/trunk/debian/rules?rev=35856&op=diff
==============================================================================
--- packages/libmei/trunk/debian/rules (original)
+++ packages/libmei/trunk/debian/rules Tue Sep 15 22:01:58 2009
@@ -3,6 +3,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_CONFIGURE_NORMAL_ARGS += --with-bft-lib=/usr/lib/ 
 




More information about the debian-science-commits mailing list