diff -ruNp python-aptsources-0.0.1.old/debian/changelog python-aptsources-0.0.2/debian/changelog --- python-aptsources-0.0.1.old/debian/changelog 2006-12-11 09:32:47.000000000 +0100 +++ python-aptsources-0.0.2/debian/changelog 2008-05-09 20:35:59.000000000 +0200 @@ -1,3 +1,22 @@ +python-aptsources (0.0.2) intrepid; urgency=low + + * Fix FTBFS (lp: #208097): + - setup.py: + + Fix DistUtilsExtra import. + + Fix cmdclass arguments. + - setup.cfg: + + s/l10n/i18n/g + - po/Makefile: + + Set top_srcdir variable, needed for intltool-update. + * po/Makefile, + debian/rules: + - Clean generated files after build. + * setup.py: + - Fix typo in description. + - Bump version to 0.0.2 + + -- Emilio Pozuelo Monfort Fri, 09 May 2008 20:35:35 +0200 + python-aptsources (0.0.1) feisty; urgency=low * Initial Release. diff -ruNp python-aptsources-0.0.1.old/debian/rules python-aptsources-0.0.2/debian/rules --- python-aptsources-0.0.1.old/debian/rules 2006-11-27 09:24:32.000000000 +0100 +++ python-aptsources-0.0.2/debian/rules 2008-05-09 20:30:16.000000000 +0200 @@ -8,3 +8,7 @@ DEB_PYTHON_SYSTEM=pycentral include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/python-distutils.mk + +clean:: + rm -rf build/ + make -C po clean diff -ruNp python-aptsources-0.0.1.old/po/Makefile python-aptsources-0.0.2/po/Makefile --- python-aptsources-0.0.1.old/po/Makefile 2006-11-27 09:24:32.000000000 +0100 +++ python-aptsources-0.0.2/po/Makefile 2008-05-09 20:34:36.000000000 +0200 @@ -1,9 +1,10 @@ - DOMAIN=update-manager PO_FILES := $(wildcard *.po) CONTACT=sebastian.heinlein@web.de -all: update-po +top_srcdir = .. + +all: clean update-po # update the pot $(DOMAIN).pot: @@ -21,3 +22,5 @@ merge-po: $(PO_FILES) # dummy target update-po: $(DOMAIN).pot merge-po $(patsubst %.po,%.mo,$(wildcard *.po)) +clean: + rm -rf mo/ python-aptsources.pot diff -ruNp python-aptsources-0.0.1.old/setup.cfg python-aptsources-0.0.2/setup.cfg --- python-aptsources-0.0.1.old/setup.cfg 2006-11-27 09:24:32.000000000 +0100 +++ python-aptsources-0.0.2/setup.cfg 2008-05-09 19:58:56.000000000 +0200 @@ -1,5 +1,5 @@ [build] -l10n=True +i18n=True -[build_l10n] +[build_i18n] domain=python-aptsources diff -ruNp python-aptsources-0.0.1.old/setup.py python-aptsources-0.0.2/setup.py --- python-aptsources-0.0.1.old/setup.py 2006-11-27 09:24:32.000000000 +0100 +++ python-aptsources-0.0.2/setup.py 2008-05-09 20:04:29.000000000 +0200 @@ -1,7 +1,7 @@ #!/usr/bin/env python from distutils.core import setup import glob, os, commands, sys -from DistUtilsExtra.distutils_extra import build_extra, build_l10n +from DistUtilsExtra.command import build_extra, build_i18n # Replace the leading _ that is used in the templates for translation templates = [] @@ -18,8 +18,8 @@ for template in glob.glob('data/template setup( name = 'python-aptsources', - version = '0.0.1', - description = 'Abstratcion of the sources.list', + version = '0.0.2', + description = 'Abstraction of the sources.list', packages = ['AptSources'], data_files = [('share/python-aptsources/templates', glob.glob('build/data/templates/*.info')), @@ -27,6 +27,6 @@ setup( glob.glob('data/templates/*.mirrors'))], license = 'GNU GPL', platforms = 'posix', - cmdclass = { "build" : build_extra, - "build_l10n" : build_l10n } + cmdclass = { "build" : build_extra.build_extra, + "build_i18n" : build_i18n.build_i18n } )