diff -u aap-1.090/debian/changelog aap-1.090/debian/changelog --- aap-1.090/debian/changelog +++ aap-1.090/debian/changelog @@ -1,3 +1,12 @@ +aap (1.090-1ubuntu1) karmic; urgency=low + + * Merge from Debian + - Fix TypeError crash (LP: #112329) + * Ubuntu remaining changes : + - debian/rules: Add and remove patches during clean to fix FTBFS. + + -- Julien Lavergne Tue, 05 May 2009 21:21:06 +0200 + aap (1.090-1) unstable; urgency=low * QA upload. @@ -17,6 +26,13 @@ -- Barry deFreese Fri, 24 Apr 2009 12:01:14 -0400 +aap (1.072-1.1ubuntu1) jaunty; urgency=low + + * Filetype.py: Rename 'as' local variable to 'ab' (argument begin), since + 'as' is a keyword in Python 2.6 (LP: #356442). + + -- Colin Watson < cjwatson@ubuntu.com> Mon, 06 Apr 2009 23:13:51 +0100 + aap (1.072-1.1) unstable; urgency=low * Non-maintainer upload. diff -u aap-1.090/debian/rules aap-1.090/debian/rules --- aap-1.090/debian/rules +++ aap-1.090/debian/rules @@ -28,15 +28,20 @@ clean: dh_testdir dh_testroot - QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2 rm -f build-stamp configure-stamp + #Patch to use the clean command of the package. + QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2 + # Add here commands to clean up after the build process. $(MAKE) clean $(MAKE) cleanALL # the above runs ./aap clean. This has the side-effect that # all .py files are compiled to pyc, which we don't want. + + #Unpatch avec clean. + QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2 rm -f *.pyc rm -rf .pc diff -u aap-1.090/debian/control aap-1.090/debian/control --- aap-1.090/debian/control +++ aap-1.090/debian/control @@ -1,7 +1,8 @@ Source: aap Section: devel Priority: optional -Maintainer: Debian QA Group +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian QA Group Build-Depends: debhelper (>> 5), quilt Build-Depends-Indep: python-dev, python-support (>= 0.4.0) Standards-Version: 3.8.1