[Python-apps-commits] r5932 - in packages/frescobaldi/trunk/debian (12 files)
ryanakca-guest at users.alioth.debian.org
ryanakca-guest at users.alioth.debian.org
Wed Jul 28 17:57:38 UTC 2010
Date: Wednesday, July 28, 2010 @ 17:57:38
Author: ryanakca-guest
Revision: 5932
Frescobaldi 1.1.3-1
Added:
packages/frescobaldi/trunk/debian/frescobaldi.manpages
packages/frescobaldi/trunk/debian/patches/02_no_pyc.diff
Modified:
packages/frescobaldi/trunk/debian/changelog
packages/frescobaldi/trunk/debian/control
packages/frescobaldi/trunk/debian/copyright
packages/frescobaldi/trunk/debian/frescobaldi.1
packages/frescobaldi/trunk/debian/patches/01_checkmodules_no_python-kde4_build-dep.diff
packages/frescobaldi/trunk/debian/patches/series
packages/frescobaldi/trunk/debian/rules
packages/frescobaldi/trunk/debian/source/format
packages/frescobaldi/trunk/debian/watch
Deleted:
packages/frescobaldi/trunk/debian/README.source
Deleted: packages/frescobaldi/trunk/debian/README.source
===================================================================
--- packages/frescobaldi/trunk/debian/README.source 2010-07-28 16:38:13 UTC (rev 5931)
+++ packages/frescobaldi/trunk/debian/README.source 2010-07-28 17:57:38 UTC (rev 5932)
@@ -1,8 +0,0 @@
-This package uses quilt to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build. Please see:
-
- /usr/share/doc/quilt/README.source
-
-for more information on how to apply the patches, modify patches, or
-remove a patch.
Modified: packages/frescobaldi/trunk/debian/changelog
===================================================================
--- packages/frescobaldi/trunk/debian/changelog 2010-07-28 16:38:13 UTC (rev 5931)
+++ packages/frescobaldi/trunk/debian/changelog 2010-07-28 17:57:38 UTC (rev 5932)
@@ -1,3 +1,21 @@
+frescobaldi (1.1.3-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ * Use the simple feed for google code in the watch file. Depends on a patch
+ for uscan which will hopefully get uploaded to Debian in the near future.
+ * Switch to source format 3.0 (quilt)
+ * Drop README.source for quilt, it's no longer needed under source format
+ 3.0 (quilt)
+ * Drop quilt from the B-D
+ * Updated copyright with new holders / years
+ * Ditch CDBS for dh
+ * Update 01_checkmodules_no_python-kde4_build-dep.diff for new
+ checkmodules.py
+ * Don't install .pyc files. Thiss used to be done in debian/rules. Now done
+ with 02_no_pyc.diff .
+
+ -- Ryan Kavanagh <ryanakca at kubuntu.org> Wed, 28 Jul 2010 12:25:34 -0400
+
frescobaldi (1.0.2-2) unstable; urgency=low
* Added lilypond-doc as a suggests
Modified: packages/frescobaldi/trunk/debian/control
===================================================================
--- packages/frescobaldi/trunk/debian/control 2010-07-28 16:38:13 UTC (rev 5931)
+++ packages/frescobaldi/trunk/debian/control 2010-07-28 17:57:38 UTC (rev 5932)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Ryan Kavanagh <ryanakca at kubuntu.org>
Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
-Build-Depends: cdbs, debhelper (>= 7), quilt
+Build-Depends: debhelper (>= 7)
Build-Depends-Indep: python (>= 2.5), python-support (>= 0.8.7),
python-qt4 (>= 4.4.4), python-sip4 (>= 4.7.9), python-dbus,
python-kde4-dev (>= 4:4.2.2), python-qt4-dbus, lilypond,
Modified: packages/frescobaldi/trunk/debian/copyright
===================================================================
--- packages/frescobaldi/trunk/debian/copyright 2010-07-28 16:38:13 UTC (rev 5931)
+++ packages/frescobaldi/trunk/debian/copyright 2010-07-28 17:57:38 UTC (rev 5932)
@@ -21,6 +21,8 @@
David Bouriaud <david.bouriaud at ac-rouen.fr>
Yann Collette
Ryan Kavanagh <ryanakca at kubuntu.org>
+ gl.po:
+ Manuel A. Vazquez <xixirei at yahoo.es>
it.po:
Gianluca D'Orazio <gianluca.dorazio at gmail.com>
nl.po:
@@ -32,7 +34,7 @@
Serj Poltavski <serge.uliss at gmail.com>
Artem Zolochevskiy <artem.zolochevskiy at gmail.com>
tr.po:
- Server Acim <sacim at kde.org.tr>
+ Server Acim <sacim at acim.name.tr>
ebuild file:
Gentoo Foundation
@@ -45,14 +47,15 @@
Copyright (C) 2008 Henrik Evers <henrik.evers at gmx.de>
Copyright (C) 2009 Georg Hennig <georg.hennig at web.de>
Copyright (C) 2008, 2009 Francisco Vila <francisco.vila at hispalinux.es>
- Copyright (C) 2008 Valentin Villenave <v.villenave at gmail.com>
+ Copyright (C) 2008, 2010 Valentin Villenave <v.villenave at gmail.com>
Copyright (C) 2009 David Bouriaud <david.bouriaud at ac-rouen.fr>
Copyright (C) 2009 Ryan Kavanagh <ryanakca at kubuntu.org>
+ Copyright (C) 2009 Manuel A. Vazquez <xixirei at yahoo.es>
Copyright (C) 2008, 2009 Gianluca D'Orazio <gianluca.dorazio at gmail.com>
Copyright (C) 2009 Piotr Komorowski <piotr-komorowski at wp.pl>
Copyright (C) 2008 Сергей ПолтавÑкий <ru at li.org>
Copyright (C) 2009 Serj Poltavski <serge.uliss at gmail.com>
- Copyright (C) 2008, 2009 Server Acim <sacim at kde.org.tr>
+ Copyright (C) 2008–2010 Server Acim <sacim at acim.name.tr>
Copyright (C) 1999–2009 Gentoo Foundation
Copyright (C) 2009 Artem Zolochevskiy <artem.zolochevskiy at gmail.com>
Modified: packages/frescobaldi/trunk/debian/frescobaldi.1
===================================================================
--- packages/frescobaldi/trunk/debian/frescobaldi.1 2010-07-28 16:38:13 UTC (rev 5931)
+++ packages/frescobaldi/trunk/debian/frescobaldi.1 2010-07-28 17:57:38 UTC (rev 5932)
@@ -166,20 +166,21 @@
.SH AUTHORS
.nf
\fBfrescobaldi\fR was written and is copyrighted by:
-Copyright \[co] 2008-2010 Wilbert Berendsen <info\@wilbertberendsen.nl>
+Copyright \[co] 2008\(en2010 Wilbert Berendsen <info\@wilbertberendsen.nl>
Copyright \[co] 2009 Pavel Fric <pavelfric\@seznam.cz>
Copyright \[co] 2008 Henrik Evers <henrik.evers\@gmx.de>
Copyright \[co] 2009 Georg Hennig <georg.hennig\@web.de>
-Copyright \[co] 2008, 2009 Francisco Vila <francisco.vila\@hispalinux.es>
-Copyright \[co] 2008 Valentin Villenave <v.villenave\@gmail.com>
+Copyright \[co] 2008\(en2009 Francisco Vila <francisco.vila\@hispalinux.es>
+Copyright \[co] 2008, 2010 Valentin Villenave <v.villenave\@gmail.com>
Copyright \[co] 2009 David Bouriaud <david.bouriaud\@ac-rouen.fr>
Copyright \[co] 2009 Ryan Kavanagh <ryanakca\@kubuntu.org>
-Copyright \[co] 2008, 2009 Gianluca D'Orazio <gianluca.dorazio\@gmail.com>
+Copyright \[co] 2009 Manuel A. Vazquez <xixirei at yahoo.es>
+Copyright \[co] 2008\(en2009 Gianluca D'Orazio <gianluca.dorazio\@gmail.com>
Copyright \[co] 2009 Piotr Komorowski <piotr-komorowski\@wp.pl>
Copyright \[co] 2008 Сергей ПолтавÑкий <ru\@li.org>
Copyright \[co] 2009 Serj Poltavski <serge.uliss\@gmail.com>
-Copyright \[co] 2008, 2009 Server Acim <sacim\@kde.org.tr>
-Copyright \[co] 1999–2009 Gentoo Foundation
+Copyright \[co] 2008\(en2010 Server Acim <sacim\@kde.org.tr>
+Copyright \[co] 1999\(en2009 Gentoo Foundation
Copyright \[co] 2009 Artem Zolochevskiy <artem.zolochevskiy\@gmail.com>
This man page was written by Ryan Kavanagh <ryanakca\@kubuntu.org>.
Added: packages/frescobaldi/trunk/debian/frescobaldi.manpages
===================================================================
--- packages/frescobaldi/trunk/debian/frescobaldi.manpages (rev 0)
+++ packages/frescobaldi/trunk/debian/frescobaldi.manpages 2010-07-28 17:57:38 UTC (rev 5932)
@@ -0,0 +1 @@
+debian/frescobaldi.1
Modified: packages/frescobaldi/trunk/debian/patches/01_checkmodules_no_python-kde4_build-dep.diff
===================================================================
--- packages/frescobaldi/trunk/debian/patches/01_checkmodules_no_python-kde4_build-dep.diff 2010-07-28 16:38:13 UTC (rev 5931)
+++ packages/frescobaldi/trunk/debian/patches/01_checkmodules_no_python-kde4_build-dep.diff 2010-07-28 17:57:38 UTC (rev 5932)
@@ -2,32 +2,16 @@
## by Ryan Kavanagh <ryanakca at kubuntu.org>
## Description: We don't need to check that these are installed at build since
## they're only used at runtime.
-Index: frescobaldi-0.7.9/checkmodules.py
+Index: frescobaldi-1.1.3/checkmodules.py
===================================================================
---- frescobaldi-0.7.9.orig/checkmodules.py 2009-05-26 14:44:31.259024872 +0200
-+++ frescobaldi-0.7.9/checkmodules.py 2009-05-26 15:29:13.094841675 +0200
-@@ -12,8 +12,6 @@
+--- frescobaldi-1.1.3.orig/checkmodules.py 2010-07-28 12:07:22.067048461 -0400
++++ frescobaldi-1.1.3/checkmodules.py 2010-07-28 12:08:18.635050654 -0400
+@@ -55,7 +55,7 @@
+ return errors
- for module in (
- "sip", "PyQt4", "PyQt4.QtCore", "PyQt4.QtGui",
-- "PyKDE4", "PyKDE4.kdecore", "PyKDE4.kdeui", "PyKDE4.kparts", "PyKDE4.kio",
-- "PyKDE4.ktexteditor",
- "dbus", "dbus.mainloop.qt",
- ):
- try:
-@@ -42,10 +40,11 @@
- if PyQt4.QtCore.PYQT_VERSION < mkver(4, 4, 3):
- errors.append("PyQt4 version %s found, but need at least 4.4.3." %
- PyQt4.QtCore.PYQT_VERSION_STR)
--
--if PyKDE4.kdecore.pykde_version() < mkver(4, 0, 2):
-- errors.append("PyKDE4 version %s found, but need at least 4.0.2." %
-- PyKDE4.kdecore.pykde_versionString())
-+
-+# We depend on python-kde4 (>= 4:4.0.2)
-+#if PyKDE4.kdecore.pykde_version() < mkver(4, 0, 2):
-+# errors.append("PyKDE4 version %s found, but need at least 4.0.2." %
-+# PyKDE4.kdecore.pykde_versionString())
- if dbus.version < (0, 82, 4):
- errors.append("python-dbus version %s found, but need at least 0.82.4." %
+-if __name__ == "__main__":
++if __name__ == "__DebianDontRunFollowingToSaveOnB-D__":
+
+ missing = checkModules()
+ if missing:
Added: packages/frescobaldi/trunk/debian/patches/02_no_pyc.diff
===================================================================
--- packages/frescobaldi/trunk/debian/patches/02_no_pyc.diff (rev 0)
+++ packages/frescobaldi/trunk/debian/patches/02_no_pyc.diff 2010-07-28 17:57:38 UTC (rev 5932)
@@ -0,0 +1,16 @@
+# 02_no_pyc.diff by Ryan Kavanagh <ryanakca at kubuntu.org>
+# Description: Don't install *.pyc
+Index: frescobaldi-1.1.3/cmake/modules/Python.cmake
+===================================================================
+--- frescobaldi-1.1.3.orig/cmake/modules/Python.cmake 2010-07-28 12:24:17.535050528 -0400
++++ frescobaldi-1.1.3/cmake/modules/Python.cmake 2010-07-28 12:24:45.232000549 -0400
+@@ -39,7 +39,8 @@
+ list(APPEND _pycs ${_pyc})
+
+ # install .pyc file
+- install(FILES ${_pyc} DESTINATION ${_destination}/${_dir})
++ # Or not -- RK
++ # install(FILES ${_pyc} DESTINATION ${_destination}/${_dir})
+ endif(BYTECOMPILE)
+ endforeach(_py)
+
Modified: packages/frescobaldi/trunk/debian/patches/series
===================================================================
--- packages/frescobaldi/trunk/debian/patches/series 2010-07-28 16:38:13 UTC (rev 5931)
+++ packages/frescobaldi/trunk/debian/patches/series 2010-07-28 17:57:38 UTC (rev 5932)
@@ -1 +1,2 @@
01_checkmodules_no_python-kde4_build-dep.diff
+02_no_pyc.diff
Modified: packages/frescobaldi/trunk/debian/rules
===================================================================
--- packages/frescobaldi/trunk/debian/rules 2010-07-28 16:38:13 UTC (rev 5931)
+++ packages/frescobaldi/trunk/debian/rules 2010-07-28 17:57:38 UTC (rev 5932)
@@ -1,16 +1,4 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/class/cmake.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-
-DEB_COMPRESS_EXCLUDE := .py
-DEB_CMAKE_EXTRA_FLAGS += -DPYTHON_EXECUTABLE=/usr/bin/python \
- -DKDE4_MEINPROC_EXECUTABLE=/usr/bin/meinproc4
-DEB_INSTALL_MANPAGES_frescobaldi = debian/frescobaldi.1
-
-binary-install/frescobaldi::
- find debian/frescobaldi -name '*.pyc' -exec rm {} \;
-
-binary-post-install/frescobaldi::
- dh_pysupport
+%:
+ dh $@
Modified: packages/frescobaldi/trunk/debian/source/format
===================================================================
--- packages/frescobaldi/trunk/debian/source/format 2010-07-28 16:38:13 UTC (rev 5931)
+++ packages/frescobaldi/trunk/debian/source/format 2010-07-28 17:57:38 UTC (rev 5932)
@@ -1 +1 @@
-1.0
+3.0 (quilt)
Modified: packages/frescobaldi/trunk/debian/watch
===================================================================
--- packages/frescobaldi/trunk/debian/watch 2010-07-28 16:38:13 UTC (rev 5931)
+++ packages/frescobaldi/trunk/debian/watch 2010-07-28 17:57:38 UTC (rev 5932)
@@ -1,10 +1,6 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# See uscan(1) for format
-
# Compulsory line, this is a version 3 file
version=3
-http://code.google.com/p/lilykde/downloads/list \
- http://lilykde.googlecode.com/files/frescobaldi-(.*)\.tar\.gz
+opts=downloadurlmangle=s#.*name=(frescobaldi-(.*)\.tar\.gz).*#http://lilykde.googlecode.com/files/$1#,filenamemangle=s#.*(frescobaldi-(.*)\.tar\.gz).*#$1# \
+ http://code.google.com/feeds/p/lilykde/downloads/basic \
+ http://code.google.com/p/lilykde/downloads/detail\?name=frescobaldi-(.*)\.tar\.gz
More information about the Python-apps-commits
mailing list