rev 12636 - in trunk/packages/kdevelop/debian: . patches

[Jeremy Lainé]

Author: sharky
Date: 2008-11-14 23:41:21 +0000 (Fri, 14 Nov 2008)
New Revision: 12636

Added:
   trunk/packages/kdevelop/debian/patches/02_no_builtin_antlr.diff
Removed:
   trunk/packages/kdevelop/debian/patches/02_antlr_gcc4.4.diff
Modified:
   trunk/packages/kdevelop/debian/changelog
   trunk/packages/kdevelop/debian/control
Log:
Use libantlr-dev instead of shipped copy


Modified: trunk/packages/kdevelop/debian/changelog
===================================================================
--- trunk/packages/kdevelop/debian/changelog	2008-11-14 14:27:06 UTC (rev 12635)
+++ trunk/packages/kdevelop/debian/changelog	2008-11-14 23:41:21 UTC (rev 12636)
@@ -1,6 +1,6 @@
-kdevelop (4:3.5.3-2) UNRELEASED; urgency=low
+kdevelop (4:3.5.3-2) unstable; urgency=low
 
-  * Apply patch from Martin Michlmayr for GCC 4.4 FTBFS (Closes: #505615).
+  * Use libantlr-dev instead of shipped copy (Closes: #505595, #505615).
 
  -- Jeremy Lainé <jeremy.laine at m4x.org>  Fri, 14 Nov 2008 15:25:54 +0100
 

Modified: trunk/packages/kdevelop/debian/control
===================================================================
--- trunk/packages/kdevelop/debian/control	2008-11-14 14:27:06 UTC (rev 12635)
+++ trunk/packages/kdevelop/debian/control	2008-11-14 23:41:21 UTC (rev 12636)
@@ -2,7 +2,7 @@
 Section: kde
 Priority: optional
 Maintainer: Jeremy Lainé <jeremy.laine at m4x.org>
-Build-Depends: cdbs (>= 0.4.38), debhelper (>= 5), autoconf, automake, qt3-apps-dev, kdelibs4-dev (>= 4:3.5.8), gettext, kdelibs4-doc, qt3-doc, flex, libdb-dev, python2.4, libcvsservice-dev (>= 4:3.5.8), groff-base, libsvn-dev
+Build-Depends: cdbs (>= 0.4.38), debhelper (>= 5), autoconf, automake, qt3-apps-dev, kdelibs4-dev (>= 4:3.5.8), gettext, kdelibs4-doc, qt3-doc, flex, libdb-dev, python2.4, libcvsservice-dev (>= 4:3.5.8), groff-base, libsvn-dev, libantlr-dev
 Standards-Version: 3.8.0
 Homepage: http://www.kdevelop.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-kde/trunk/packages/kdevelop

Deleted: trunk/packages/kdevelop/debian/patches/02_antlr_gcc4.4.diff

Added: trunk/packages/kdevelop/debian/patches/02_no_builtin_antlr.diff
===================================================================
--- trunk/packages/kdevelop/debian/patches/02_no_builtin_antlr.diff	                        (rev 0)
+++ trunk/packages/kdevelop/debian/patches/02_no_builtin_antlr.diff	2008-11-14 23:41:21 UTC (rev 12636)
@@ -0,0 +1,72 @@
+diff -urN kdevelop-3.5.3/languages/ada/Makefile.am kdevelop-3.5.3.noantlr/languages/ada/Makefile.am
+--- kdevelop-3.5.3/languages/ada/Makefile.am	2005-09-10 10:22:38.000000000 +0200
++++ kdevelop-3.5.3.noantlr/languages/ada/Makefile.am	2008-11-14 15:32:53.000000000 +0100
+@@ -1,7 +1,7 @@
+ # 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
+@@ -9,7 +9,7 @@
+ 
+ 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
+ 
+diff -urN kdevelop-3.5.3/languages/java/Makefile.am kdevelop-3.5.3.noantlr/languages/java/Makefile.am
+--- kdevelop-3.5.3/languages/java/Makefile.am	2007-05-14 09:41:15.000000000 +0200
++++ kdevelop-3.5.3.noantlr/languages/java/Makefile.am	2008-11-14 15:34:10.000000000 +0100
+@@ -5,14 +5,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 \
+diff -urN kdevelop-3.5.3/languages/pascal/Makefile.am kdevelop-3.5.3.noantlr/languages/pascal/Makefile.am
+--- kdevelop-3.5.3/languages/pascal/Makefile.am	2005-09-10 10:22:40.000000000 +0200
++++ kdevelop-3.5.3.noantlr/languages/pascal/Makefile.am	2008-11-14 15:33:38.000000000 +0100
+@@ -1,13 +1,13 @@
+ 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
+ 
+diff -urN kdevelop-3.5.3/lib/Makefile.am kdevelop-3.5.3.noantlr/lib/Makefile.am
+--- kdevelop-3.5.3/lib/Makefile.am	2007-05-14 09:41:13.000000000 +0200
++++ kdevelop-3.5.3.noantlr/lib/Makefile.am	2008-11-14 15:29:54.000000000 +0100
+@@ -16,7 +16,7 @@
+ 
+ 
+ 
+-SUBDIRS = util interfaces widgets antlr catalog \
++SUBDIRS = util interfaces widgets catalog \
+ 	cppparser astyle 
+ 
+ DOXYGEN_EMPTY = YES