[Python-modules-commits] r13190 - in packages/python-nids/trunk/debian (3 files)

[luciano at users.alioth.debian.org]

    Date: Monday, May 31, 2010 @ 15:58:58
  Author: luciano
Revision: 13190

python-nids: Linking with the shared library insted of the static one

Modified:
  packages/python-nids/trunk/debian/changelog
  packages/python-nids/trunk/debian/patches/01_libnids.dpatch
  packages/python-nids/trunk/debian/rules

Modified: packages/python-nids/trunk/debian/changelog
===================================================================
--- packages/python-nids/trunk/debian/changelog	2010-05-31 12:56:19 UTC (rev 13189)
+++ packages/python-nids/trunk/debian/changelog	2010-05-31 15:58:58 UTC (rev 13190)
@@ -1,3 +1,10 @@
+python-nids (0.6-2) unstable; urgency=low
+
+  * Linking with the shared library insted of the static one (closes:
+    #580723).
+
+ -- Luciano Bello <luciano at debian.org>  Mon, 31 May 2010 12:56:54 -0300
+
 python-nids (0.6-1) unstable; urgency=low
 
   * Initial release (Closes: #507718)

Modified: packages/python-nids/trunk/debian/patches/01_libnids.dpatch
===================================================================
--- packages/python-nids/trunk/debian/patches/01_libnids.dpatch	2010-05-31 12:56:19 UTC (rev 13189)
+++ packages/python-nids/trunk/debian/patches/01_libnids.dpatch	2010-05-31 15:58:58 UTC (rev 13190)
@@ -4,15 +4,15 @@
 ## DP: Use the libnids included in Debian and compile it dynamically
 
 @DPATCH@
-diff -urNad pynids-0.6~/setup.py pynids-0.6/setup.py
---- pynids-0.6~/setup.py	2010-04-22 22:02:59.000000000 -0300
-+++ pynids-0.6/setup.py	2010-04-22 22:03:41.000000000 -0300
+diff -urNad trunk~/setup.py trunk/setup.py
+--- trunk~/setup.py	2009-10-09 04:16:59.000000000 -0300
++++ trunk/setup.py	2010-05-31 12:48:36.000000000 -0300
 @@ -25,7 +25,7 @@
      NIDSDIR = BUILDDIR
      include_dirs = [ pathjoin(NIDSDIR, 'src') ]
      library_dirs = []
 -    extra_objects  = [ pathjoin(NIDSDIR, 'src', 'libnids.a') ]
-+    extra_objects  = [ '/usr/lib/libnids.a' ]
++    extra_objects  = []
  
      def buildNids(self):
          # extremely crude package builder

Modified: packages/python-nids/trunk/debian/rules
===================================================================
--- packages/python-nids/trunk/debian/rules	2010-05-31 12:56:19 UTC (rev 13189)
+++ packages/python-nids/trunk/debian/rules	2010-05-31 15:58:58 UTC (rev 13190)
@@ -8,9 +8,11 @@
 PACKAGE = python-nids
 PREFIX := debian/$(PACKAGE)/usr
 
+CFLAGS+= -lnids
+
 build: patch-stamp
 	for python in $(PYVERS); do \
-	    $$python setup.py build; \
+	    CFLAGS="$(CFLAGS)" $$python setup.py build; \
 	done
 
 clean: unpatch