[Python-modules-commits] r13170 - in packages/pykickstart/trunk/debian (3 files)

[fabo at users.alioth.debian.org]

    Date: Monday, May 31, 2010 @ 10:29:05
  Author: fabo
Revision: 13170

- Add 02_fix_INSTALL_NLS_DIR.diff:
  fix RPM_BUILD_ROOT usage on INSTALL_NLS_DIR.
- Cleanup debian/rules tricks to workaround RPM_BUILD_ROOT usage.

Added:
  packages/pykickstart/trunk/debian/patches/02_fix_INSTALL_NLS_DIR.diff
Modified:
  packages/pykickstart/trunk/debian/patches/series
  packages/pykickstart/trunk/debian/rules

Added: packages/pykickstart/trunk/debian/patches/02_fix_INSTALL_NLS_DIR.diff
===================================================================
--- packages/pykickstart/trunk/debian/patches/02_fix_INSTALL_NLS_DIR.diff	                        (rev 0)
+++ packages/pykickstart/trunk/debian/patches/02_fix_INSTALL_NLS_DIR.diff	2010-05-31 10:29:05 UTC (rev 13170)
@@ -0,0 +1,14 @@
+Description: fix RPM_BUILD_ROOT usage on INSTALL_NLS_DIR.
+Author: Fathi Boudra <fabo at debian.org>
+
+--- a/po/Makefile
++++ b/po/Makefile
+@@ -13,7 +13,7 @@ INSTALL_DATA	= $(INSTALL) -m 644
+ INSTALL_DIR	= /usr/bin/install -d
+ 
+ # destination directory
+-INSTALL_NLS_DIR = $(RPM_BUILD_ROOT)/usr/share/locale
++INSTALL_NLS_DIR = $(DESTDIR)/usr/share/locale
+ 
+ # PO catalog handling
+ MSGMERGE	= msgmerge -v

Modified: packages/pykickstart/trunk/debian/patches/series
===================================================================
--- packages/pykickstart/trunk/debian/patches/series	2010-05-31 09:02:29 UTC (rev 13169)
+++ packages/pykickstart/trunk/debian/patches/series	2010-05-31 10:29:05 UTC (rev 13170)
@@ -1 +1,2 @@
 01_keep_docs.diff
+02_fix_INSTALL_NLS_DIR.diff

Modified: packages/pykickstart/trunk/debian/rules
===================================================================
--- packages/pykickstart/trunk/debian/rules	2010-05-31 09:02:29 UTC (rev 13169)
+++ packages/pykickstart/trunk/debian/rules	2010-05-31 10:29:05 UTC (rev 13170)
@@ -2,17 +2,10 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
-export DESTDIR=$(CURDIR)/debian/python-pykickstart
-export RPM_BUILD_ROOT=$(DESTDIR)
 
 %:
 	dh  $@
 
-override_dh_auto_install:
-	make docs
-	python setup.py install --root=$(DESTDIR)
-	$(MAKE) -C po install
-
 get-orig-source:
 	wget http://download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/pykickstart-1.72-1.fc14.src.rpm \
 	&& rpm2cpio pykickstart-1.72-1.fc14.src.rpm |cpio -id \