[Python-apps-commits] r3653 - in packages/lfm/trunk/debian (10 files)
dktrkranz at users.alioth.debian.org
dktrkranz at users.alioth.debian.org
Tue Sep 1 22:14:43 UTC 2009
Date: Tuesday, September 1, 2009 @ 22:14:42
Author: dktrkranz
Revision: 3653
Switch to debhelper 7 and quilt
Added:
packages/lfm/trunk/debian/links
packages/lfm/trunk/debian/patches/curs_set.patch
packages/lfm/trunk/debian/patches/ignore_COPYING.patch
packages/lfm/trunk/debian/patches/series
Modified:
packages/lfm/trunk/debian/changelog
packages/lfm/trunk/debian/control
packages/lfm/trunk/debian/rules
Deleted:
packages/lfm/trunk/debian/patches/01_ignore_COPYING.patch
packages/lfm/trunk/debian/patches/02_curs_set.patch
packages/lfm/trunk/debian/pycompat
Modified: packages/lfm/trunk/debian/changelog
===================================================================
--- packages/lfm/trunk/debian/changelog 2009-09-01 21:38:49 UTC (rev 3652)
+++ packages/lfm/trunk/debian/changelog 2009-09-01 22:14:42 UTC (rev 3653)
@@ -1,9 +1,10 @@
lfm (2.1-2) UNRELEASED; urgency=low
* Update my e-mail address.
+ * Switch to debhelper 7 and quilt.
* Bump Standards-Version to 3.8.3, no changes required.
- -- Luca Falavigna <dktrkranz at debian.org> Tue, 01 Sep 2009 23:38:37 +0200
+ -- Luca Falavigna <dktrkranz at debian.org> Tue, 01 Sep 2009 23:53:25 +0200
lfm (2.1-1) unstable; urgency=low
Modified: packages/lfm/trunk/debian/control
===================================================================
--- packages/lfm/trunk/debian/control 2009-09-01 21:38:49 UTC (rev 3652)
+++ packages/lfm/trunk/debian/control 2009-09-01 22:14:42 UTC (rev 3653)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Luca Falavigna <dktrkranz at debian.org>
Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7.0.2), cdbs (>=0.4.49), python (>= 2.4)
+Build-Depends: debhelper (>= 7.0.50~), python (>= 2.4), quilt (>= 0.46-7)
Build-Depends-Indep: python-support (>= 0.5.3)
Homepage: http://www.terra.es/personal7/inigoserna/lfm/
Vcs-Svn: svn://svn.debian.org/python-apps/packages/lfm/trunk/
Added: packages/lfm/trunk/debian/links
===================================================================
--- packages/lfm/trunk/debian/links (rev 0)
+++ packages/lfm/trunk/debian/links 2009-09-01 22:14:42 UTC (rev 3653)
@@ -0,0 +1,2 @@
+usr/share/lfm/pyview usr/bin/pyview
+usr/share/lfm/lfm.py usr/bin/lfm
Deleted: packages/lfm/trunk/debian/patches/01_ignore_COPYING.patch
===================================================================
--- packages/lfm/trunk/debian/patches/01_ignore_COPYING.patch 2009-09-01 21:38:49 UTC (rev 3652)
+++ packages/lfm/trunk/debian/patches/01_ignore_COPYING.patch 2009-09-01 22:14:42 UTC (rev 3653)
@@ -1,36 +0,0 @@
-Do not install COPYING file and remove its references from lfm.
-
-diff -Nur -x '*.orig' -x '*~' lfm-2.1/lfm/actions.py lfm-2.1.new/lfm/actions.py
---- lfm-2.1/lfm/actions.py 2008-12-20 22:12:26.000000000 +0100
-+++ lfm-2.1.new/lfm/actions.py 2009-04-07 23:04:18.000000000 +0200
-@@ -681,8 +681,7 @@
- 'v Readme pyview',
- 'n News',
- 't Todo',
-- 'c ChangeLog',
-- 'l License' ]
-+ 'c ChangeLog' ]
- cmd = messages.MenuWin('Help Menu', menu).run()
- if cmd == -1:
- return
-@@ -690,7 +689,7 @@
- curses.endwin()
- docdir = os.path.join(sys.exec_prefix, 'share/doc/lfm')
- docfile = { 'r': 'README', 'v': 'README.pyview', 'n': 'NEWS', 't': 'TODO',
-- 'c': 'ChangeLog', 'l': 'COPYING' }.get(cmd)
-+ 'c': 'ChangeLog' }.get(cmd)
- fullfilename = os.path.join(docdir, docfile)
- os.system('%s \"%s\"' % (app.prefs.progs['pager'], fullfilename))
- curses.curs_set(0)
-diff -Nur -x '*.orig' -x '*~' lfm-2.1/setup.py lfm-2.1.new/setup.py
---- lfm-2.1/setup.py 2008-12-20 22:47:17.000000000 +0100
-+++ lfm-2.1.new/setup.py 2009-04-07 23:04:26.000000000 +0200
-@@ -10,7 +10,7 @@
- import sys
-
-
--DOC_FILES = ['COPYING', 'README', 'README.pyview', 'NEWS', 'TODO', 'ChangeLog']
-+DOC_FILES = ['README', 'README.pyview', 'NEWS', 'TODO', 'ChangeLog']
- MAN_FILES = ['lfm.1', 'pyview.1']
-
- classifiers = """\
Deleted: packages/lfm/trunk/debian/patches/02_curs_set.patch
===================================================================
--- packages/lfm/trunk/debian/patches/02_curs_set.patch 2009-09-01 21:38:49 UTC (rev 3652)
+++ packages/lfm/trunk/debian/patches/02_curs_set.patch 2009-09-01 22:14:42 UTC (rev 3653)
@@ -1,41 +0,0 @@
-Catch exceptions if curs_set attribute is not available.
-
-diff -Nur -x '*.orig' -x '*~' lfm-2.1/lfm/pyview.py lfm-2.1.new/lfm/pyview.py
---- lfm-2.1/lfm/pyview.py 2008-12-20 22:48:22.000000000 +0100
-+++ lfm-2.1.new/lfm/pyview.py 2009-04-07 23:41:02.000000000 +0200
-@@ -116,7 +116,10 @@
- def init_curses(self):
- curses.cbreak()
- curses.raw()
-- curses.curs_set(0)
-+ try:
-+ curses.curs_set(0)
-+ except:
-+ pass
- try:
- self.win_title = curses.newwin(1, 0, 0, 0)
- self.win_body = curses.newwin(app.maxh-2, 0, 1, 0) # h, w, y, x
-@@ -253,7 +256,10 @@
- self.maxh, self.maxw = self.win.getmaxyx()
- curses.cbreak()
- curses.raw()
-- curses.curs_set(0)
-+ try:
-+ curses.curs_set(0)
-+ except:
-+ pass
- try:
- self.win_title = curses.newwin(1, 0, 0, 0)
- self.win_file = curses.newwin(self.maxh-2, 0, 1, 0) # h, w, y, x
-@@ -924,7 +930,10 @@
- os.system('sh')
- else:
- os.system('cd \"%s\"; sh' % os.path.dirname(self.file))
-- curses.curs_set(0)
-+ try:
-+ curses.curs_set(0)
-+ except:
-+ pass
- self.show()
-
- # help
Added: packages/lfm/trunk/debian/patches/curs_set.patch
===================================================================
--- packages/lfm/trunk/debian/patches/curs_set.patch (rev 0)
+++ packages/lfm/trunk/debian/patches/curs_set.patch 2009-09-01 22:14:42 UTC (rev 3653)
@@ -0,0 +1,43 @@
+Description: Catch exceptions if curs_set attribute is not available.
+Origin: Debian
+
+Index: lfm-2.1/lfm/pyview.py
+===================================================================
+--- lfm-2.1.orig/lfm/pyview.py 2009-09-01 23:47:12.280694870 +0200
++++ lfm-2.1/lfm/pyview.py 2009-09-01 23:47:08.064693814 +0200
+@@ -116,7 +116,10 @@
+ def init_curses(self):
+ curses.cbreak()
+ curses.raw()
+- curses.curs_set(0)
++ try:
++ curses.curs_set(0)
++ except:
++ pass
+ try:
+ self.win_title = curses.newwin(1, 0, 0, 0)
+ self.win_body = curses.newwin(app.maxh-2, 0, 1, 0) # h, w, y, x
+@@ -253,7 +256,10 @@
+ self.maxh, self.maxw = self.win.getmaxyx()
+ curses.cbreak()
+ curses.raw()
+- curses.curs_set(0)
++ try:
++ curses.curs_set(0)
++ except:
++ pass
+ try:
+ self.win_title = curses.newwin(1, 0, 0, 0)
+ self.win_file = curses.newwin(self.maxh-2, 0, 1, 0) # h, w, y, x
+@@ -924,7 +930,10 @@
+ os.system('sh')
+ else:
+ os.system('cd \"%s\"; sh' % os.path.dirname(self.file))
+- curses.curs_set(0)
++ try:
++ curses.curs_set(0)
++ except:
++ pass
+ self.show()
+
+ # help
Added: packages/lfm/trunk/debian/patches/ignore_COPYING.patch
===================================================================
--- packages/lfm/trunk/debian/patches/ignore_COPYING.patch (rev 0)
+++ packages/lfm/trunk/debian/patches/ignore_COPYING.patch 2009-09-01 22:14:42 UTC (rev 3653)
@@ -0,0 +1,40 @@
+Description: Do not install COPYING file and remove its references from lfm.
+Origin: Debian
+Forwarded: not-needed
+
+Index: lfm-2.1/lfm/actions.py
+===================================================================
+--- lfm-2.1.orig/lfm/actions.py 2009-09-01 23:46:40.684692928 +0200
++++ lfm-2.1/lfm/actions.py 2009-09-01 23:46:37.224686175 +0200
+@@ -681,8 +681,7 @@
+ 'v Readme pyview',
+ 'n News',
+ 't Todo',
+- 'c ChangeLog',
+- 'l License' ]
++ 'c ChangeLog' ]
+ cmd = messages.MenuWin('Help Menu', menu).run()
+ if cmd == -1:
+ return
+@@ -690,7 +689,7 @@
+ curses.endwin()
+ docdir = os.path.join(sys.exec_prefix, 'share/doc/lfm')
+ docfile = { 'r': 'README', 'v': 'README.pyview', 'n': 'NEWS', 't': 'TODO',
+- 'c': 'ChangeLog', 'l': 'COPYING' }.get(cmd)
++ 'c': 'ChangeLog' }.get(cmd)
+ fullfilename = os.path.join(docdir, docfile)
+ os.system('%s \"%s\"' % (app.prefs.progs['pager'], fullfilename))
+ curses.curs_set(0)
+Index: lfm-2.1/setup.py
+===================================================================
+--- lfm-2.1.orig/setup.py 2009-09-01 23:46:40.924694417 +0200
++++ lfm-2.1/setup.py 2009-09-01 23:46:37.224686175 +0200
+@@ -10,7 +10,7 @@
+ import sys
+
+
+-DOC_FILES = ['COPYING', 'README', 'README.pyview', 'NEWS', 'TODO', 'ChangeLog']
++DOC_FILES = ['README', 'README.pyview', 'NEWS', 'TODO', 'ChangeLog']
+ MAN_FILES = ['lfm.1', 'pyview.1']
+
+ classifiers = """\
Added: packages/lfm/trunk/debian/patches/series
===================================================================
--- packages/lfm/trunk/debian/patches/series (rev 0)
+++ packages/lfm/trunk/debian/patches/series 2009-09-01 22:14:42 UTC (rev 3653)
@@ -0,0 +1,2 @@
+ignore_COPYING.patch
+curs_set.patch
Deleted: packages/lfm/trunk/debian/pycompat
===================================================================
--- packages/lfm/trunk/debian/pycompat 2009-09-01 21:38:49 UTC (rev 3652)
+++ packages/lfm/trunk/debian/pycompat 2009-09-01 22:14:42 UTC (rev 3653)
@@ -1 +0,0 @@
-2
Modified: packages/lfm/trunk/debian/rules
===================================================================
--- packages/lfm/trunk/debian/rules 2009-09-01 21:38:49 UTC (rev 3652)
+++ packages/lfm/trunk/debian/rules 2009-09-01 22:14:42 UTC (rev 3653)
@@ -1,8 +1,11 @@
#!/usr/bin/make -f
-DEB_PYTHON_SYSTEM=pysupport
-DEB_COMPRESS_EXCLUDE := NEWS README ChangeLog
+%:
+ dh --with quilt $@
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+override_dh_auto_install:
+ dh_auto_install -- --install-lib=/usr/share/lfm --install-scripts=/usr/share/lfm
+ mv $(CURDIR)/debian/lfm/usr/share/lfm/lfm/lfm $(CURDIR)/debian/lfm/usr/share/lfm/lfm.py
+
+override_dh_compress:
+ dh_compress -XNEWS -XREADME -XChangeLog
More information about the Python-apps-commits
mailing list