[Python-modules-commits] r4900 - in packages/enthought-chaco2/trunk/debian (changelog rules)

[morph-guest at users.alioth.debian.org]

    Date: Sunday, March 23, 2008 @ 00:03:27
  Author: morph-guest
Revision: 4900

removal in install

Modified:
  packages/enthought-chaco2/trunk/debian/changelog
  packages/enthought-chaco2/trunk/debian/rules

Modified: packages/enthought-chaco2/trunk/debian/changelog
===================================================================
--- packages/enthought-chaco2/trunk/debian/changelog	2008-03-22 23:25:32 UTC (rev 4899)
+++ packages/enthought-chaco2/trunk/debian/changelog	2008-03-23 00:03:27 UTC (rev 4900)
@@ -4,6 +4,7 @@
     - added versioned build-dep on python-central
   * debian/rules
     - fixed due to new python-central directories format (Closes: #472041)
+    - moved some removal command in install
 
  -- Sandro Tosi <matrixhasu at gmail.com>  Sat, 22 Mar 2008 23:49:50 +0100
 

Modified: packages/enthought-chaco2/trunk/debian/rules
===================================================================
--- packages/enthought-chaco2/trunk/debian/rules	2008-03-22 23:25:32 UTC (rev 4899)
+++ packages/enthought-chaco2/trunk/debian/rules	2008-03-23 00:03:27 UTC (rev 4900)
@@ -9,7 +9,7 @@
 DEB_COMPRESS_EXCLUDE		:= .py
 DEB_PYTHON_INSTALL_ARGS_ALL 	+= --single-version-externally-managed
 
-SITE_PACKAGES=$(DEB_DESTDIR)`pycentral pycentraldir python-enthought-chaco2`
+SITE_PACKAGES=$(CURDIR)/debian/python-enthought-chaco2`pycentral pycentraldir python-enthought-chaco2`
 EXAMPLES=$(DEB_DESTDIR)/usr/share/doc/python-enthought-chaco2/examples
 
 clean::
@@ -28,11 +28,10 @@
 	  DIR=`dirname $$file`; \
 	  cd $$DIR && python$* setup.py install --root $(DEB_DESTDIR); \
 	done;
+	find $(CURDIR)/debian/python-enthought-chaco2 -name 'LICENSE*' -delete
+	find $(SITE_PACKAGES) -type f | grep nspkg.pth$ | xargs $(RM)
 
 binary-predeb/python-enthought-chaco2::
-	$(RM) $(SITE_PACKAGES)/enthought/chaco2/LICENSE
-	$(RM) $(SITE_PACKAGES)/enthought/kiva/fonttools/fontTools/LICENSE.txt
-	find $(SITE_PACKAGES) -type f | grep nspkg.pth$ | xargs $(RM)
 	find $(SITE_PACKAGES) -type f | xargs sed -i '/^#!/d'
 	find $(SITE_PACKAGES) -type f | xargs chmod 644
 	find $(EXAMPLES) -type f | xargs sed -i '/^#!/d'