[Python-apps-commits] r2525 - in packages/osc/trunk/debian (7 files)

nijel at users.alioth.debian.org nijel at users.alioth.debian.org
Thu Mar 5 15:18:30 UTC 2009 

    Date: Thursday, March 5, 2009 @ 15:18:29
  Author: nijel
Revision: 2525

Switch to quilt from dpatch.

Added:
  packages/osc/trunk/debian/patches/no-shebang.patch
    (from rev 2522, packages/osc/trunk/debian/patches/01_scripts.dpatch)
  packages/osc/trunk/debian/patches/series
    (from rev 2522, packages/osc/trunk/debian/patches/00list)
Modified:
  packages/osc/trunk/debian/changelog
  packages/osc/trunk/debian/control
  packages/osc/trunk/debian/rules
Deleted:
  packages/osc/trunk/debian/patches/00list
  packages/osc/trunk/debian/patches/01_scripts.dpatch

Modified: packages/osc/trunk/debian/changelog
===================================================================
--- packages/osc/trunk/debian/changelog	2009-03-05 15:14:29 UTC (rev 2524)
+++ packages/osc/trunk/debian/changelog	2009-03-05 15:18:29 UTC (rev 2525)
@@ -2,8 +2,9 @@
 
   * New upstream version.
   * Update man page.
+  * Switch to quilt from dpatch.
 
- -- Michal ÄŒihaÅ™ <nijel at debian.org>  Thu, 05 Mar 2009 16:10:39 +0100
+ -- Michal ÄŒihaÅ™ <nijel at debian.org>  Thu, 05 Mar 2009 16:17:43 +0100
 
 osc (0.113-1) unstable; urgency=low
 

Modified: packages/osc/trunk/debian/control
===================================================================
--- packages/osc/trunk/debian/control	2009-03-05 15:14:29 UTC (rev 2524)
+++ packages/osc/trunk/debian/control	2009-03-05 15:18:29 UTC (rev 2525)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Michal ÄŒihaÅ™ <nijel at debian.org>
 Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7.0.14), dpatch
+Build-Depends: debhelper (>= 7.0.14), quilt (>= 0.40)
 Build-Depends-Indep: python-dev, python-central (>= 0.6.8)
 Standards-Version: 3.8.0
 XS-Python-Version: current

Deleted: packages/osc/trunk/debian/patches/00list
===================================================================
--- packages/osc/trunk/debian/patches/00list	2009-03-05 15:14:29 UTC (rev 2524)
+++ packages/osc/trunk/debian/patches/00list	2009-03-05 15:18:29 UTC (rev 2525)
@@ -1 +0,0 @@
-01_scripts

Deleted: packages/osc/trunk/debian/patches/01_scripts.dpatch
===================================================================
--- packages/osc/trunk/debian/patches/01_scripts.dpatch	2009-03-05 15:14:29 UTC (rev 2524)
+++ packages/osc/trunk/debian/patches/01_scripts.dpatch	2009-03-05 15:18:29 UTC (rev 2525)
@@ -1,47 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_scripts.dpatch by Michal ÄŒihaÅ™ <nijel at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Remove #! from python modules.
-
- at DPATCH@
-diff -urNad osc-0.106~/osc/build.py osc-0.106/osc/build.py
---- osc-0.106~/osc/build.py	2008-07-04 14:56:32.000000000 +0200
-+++ osc-0.106/osc/build.py	2008-07-14 08:37:57.000000000 +0200
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- 
- # Copyright (C) 2006 Peter Poeml / Novell Inc.  All rights reserved.
- # This program is free software; it may be used, copied, modified
-diff -urNad osc-0.106~/osc/cmdln.py osc-0.106/osc/cmdln.py
---- osc-0.106~/osc/cmdln.py	2007-05-16 12:55:05.000000000 +0200
-+++ osc-0.106/osc/cmdln.py	2008-07-14 08:37:57.000000000 +0200
-@@ -1,4 +1,3 @@
--#!/usr/bin/env python
- # Copyright (c) 2002-2005 ActiveState Corp.
- # License: MIT (see LICENSE.txt for license details)
- # Author:  Trent Mick (TrentM at ActiveState.com)
-diff -urNad osc-0.106~/osc/conf.py osc-0.106/osc/conf.py
---- osc-0.106~/osc/conf.py	2008-04-28 18:37:44.000000000 +0200
-+++ osc-0.106/osc/conf.py	2008-07-14 08:37:57.000000000 +0200
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- 
- # Copyright (C) 2006 Peter Poeml / Novell Inc.  All rights reserved.
- # This program is free software; it may be used, copied, modified
-diff -urNad osc-0.106~/osc/core.py osc-0.106/osc/core.py
---- osc-0.106~/osc/core.py	2008-07-11 12:42:01.000000000 +0200
-+++ osc-0.106/osc/core.py	2008-07-14 08:37:57.000000000 +0200
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- 
- # vim: sw=4 et
- 
-diff -urNad osc-0.106~/osc/fetch.py osc-0.106/osc/fetch.py
---- osc-0.106~/osc/fetch.py	2008-01-24 19:06:45.000000000 +0100
-+++ osc-0.106/osc/fetch.py	2008-07-14 08:37:57.000000000 +0200
-@@ -1,4 +1,3 @@
--#!/usr/bin/python
- 
- # Copyright (C) 2006 Peter Poeml / Novell Inc.  All rights reserved.
- # This program is free software; it may be used, copied, modified

