tags 546961 + pending tags 562410 + pending thanks Dear maintainer, I've prepared an NMU for kdevelop (versioned as 4:3.5.5-1.1) and I will upload it soon to DELAYED/2. Please feel free to tell me if I should delay it longer. -- Jakub Wilk
diff -u kdevelop-3.5.5/debian/changelog kdevelop-3.5.5/debian/changelog --- kdevelop-3.5.5/debian/changelog +++ kdevelop-3.5.5/debian/changelog @@ -1,3 +1,13 @@ +kdevelop (4:3.5.5-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Build-depend on libdb4.8-dev, rather than on libdb4.7-dev. + * Build-depend on python, rather than on python2.4 (Closes: #546961). + * 02_no_builtin_antlr.diff: patch both Makefile.am and Makefile.in, as the latter + are not regenerated during a build (Closes: #562410) + + -- Jakub Wilk <ubanus@users.sf.net> Tue, 12 Jan 2010 22:13:05 +0100 + kdevelop (4:3.5.5-1) unstable; urgency=low * New upstream release. diff -u kdevelop-3.5.5/debian/control kdevelop-3.5.5/debian/control --- kdevelop-3.5.5/debian/control +++ kdevelop-3.5.5/debian/control @@ -4,8 +4,8 @@ Maintainer: Jeremy Lainé <jeremy.laine@m4x.org> Build-Depends: quilt, cdbs (>= 0.4.52), debhelper (>= 7), automake1.10, flex, gettext, graphviz, groff-base, kdelibs4-dev (>= 4:3.5.8), kdelibs4-doc, - libantlr-dev, libdb4.7-dev, libneon27-gnutls-dev, libserf-0-0-dev, libsvn-dev, - python2.4, qt3-apps-dev, qt3-doc + libantlr-dev, libdb4.8-dev, libneon27-gnutls-dev, libserf-0-0-dev, libsvn-dev, + python, qt3-apps-dev, qt3-doc Standards-Version: 3.8.3 Homepage: http://www.kdevelop.org/ Vcs-Svn: svn://svn.debian.org/svn/pkg-kde/trunk/packages/kdevelop diff -u kdevelop-3.5.5/debian/patches/02_no_builtin_antlr.diff kdevelop-3.5.5/debian/patches/02_no_builtin_antlr.diff --- kdevelop-3.5.5/debian/patches/02_no_builtin_antlr.diff +++ kdevelop-3.5.5/debian/patches/02_no_builtin_antlr.diff @@ -68,0 +69,95 @@ +--- a/languages/ada/Makefile.in ++++ b/languages/ada/Makefile.in +@@ -56,8 +56,7 @@ + kde_moduleLTLIBRARIES_INSTALL = $(INSTALL) + LTLIBRARIES = $(kde_module_LTLIBRARIES) + libkdevadasupport_la_DEPENDENCIES = \ +- $(top_builddir)/lib/libkdevelop.la \ +- $(top_builddir)/lib/antlr/src/libantlr.la ++ $(top_builddir)/lib/libkdevelop.la + am_libkdevadasupport_la_OBJECTS = adasupportpart.lo problemreporter.lo \ + backgroundparser.lo addclass.lo ada_utils.lo adasupport.lo \ + AdaLexer.lo AdaParser.lo AdaTreeParserSuper.lo \ +@@ -394,14 +393,14 @@ + + # Here resides the Ada support part. + KDE_CXXFLAGS = $(USE_EXCEPTIONS) +-INCLUDES = -I$(top_srcdir)/lib/antlr -I$(top_srcdir)/lib/interfaces \ ++INCLUDES = -I$(top_srcdir)/lib/interfaces \ + -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/interfaces/external -I$(top_srcdir)/lib/util \ + $(all_includes) + + SUBDIRS = app_templates file_templates doc + kde_module_LTLIBRARIES = libkdevadasupport.la + libkdevadasupport_la_LDFLAGS = $(LEXLIB) $(all_libraries) $(KDE_PLUGIN) +-libkdevadasupport_la_LIBADD = $(top_builddir)/lib/libkdevelop.la $(top_builddir)/lib/antlr/src/libantlr.la ++libkdevadasupport_la_LIBADD = $(top_builddir)/lib/libkdevelop.la -lantlr-pic + #>- libkdevadasupport_la_SOURCES = adasupportpart.cpp problemreporter.cpp backgroundparser.cpp addclassdlg.ui addclass.cpp configproblemreporter.ui ada_utils.cpp adasupport.cpp AdaLexer.cpp AdaParser.cpp AdaTreeParserSuper.cpp AdaStoreWalker.cpp + #>+ 1 + libkdevadasupport_la_SOURCES=adasupportpart.cpp problemreporter.cpp backgroundparser.cpp addclass.cpp ada_utils.cpp adasupport.cpp AdaLexer.cpp AdaParser.cpp AdaTreeParserSuper.cpp AdaStoreWalker.cpp addclassdlg.cpp configproblemreporter.cpp +--- a/languages/java/Makefile.in ++++ b/languages/java/Makefile.in +@@ -59,7 +59,6 @@ + LTLIBRARIES = $(kde_module_LTLIBRARIES) + libkdevjavasupport_la_DEPENDENCIES = \ + $(top_builddir)/lib/libkdevelop.la \ +- $(top_builddir)/lib/antlr/src/libantlr.la \ + $(top_builddir)/lib/catalog/libkdevcatalog.la + am_libkdevjavasupport_la_OBJECTS = JavaLexer.lo \ + KDevJavaSupportIface.lo javasupportfactory.lo \ +@@ -403,14 +402,14 @@ + + # SUBDIRS = templates subclassing_template newclass_templates file_templates + SUBDIRS = file_templates app_templates doc +-INCLUDES = -I$(top_srcdir)/lib/antlr -I$(top_srcdir)/lib/catalog \ ++INCLUDES = -I$(top_srcdir)/lib/catalog \ + -I$(top_srcdir)/lib/compat -I$(top_srcdir)/lib/interfaces \ + -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/interfaces/external -I$(top_srcdir)/lib/util \ + $(all_includes) + + kde_module_LTLIBRARIES = libkdevjavasupport.la + libkdevjavasupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +-libkdevjavasupport_la_LIBADD = $(top_builddir)/lib/libkdevelop.la $(top_builddir)/lib/antlr/src/libantlr.la $(top_builddir)/lib/catalog/libkdevcatalog.la ++libkdevjavasupport_la_LIBADD = $(top_builddir)/lib/libkdevelop.la $(top_builddir)/lib/catalog/libkdevcatalog.la -lantlr-pic + #>- libkdevjavasupport_la_SOURCES = JavaLexer.cpp KDevJavaSupportIface.cpp javasupportfactory.cpp \ + #>- JavaRecognizer.cpp backgroundparser.cpp configproblemreporter.ui javasupportpart.cpp \ + #>- JavaStoreWalker.cpp javasupport_utils.cpp problemreporter.cpp driver.cpp kdevdriver.cpp KDevJavaSupportIface.skel +diff --git a/languages/pascal/Makefile.in b/languages/pascal/Makefile.in +--- a/languages/pascal/Makefile.in ++++ b/languages/pascal/Makefile.in +@@ -57,7 +57,6 @@ + LTLIBRARIES = $(kde_module_LTLIBRARIES) + libkdevpascalsupport_la_DEPENDENCIES = \ + $(top_builddir)/lib/libkdevelop.la \ +- $(top_builddir)/lib/antlr/src/libantlr.la \ + $(top_builddir)/lib/catalog/libkdevcatalog.la + am_libkdevpascalsupport_la_OBJECTS = pascalsupport_part.lo \ + PascalLexer.lo PascalParser.lo PascalStoreWalker.lo \ +@@ -398,14 +397,14 @@ + xdg_directorydir = @xdg_directorydir@ + xdg_menudir = @xdg_menudir@ + KDE_CXXFLAGS = $(USE_EXCEPTIONS) +-INCLUDES = -I$(top_srcdir)/lib/antlr -I$(top_srcdir)/lib/catalog \ ++INCLUDES = -I$(top_srcdir)/lib/catalog \ + -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/external -I$(top_srcdir)/lib/util \ + $(all_includes) + + SUBDIRS = file_templates app_templates compiler doc + kde_module_LTLIBRARIES = libkdevpascalsupport.la + libkdevpascalsupport_la_LDFLAGS = $(LEXLIB) $(all_libraries) $(KDE_PLUGIN) +-libkdevpascalsupport_la_LIBADD = $(top_builddir)/lib/libkdevelop.la $(top_builddir)/lib/antlr/src/libantlr.la $(top_builddir)/lib/catalog/libkdevcatalog.la ++libkdevpascalsupport_la_LIBADD = $(top_builddir)/lib/libkdevelop.la $(top_builddir)/lib/catalog/libkdevcatalog.la -lantlr-pic + #>- libkdevpascalsupport_la_SOURCES = pascalsupport_part.cpp PascalLexer.cpp PascalParser.cpp PascalStoreWalker.cpp backgroundparser.cpp configproblemreporter.ui problemreporter.cpp + #>+ 1 + libkdevpascalsupport_la_SOURCES=pascalsupport_part.cpp PascalLexer.cpp PascalParser.cpp PascalStoreWalker.cpp backgroundparser.cpp problemreporter.cpp configproblemreporter.cpp +--- a/lib/Makefile.in ++++ b/lib/Makefile.in +@@ -398,7 +398,7 @@ + # $(top_builddir)/lib/interfaces/external/libkinterfacedesigner.la $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la \ + # -lktexteditor $(LIB_KPARTS) $(LIB_KIO) -lkscript + libkdevelop_la_SOURCES = dummy.cpp +-SUBDIRS = util interfaces widgets antlr catalog \ ++SUBDIRS = util interfaces widgets catalog \ + cppparser astyle + + DOXYGEN_EMPTY = YES
Attachment:
signature.asc
Description: Digital signature