diff -u lasso-2.1.98/debian/changelog lasso-2.1.98/debian/changelog --- lasso-2.1.98/debian/changelog +++ lasso-2.1.98/debian/changelog @@ -1,3 +1,13 @@ +lasso (2.1.98-4.1ubuntu1) intrepid; urgency=low + + * Merge from Debian unstable. (LP: #242497) Remaining Ubuntu changes: + + debian/control: + - Modify Maintainer value to match DebianMaintainerField spec. + + configure{,.ac}: + - Add missing quotes around the value for PHP[45]_LIBS. + + -- Stefan Ebner Sun, 25 May 2008 23:32:33 +0200 + lasso (2.1.98-4.1) unstable; urgency=high * NMU. @@ -54,6 +64,21 @@ -- Frederic Peters Tue, 25 Mar 2008 16:48:15 +0100 +lasso (2.1.1-2ubuntu1) hardy; urgency=low + + * Merge from debian unstable (LP: #134095), remaining changes: + + debian/control: + - Modify Maintainer value to match DebianMaintainerField spec. + + configure{,.ac}: + - Add missing quotes around the value for PHP[45]_LIBS. + * Fix two lintian warnings: + + debian/control: + - liblasso3-dev: Replace ${Source-Version} with ${binary:Version} + + debian/rules: + - Don't ignore a make clean error. + + -- Michael Bienia Thu, 01 Nov 2007 20:01:20 +0100 + lasso (2.1.1-2) unstable; urgency=low * debian/rules, debian/*.files: updated from dh_movefiles to dh_install @@ -69,6 +94,19 @@ -- Frederic Peters Wed, 22 Aug 2007 18:08:12 +0200 +lasso (2.0.0-1ubuntu1) gutsy; urgency=low + + * Merge from debian unstable. Remaining changes: + + debian/control: + - Modify Maintainer value to match DebianMaintainerField spec. + * debian/rules: + + Add CC=gcc-4.2 to the configure call else configure won't find jni.h + from libgcj8-dev. + * configure{,.ac}: + + Add missing quotes around the value for PHP[45]_LIBS. + + -- Michael Bienia Tue, 31 Jul 2007 21:35:26 +0200 + lasso (2.0.0-1) unstable; urgency=low * New upstream release. @@ -77,6 +115,24 @@ -- Frederic Peters Mon, 09 Jul 2007 22:55:58 +0200 +lasso (0.6.5-3ubuntu2) feisty; urgency=low + + * Don't build a php4 module anymore. + * debian/control: Rename Original-Maintainer to XSBC-Original-Maintainer. + + -- Michael Bienia Tue, 13 Mar 2007 19:46:55 +0100 + +lasso (0.6.5-3ubuntu1) feisty; urgency=low + + * Rebuild because of PHP4 API change + * debian/rules: + - changed php-config to php-config4 + * debian/control: + - Added Ubuntu MOTU Maintainer field + - Moved old Maintainer field to Original-Maintainer + + -- Stephan Hermann Tue, 6 Mar 2007 18:04:09 +0100 + lasso (0.6.5-3) unstable; urgency=low * Converted to new Python policy (merged from unreported Ubuntu patch) diff -u lasso-2.1.98/debian/control lasso-2.1.98/debian/control --- lasso-2.1.98/debian/control +++ lasso-2.1.98/debian/control @@ -1,7 +1,8 @@ Source: lasso Priority: optional Section: libs -Maintainer: Frederic Peters +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Frederic Peters Build-Depends: debhelper (>= 5.0.37.2), libxml2-dev, libxslt1-dev, libxmlsec1-dev, libxmlsec1-openssl, libglib2.0-dev, python-all-dev (>= 2.3.5-11), libexpat1-dev, fastjar, python-central (>= 0.5), gcc-4.3, java-gcj-compat [!alpha !arm !hppa !hurd-i386], gcj [!alpha !arm !hppa !hurd-i386], gcj-4.3 [!alpha !arm !hppa !hurd-i386], php5-dev, python-lxml XS-Python-Version: all Standards-Version: 3.7.2 diff -u lasso-2.1.98/debian/control.in lasso-2.1.98/debian/control.in --- lasso-2.1.98/debian/control.in +++ lasso-2.1.98/debian/control.in @@ -1,7 +1,8 @@ Source: lasso Priority: optional Section: libs -Maintainer: Frederic Peters +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Frederic Peters Build-Depends: debhelper (>= 5.0.37.2), libxml2-dev, libxslt1-dev, libxmlsec1-dev, libxmlsec1-openssl, libglib2.0-dev, python-all-dev (>= 2.3.5-11), libexpat1-dev, fastjar, python-central (>= 0.5), gcc-4.3, java-gcj-compat [!alpha !arm !hppa !hurd-i386], gcj [!alpha !arm !hppa !hurd-i386], gcj-4.3 [!alpha !arm !hppa !hurd-i386], php5-dev, python-lxml XS-Python-Version: all Standards-Version: 3.7.2 only in patch2: unchanged: --- lasso-2.1.98.orig/configure +++ lasso-2.1.98/configure @@ -22609,7 +22609,7 @@ fi PHP4_INCLUDES="-I/usr/local/include/php4 -I/usr/local/include/php4/main -I/usr/local/include/php4/Zend -I/usr/local/include/php4/TSRM -I/usr/local/include/php4/win32" PHP4_LDFLAGS= - PHP4_LIBS=-lphp4ts -lxmlparse -lxmltok + PHP4_LIBS="-lphp4ts -lxmlparse -lxmltok" PHP4_UNPREFIXED_EXTENSION_DIR= PHP4_PREFIX= fi @@ -22833,7 +22833,7 @@ fi PHP5_INCLUDES="-I/usr/local/include/php5 -I/usr/local/include/php5/main -I/usr/local/include/php5/Zend -I/usr/local/include/php5/TSRM -I/usr/local/include/php5/win32" PHP5_LDFLAGS= - PHP5_LIBS=-lphp5ts -lxmlparse -lxmltok + PHP5_LIBS="-lphp5ts -lxmlparse -lxmltok" PHP5_UNPREFIXED_EXTENSION_DIR= PHP5_PREFIX= fi only in patch2: unchanged: --- lasso-2.1.98.orig/configure.ac +++ lasso-2.1.98/configure.ac @@ -427,7 +427,7 @@ fi PHP4_INCLUDES="-I/usr/local/include/php4 -I/usr/local/include/php4/main -I/usr/local/include/php4/Zend -I/usr/local/include/php4/TSRM -I/usr/local/include/php4/win32" PHP4_LDFLAGS= - PHP4_LIBS=-lphp4ts -lxmlparse -lxmltok + PHP4_LIBS="-lphp4ts -lxmlparse -lxmltok" PHP4_UNPREFIXED_EXTENSION_DIR= PHP4_PREFIX= fi @@ -498,7 +498,7 @@ fi PHP5_INCLUDES="-I/usr/local/include/php5 -I/usr/local/include/php5/main -I/usr/local/include/php5/Zend -I/usr/local/include/php5/TSRM -I/usr/local/include/php5/win32" PHP5_LDFLAGS= - PHP5_LIBS=-lphp5ts -lxmlparse -lxmltok + PHP5_LIBS="-lphp5ts -lxmlparse -lxmltok" PHP5_UNPREFIXED_EXTENSION_DIR= PHP5_PREFIX= fi