Copied: packages/osc/trunk/debian/patches/no-shebang.patch (from rev 2522, packages/osc/trunk/debian/patches/01_scripts.dpatch)
===================================================================
--- packages/osc/trunk/debian/patches/no-shebang.patch	                        (rev 0)
+++ packages/osc/trunk/debian/patches/no-shebang.patch	2009-03-05 15:18:29 UTC (rev 2525)
@@ -0,0 +1,44 @@
+Patch by Michal ÄŒihaÅ™ <nijel at debian.org>
+
+Remove #! from python modules.
+
+diff -urNad osc-0.106~/osc/build.py osc-0.106/osc/build.py
+--- osc-0.106~/osc/build.py	2008-07-04 14:56:32.000000000 +0200
++++ osc-0.106/osc/build.py	2008-07-14 08:37:57.000000000 +0200
+@@ -1,4 +1,3 @@
+-#!/usr/bin/python
+ 
+ # Copyright (C) 2006 Peter Poeml / Novell Inc.  All rights reserved.
+ # This program is free software; it may be used, copied, modified
+diff -urNad osc-0.106~/osc/cmdln.py osc-0.106/osc/cmdln.py
+--- osc-0.106~/osc/cmdln.py	2007-05-16 12:55:05.000000000 +0200
++++ osc-0.106/osc/cmdln.py	2008-07-14 08:37:57.000000000 +0200
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ # Copyright (c) 2002-2005 ActiveState Corp.
+ # License: MIT (see LICENSE.txt for license details)
+ # Author:  Trent Mick (TrentM at ActiveState.com)
+diff -urNad osc-0.106~/osc/conf.py osc-0.106/osc/conf.py
+--- osc-0.106~/osc/conf.py	2008-04-28 18:37:44.000000000 +0200
++++ osc-0.106/osc/conf.py	2008-07-14 08:37:57.000000000 +0200
+@@ -1,4 +1,3 @@
+-#!/usr/bin/python
+ 
+ # Copyright (C) 2006 Peter Poeml / Novell Inc.  All rights reserved.
+ # This program is free software; it may be used, copied, modified
+diff -urNad osc-0.106~/osc/core.py osc-0.106/osc/core.py
+--- osc-0.106~/osc/core.py	2008-07-11 12:42:01.000000000 +0200
++++ osc-0.106/osc/core.py	2008-07-14 08:37:57.000000000 +0200
+@@ -1,4 +1,3 @@
+-#!/usr/bin/python
+ 
+ # vim: sw=4 et
+ 
+diff -urNad osc-0.106~/osc/fetch.py osc-0.106/osc/fetch.py
+--- osc-0.106~/osc/fetch.py	2008-01-24 19:06:45.000000000 +0100
++++ osc-0.106/osc/fetch.py	2008-07-14 08:37:57.000000000 +0200
+@@ -1,4 +1,3 @@
+-#!/usr/bin/python
+ 
+ # Copyright (C) 2006 Peter Poeml / Novell Inc.  All rights reserved.
+ # This program is free software; it may be used, copied, modified

Copied: packages/osc/trunk/debian/patches/series (from rev 2522, packages/osc/trunk/debian/patches/00list)
===================================================================
--- packages/osc/trunk/debian/patches/series	                        (rev 0)
+++ packages/osc/trunk/debian/patches/series	2009-03-05 15:18:29 UTC (rev 2525)
@@ -0,0 +1 @@
+no-shebang.patch

Modified: packages/osc/trunk/debian/rules
===================================================================
--- packages/osc/trunk/debian/rules	2009-03-05 15:14:29 UTC (rev 2524)
+++ packages/osc/trunk/debian/rules	2009-03-05 15:18:29 UTC (rev 2525)
@@ -9,11 +9,11 @@
 VERSION = $(shell dpkg-parsechangelog | grep Version | sed "s/Version: //")
 UPSTREAM_VERSION = $(shell echo $(VERSION) | sed 's/\([^-].*\)-.*/\1/')
 
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
 
 build: build-stamp
 
-build-stamp: patch-stamp
+build-stamp: $(QUILT_STAMPFN)
 	dh build
 	touch $@

More information about the Python-apps-commits mailing list