r45144 - in /packages/nlopt/trunk/debian: changelog control libnlopt-dev.install patches/01_manpage_fixes.patch patches/02_spelling_fixes.patch patches/03_guile_fix_deprecated_calls.patch patches/series rules

trophime-guest at users.alioth.debian.org trophime-guest at users.alioth.debian.org
Wed Jun 27 10:04:48 UTC 2012 

Author: trophime-guest
Date: Wed Jun 27 10:04:47 2012
New Revision: 45144

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45144
Log:
revert to revision r45047

Removed:
    packages/nlopt/trunk/debian/patches/01_manpage_fixes.patch
    packages/nlopt/trunk/debian/patches/02_spelling_fixes.patch
    packages/nlopt/trunk/debian/patches/03_guile_fix_deprecated_calls.patch
Modified:
    packages/nlopt/trunk/debian/changelog
    packages/nlopt/trunk/debian/control
    packages/nlopt/trunk/debian/libnlopt-dev.install
    packages/nlopt/trunk/debian/patches/series
    packages/nlopt/trunk/debian/rules

Modified: packages/nlopt/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/nlopt/trunk/debian/changelog?rev=45144&op=diff
==============================================================================
--- packages/nlopt/trunk/debian/changelog (original)
+++ packages/nlopt/trunk/debian/changelog Wed Jun 27 10:04:47 2012
@@ -1,17 +1,3 @@
-nlopt (2.2.4+dfsg-2) unstable; urgency=low
-
-  [Sergey B Kirpichev]
-  * Add patches to get bindings runnings
-
-  * debian/control:
-        - add Sergey B Kirpichev to maintainers
-        - add dh-autoreconf to Build-Depends
-  * debian/rules:
-        - use dh_autoreconf
-        - use of dh_autotools-dev
-
- -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>  Wed, 27 Jun 2012 10:24:19 +0200
-
 nlopt (2.2.4+dfsg-1) unstable; urgency=low
 
   * Initial release (Closes: #610623)

Modified: packages/nlopt/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/nlopt/trunk/debian/control?rev=45144&op=diff
==============================================================================
--- packages/nlopt/trunk/debian/control (original)
+++ packages/nlopt/trunk/debian/control Wed Jun 27 10:04:47 2012
@@ -1,12 +1,12 @@
 Source: nlopt
 Section: devel
 Priority: extra
-Maintainer: Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>, Sergey B Kirpichev <skirpichev at gmail.com>
-Build-Depends: quilt, debhelper (>= 8), dh-autoreconf, autotools-dev, automake (>= 1.11.0), 
+Maintainer: Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>
+Build-Depends: quilt, debhelper (>= 8), autotools-dev, libtool, automake,
  gcc (>= 4.2), g++ (>= 4.2), octave-pkg-dev (>= 0.7.0), 
  python-all-dev (>= 2.6.6-3~), python-numpy, 
  guile-1.8, guile-1.8-dev
-Standards-Version: 3.9.3
+Standards-Version: 3.9.2
 X-Python-Version: >= 2.5
 Homepage: http://ab-initio.mit.edu/wiki/index.php/NLopt
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/nlopt
@@ -55,7 +55,7 @@
 Architecture: any
 Section: python
 X-Python-Version: ${python:Versions}
-Depends: libnlopt0 (= ${binary:Version}), ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}
+Depends: libnlopt0, ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}
 Provides: ${python:Provides}
 Description: python bindings for nlopt
  NLopt is a free/open-source library for nonlinear optimization, providing 
@@ -76,7 +76,7 @@
  
 Package: octave-nlopt
 Architecture: any
-Depends: libnlopt0 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}, ${octave:Depends} 
+Depends: ${misc:Depends}, ${shlibs:Depends}, ${octave:Depends} 
 Description: nlopt for octave
  NLopt is a free/open-source library for nonlinear optimization, providing 
  a common interface for a number of different free optimization routines 

