[DebianGIS-dev] r2511 - packages/libkml/trunk/debian

[frankie at alioth.debian.org]

Author: frankie
Date: 2009-10-02 07:44:41 +0000 (Fri, 02 Oct 2009)
New Revision: 2511

Modified:
   packages/libkml/trunk/debian/control
   packages/libkml/trunk/debian/libkml-dev.install
   packages/libkml/trunk/debian/libkml-java.install
   packages/libkml/trunk/debian/libkml0.install
   packages/libkml/trunk/debian/rules
Log:
Fixing SWIG shared libs mess


Modified: packages/libkml/trunk/debian/control
===================================================================
--- packages/libkml/trunk/debian/control	2009-10-01 16:03:41 UTC (rev 2510)
+++ packages/libkml/trunk/debian/control	2009-10-02 07:44:41 UTC (rev 2511)
@@ -39,7 +39,7 @@
  the KML library.
 
 Package: libkml-java
-Architecture: all
+Architecture: any
 Section: java
 Depends: libkml0 (= ${binary:Version}), default-jre, ${shlibs:Depends}, ${misc:Depends}
 Description: A library to manipulate KML 2.2 OGC standard files - Java package

Modified: packages/libkml/trunk/debian/libkml-dev.install
===================================================================
--- packages/libkml/trunk/debian/libkml-dev.install	2009-10-01 16:03:41 UTC (rev 2510)
+++ packages/libkml/trunk/debian/libkml-dev.install	2009-10-02 07:44:41 UTC (rev 2511)
@@ -1,5 +1,3 @@
 usr/include/
 usr/lib/lib*.so
 usr/lib/lib*.a
-usr/lib/libkml/lib*.a	usr/lib
-usr/lib/libkml/lib*.so	usr/lib

Modified: packages/libkml/trunk/debian/libkml-java.install
===================================================================
--- packages/libkml/trunk/debian/libkml-java.install	2009-10-01 16:03:41 UTC (rev 2510)
+++ packages/libkml/trunk/debian/libkml-java.install	2009-10-02 07:44:41 UTC (rev 2511)
@@ -1 +1,2 @@
 usr/share/java
+usr/lib/libkml/libkml*_swig_java*.so* usr/lib

Modified: packages/libkml/trunk/debian/libkml0.install
===================================================================
--- packages/libkml/trunk/debian/libkml0.install	2009-10-01 16:03:41 UTC (rev 2510)
+++ packages/libkml/trunk/debian/libkml0.install	2009-10-02 07:44:41 UTC (rev 2511)
@@ -1,2 +1 @@
 usr/lib/lib*.so.*
-usr/lib/libkml/lib*.so.* usr/lib

Modified: packages/libkml/trunk/debian/rules
===================================================================
--- packages/libkml/trunk/debian/rules	2009-10-01 16:03:41 UTC (rev 2510)
+++ packages/libkml/trunk/debian/rules	2009-10-02 07:44:41 UTC (rev 2511)
@@ -53,13 +53,9 @@
 binary-install/libkml-dev::
 	# removes autotools stuff
 	find $(CURDIR)/debian/libkml-dev/usr/share/doc/libkml-dev/examples -type f -name "Makefile.*" -delete
-	# removes python and java swig static libs
-	find $(CURDIR)/debian/libkml-dev/usr/lib -type f -name "libkml*_swig_*.a" -delete
+	# removes python related stuff
+	find $(CURDIR)/debian/libkml-dev/usr/lib -name "libkml*python*.so*" -delete
 
-binary-install/libkml0::
-	# removes python swig stuff
-	find $(CURDIR)/debian/libkml0/usr/lib -name "libkml*_swig_python*" -delete
-
 clean::
 	-rm -rf $(addprefix build-, $(PY_VERSIONS))
 	-rm -rf $(addprefix configure-stamp-, $(PY_VERSIONS))