[Python-modules-commits] r13099 - in packages/pykickstart/trunk/debian (5 files)

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

    Date: Thursday, May 27, 2010 @ 02:33:44
  Author: chaica-guest
Revision: 13099

* debian/patches
  - moved 02_keep_docs.diff to 01_keep_docs.diff
  - removed 01_fix_INSTALL_NLS_DIR.diff
* debian/patches/series
  - removed 02_keep_docs.diff entry
* debian/rules
  - redefining DESTDIR

Added:
  packages/pykickstart/trunk/debian/patches/01_keep_docs.diff
    (from rev 13098, packages/pykickstart/trunk/debian/patches/02_keep_docs.diff)
Modified:
  packages/pykickstart/trunk/debian/patches/series
  packages/pykickstart/trunk/debian/rules
Deleted:
  packages/pykickstart/trunk/debian/patches/01_fix_INSTALL_NLS_DIR.diff
  packages/pykickstart/trunk/debian/patches/02_keep_docs.diff

Deleted: packages/pykickstart/trunk/debian/patches/01_fix_INSTALL_NLS_DIR.diff
===================================================================
--- packages/pykickstart/trunk/debian/patches/01_fix_INSTALL_NLS_DIR.diff	2010-05-26 20:26:58 UTC (rev 13098)
+++ packages/pykickstart/trunk/debian/patches/01_fix_INSTALL_NLS_DIR.diff	2010-05-27 02:33:44 UTC (rev 13099)
@@ -1,14 +0,0 @@
-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

Copied: packages/pykickstart/trunk/debian/patches/01_keep_docs.diff (from rev 13098, packages/pykickstart/trunk/debian/patches/02_keep_docs.diff)
===================================================================
--- packages/pykickstart/trunk/debian/patches/01_keep_docs.diff	                        (rev 0)
+++ packages/pykickstart/trunk/debian/patches/01_keep_docs.diff	2010-05-27 02:33:44 UTC (rev 13099)
@@ -0,0 +1,14 @@
+Description: keep docs and ChangeLog. We don't want to get these files from internet.
+Author: Fathi Boudra <fabo at debian.org>
+
+--- a/Makefile
++++ b/Makefile
+@@ -29,7 +29,7 @@ test:
+ 	PYTHONPATH=. python $(TESTSUITE) -v
+ 
+ clean:
+-	-rm *.tar.gz pykickstart/*.pyc pykickstart/commands/*.pyc pykickstart/handlers/*.pyc tests/*.pyc tests/commands/*.pyc docs/* ChangeLog
++	-rm *.tar.gz pykickstart/*.pyc pykickstart/commands/*.pyc pykickstart/handlers/*.pyc tests/*.pyc tests/commands/*.pyc
+ 	$(MAKE) -C po clean
+ 	python setup.py -q clean --all
+ 

Deleted: packages/pykickstart/trunk/debian/patches/02_keep_docs.diff
===================================================================
--- packages/pykickstart/trunk/debian/patches/02_keep_docs.diff	2010-05-26 20:26:58 UTC (rev 13098)
+++ packages/pykickstart/trunk/debian/patches/02_keep_docs.diff	2010-05-27 02:33:44 UTC (rev 13099)
@@ -1,14 +0,0 @@
-Description: keep docs and ChangeLog. We don't want to get these files from internet.
-Author: Fathi Boudra <fabo at debian.org>
-
---- a/Makefile
-+++ b/Makefile
-@@ -29,7 +29,7 @@ test:
- 	PYTHONPATH=. python $(TESTSUITE) -v
- 
- clean:
--	-rm *.tar.gz pykickstart/*.pyc pykickstart/commands/*.pyc pykickstart/handlers/*.pyc tests/*.pyc tests/commands/*.pyc docs/* ChangeLog
-+	-rm *.tar.gz pykickstart/*.pyc pykickstart/commands/*.pyc pykickstart/handlers/*.pyc tests/*.pyc tests/commands/*.pyc
- 	$(MAKE) -C po clean
- 	python setup.py -q clean --all
- 

Modified: packages/pykickstart/trunk/debian/patches/series
===================================================================
--- packages/pykickstart/trunk/debian/patches/series	2010-05-26 20:26:58 UTC (rev 13098)
+++ packages/pykickstart/trunk/debian/patches/series	2010-05-27 02:33:44 UTC (rev 13099)
@@ -1,2 +1 @@
-01_fix_INSTALL_NLS_DIR.diff
-02_keep_docs.diff
+01_keep_docs.diff

Modified: packages/pykickstart/trunk/debian/rules
===================================================================
--- packages/pykickstart/trunk/debian/rules	2010-05-26 20:26:58 UTC (rev 13098)
+++ packages/pykickstart/trunk/debian/rules	2010-05-27 02:33:44 UTC (rev 13099)
@@ -2,13 +2,16 @@
 
 # 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
-	dh_auto_install
+	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 \