[Python-modules-commits] r4438 - in packages/ll-core/trunk/debian (5 files)

[bzed at users.alioth.debian.org]

    Date: Saturday, January 26, 2008 @ 17:50:58
  Author: bzed
Revision: 4438

  - script-not-executable-fix.dpatch, ucp-python-version.dpatch: Removing
    patches, files are fixed with some sed magic in debian/rules now.

Modified:
  packages/ll-core/trunk/debian/changelog
  packages/ll-core/trunk/debian/patches/00list
  packages/ll-core/trunk/debian/rules
Deleted:
  packages/ll-core/trunk/debian/patches/script-not-executable-fix.dpatch
  packages/ll-core/trunk/debian/patches/ucp-python-version.dpatch

Modified: packages/ll-core/trunk/debian/changelog
===================================================================
--- packages/ll-core/trunk/debian/changelog	2008-01-26 16:13:19 UTC (rev 4437)
+++ packages/ll-core/trunk/debian/changelog	2008-01-26 17:50:58 UTC (rev 4438)
@@ -1,14 +1,14 @@
-ll-core (1.11.1-1) UNRELEASED; urgency=low
+ll-core (1.11.1-1) unstable; urgency=low
 
   * New upstream release.
   * debian/control:
     - Updating my email address.
     - Bumping Standards version - no change needed.
   * debian/patches:
-    - script-not-executable-fix.dpatch, ucp-python-version.dpatch: Updating
-      patches.
+    - script-not-executable-fix.dpatch, ucp-python-version.dpatch: Removing
+      patches, files are fixed with some sed magic in debian/rules now.
 
- -- Bernd Zeimetz <bzed at debian.org>  Fri, 11 Jan 2008 21:31:02 +0100
+ -- Bernd Zeimetz <bzed at debian.org>  Sat, 26 Jan 2008 18:50:47 +0100
 
 ll-core (1.10.1-2) UNRELEASED; urgency=low
 

Modified: packages/ll-core/trunk/debian/patches/00list
===================================================================
--- packages/ll-core/trunk/debian/patches/00list	2008-01-26 16:13:19 UTC (rev 4437)
+++ packages/ll-core/trunk/debian/patches/00list	2008-01-26 17:50:58 UTC (rev 4438)
@@ -1,2 +1 @@
 rm-setuptools
-ucp-python-version

Deleted: packages/ll-core/trunk/debian/patches/script-not-executable-fix.dpatch
===================================================================
--- packages/ll-core/trunk/debian/patches/script-not-executable-fix.dpatch	2008-01-26 16:13:19 UTC (rev 4437)
+++ packages/ll-core/trunk/debian/patches/script-not-executable-fix.dpatch	2008-01-26 17:50:58 UTC (rev 4438)
@@ -1,15 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## script-not-executable-fix.dpatch by Bernd Zeimetz <bzed at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad ll-core~/src/ll/__init__.py ll-core/src/ll/__init__.py
---- ll-core~/src/ll/__init__.py	2008-01-05 23:51:03.000000000 +0100
-+++ ll-core/src/ll/__init__.py	2008-01-11 17:41:33.000000000 +0100
-@@ -1,4 +1,3 @@
--#! /usr/bin/env python
- # -*- coding: utf-8 -*-
- 
- ## Copyright 1999-2008 by LivingLogic AG, Bayreuth/Germany.

Deleted: packages/ll-core/trunk/debian/patches/ucp-python-version.dpatch
===================================================================
--- packages/ll-core/trunk/debian/patches/ucp-python-version.dpatch	2008-01-26 16:13:19 UTC (rev 4437)
+++ packages/ll-core/trunk/debian/patches/ucp-python-version.dpatch	2008-01-26 17:50:58 UTC (rev 4438)
@@ -1,16 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## ucp-python-location.dpatch by Bernd Zeimetz <bernd at bzed.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: ll.core needs python2.5, not compatible to 2.4 anymore.
-
- at DPATCH@
-diff -urNad ll-core~/scripts/ucp.py ll-core/scripts/ucp.py
---- ll-core~/scripts/ucp.py	2007-12-17 18:13:53.000000000 +0100
-+++ ll-core/scripts/ucp.py	2008-01-11 17:30:14.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2.5
- # -*- coding: utf-8 -*-
- 
- import sys

Modified: packages/ll-core/trunk/debian/rules
===================================================================
--- packages/ll-core/trunk/debian/rules	2008-01-26 16:13:19 UTC (rev 4437)
+++ packages/ll-core/trunk/debian/rules	2008-01-26 17:50:58 UTC (rev 4438)
@@ -3,16 +3,20 @@
 DEB_PYTHON_SYSTEM=pysupport
 DEB_COMPRESS_EXCLUDE := .py
 
+PACKAGE := python-ll-core
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
 include /usr/share/cdbs/1/rules/dpatch.mk
 
-build/python-ll-core::
+build/$(PACKAGE)::
 	docbook-to-man debian/ucp.sgml > debian/ucp.1
 
-install/python-ll-core::
-	mv $(CURDIR)/debian/python-ll-core/usr/bin/ucp.py $(CURDIR)/debian/python-ll-core/usr/bin/ucp
-	chmod 755 $(CURDIR)/debian/python-ll-core/usr/lib/python2.5/site-packages/ll/scripts/ucp.py
+install/$(PACKAGE)::
+	mv $(CURDIR)/debian/$(PACKAGE)/usr/bin/ucp.py $(CURDIR)/debian/$(PACKAGE)/usr/bin/ucp
+	chmod 755 $(CURDIR)/debian/$(PACKAGE)/usr/lib/python*/site-packages/ll/scripts/ucp.py
+	sed -i '1s,#!.*,#!/usr/bin/python2.5,g' $(CURDIR)/debian/$(PACKAGE)/usr/lib/python*/site-packages/ll/scripts/ucp.py
+	sed -i '1s,#!.*,,g' $(CURDIR)/debian/$(PACKAGE)/usr/lib/python*/site-packages/ll/*.py
 
 clean::
 	# rm created manpage