Modified: packages/nlopt/trunk/debian/libnlopt-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/nlopt/trunk/debian/libnlopt-dev.install?rev=45144&op=diff
==============================================================================
--- packages/nlopt/trunk/debian/libnlopt-dev.install (original)
+++ packages/nlopt/trunk/debian/libnlopt-dev.install Wed Jun 27 10:04:47 2012
@@ -1,4 +1,3 @@
 usr/include
 usr/lib/libnlopt.so
 usr/lib/libnlopt.a
-usr/lib/pkgconfig/nlopt.pc

Modified: packages/nlopt/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/nlopt/trunk/debian/patches/series?rev=45144&op=diff
==============================================================================
--- packages/nlopt/trunk/debian/patches/series (original)
+++ packages/nlopt/trunk/debian/patches/series Wed Jun 27 10:04:47 2012
@@ -1,5 +1,2 @@
 swig.patch
 configure.patch
-02_spelling_fixes.patch
-01_manpage_fixes.patch
-03_guile_fix_deprecated_calls.patch

Modified: packages/nlopt/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/nlopt/trunk/debian/rules?rev=45144&op=diff
==============================================================================
--- packages/nlopt/trunk/debian/rules (original)
+++ packages/nlopt/trunk/debian/rules Wed Jun 27 10:04:47 2012
@@ -1,11 +1,7 @@
 #!/usr/bin/make -f
 
-export AUTOMAKE = automake1.11
-export LIBTOOLIZE = true
-	   
 
-override_dh_makeshlibs:
-	dh_makeshlibs -X/usr/lib/python2.7/dist-packages
+PYVERS := $(shell pyversions -vr debian/control)
 
 # The directories below are versioned.  We only support the packages for the
 # stable version of Octave
@@ -15,31 +11,26 @@
 BUILDDIR = $(CURDIR)/debian/build
 
 %:
-	dh $@ --buildsystem=autoconf --builddirectory=$(BUILDDIR) --with autotools_dev --with python2
+	dh $@ --buildsystem=autoconf --builddirectory=$(BUILDDIR) --with python2
 
 override_dh_auto_reconf:
-	dh_autoreconf
-	dh_autotools-dev_updateconfig
-	#[ -e bin/scripts ] || mkdir -p bin/scripts
-	#cp -f /usr/share/misc/config.guess /usr/share/misc/config.sub bin/scripts
-	#libtoolize --automake
-	#aclocal -Im4
-	#autoreconf -i
-	#automake
+	[ -e bin/scripts ] || mkdir -p bin/scripts
+	cp -f /usr/share/misc/config.guess /usr/share/misc/config.sub bin/scripts
+	libtoolize --automake
+	aclocal -Im4
+	autoreconf -i
+	automake
  
 override_dh_auto_clean:
 	for v in $(PYVERS); do \
 	   rm -rf $(BUILDDIR)$$v; \
 	done
-	dh_autoreconf_clean
-	dh_autotools-dev_restoreconfig
-	dh_auto_clean
-	#-rm bin/scripts/config.guess bin/scripts/config.sub
-	#-rm ltmain.sh octave/nlopt_optimize-oct.o m4/ltversion.m4 m4/libtool.m4 m4/ltoptions.m4 m4/lt~obsolete.m4
-	#-rm aclocal.m4
-	#-rm -rf autom4te.cache
-	#-rm configure
-	#find . -name Makefile.in | xargs -r rm 
+	-rm bin/scripts/config.guess bin/scripts/config.sub
+	-rm ltmain.sh octave/nlopt_optimize-oct.o m4/ltversion.m4 m4/libtool.m4 m4/ltoptions.m4 m4/lt~obsolete.m4
+	-rm aclocal.m4
+	-rm -rf autom4te.cache
+	-rm configure
+	find . -name Makefile.in | xargs -r rm 
 
 override_dh_auto_configure: override_dh_auto_reconf
 	for v in $(PYVERS); do \

More information about the debian-science-commits mailing list