[Python-apps-commits] r7484 - in packages/xpra/trunk/debian (9 files)

aelmahmoudy-guest at users.alioth.debian.org aelmahmoudy-guest at users.alioth.debian.org
Thu Aug 25 22:11:30 UTC 2011 

    Date: Thursday, August 25, 2011 @ 22:11:29
  Author: aelmahmoudy-guest
Revision: 7484

* Switched to another upstream.
* Refreshed manpage.diff & setup.diff patches
* debian/control: B-D on cython instead of python-pyrex
* debian/clean: Added wimpiggy/lowlevel/constants.pxi
* debian/rules: Added an override for dh_auto_build to run
  make_constants_pxi.py before the normal build.
* debian/copyrights:
  + Updated copyrights.
  + Added copyrights for Debian packaging.
* debian/watch: Switched to new upstream URL

Added:
  packages/xpra/trunk/debian/patches/setup.diff
Modified:
  packages/xpra/trunk/debian/changelog
  packages/xpra/trunk/debian/clean
  packages/xpra/trunk/debian/control
  packages/xpra/trunk/debian/copyright
  packages/xpra/trunk/debian/patches/manpage.patch
  packages/xpra/trunk/debian/patches/series
  packages/xpra/trunk/debian/rules
  packages/xpra/trunk/debian/watch

Modified: packages/xpra/trunk/debian/changelog
===================================================================
--- packages/xpra/trunk/debian/changelog	2011-08-25 22:08:18 UTC (rev 7483)
+++ packages/xpra/trunk/debian/changelog	2011-08-25 22:11:29 UTC (rev 7484)
@@ -1,11 +1,17 @@
-parti-all (0.0.6+dfsg-2) UNRELEASED; urgency=low
+xpra (0.0.7.22.1+dfsg-1) UNRELEASED; urgency=low
 
-  * Python transition:
-    - Add support for python2.7.
-    - Drop support for python2.5.
-  * Bump Standards-Version to 3.9.2. No changes were required.
+  * New upstream release.
+  * Refreshed manpage.diff & setup.diff patches
+  * debian/control: B-D on cython instead of python-pyrex
+  * debian/clean: Added wimpiggy/lowlevel/constants.pxi
+  * debian/rules: Added an override for dh_auto_build to run
+    make_constants_pxi.py before the normal build.
+  * debian/copyrights:
+    + Updated copyrights.
+    + Added copyrights for Debian packaging.
+  * debian/watch: Switched to new upstream URL
 
- -- Miguel Landaeta <miguel at miguel.cc>  Mon, 18 Apr 2011 19:30:00 -0430
+ -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>  Sun, 19 Jun 2011 04:09:42 +0200
 
 parti-all (0.0.6+dfsg-1) experimental; urgency=low
 

Modified: packages/xpra/trunk/debian/clean
===================================================================
--- packages/xpra/trunk/debian/clean	2011-08-25 22:08:18 UTC (rev 7483)
+++ packages/xpra/trunk/debian/clean	2011-08-25 22:11:29 UTC (rev 7484)
@@ -1,2 +1,3 @@
 xpra/xpra.wait_for_x_server.c
 wimpiggy/lowlevel/wimpiggy.lowlevel.bindings.c
+wimpiggy/lowlevel/constants.pxi

Modified: packages/xpra/trunk/debian/control
===================================================================
--- packages/xpra/trunk/debian/control	2011-08-25 22:08:18 UTC (rev 7483)
+++ packages/xpra/trunk/debian/control	2011-08-25 22:11:29 UTC (rev 7484)
@@ -1,12 +1,12 @@
-Source: parti-all
+Source: xpra
 Section: x11
 Priority: optional
 Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
 Uploaders: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>,
  Miguel Landaeta <miguel at miguel.cc>
-Build-Depends: debhelper (>= 7.0.50~), libx11-dev, libxtst-dev, libxcomposite-dev, libxdamage-dev, python-all-dev (>= 2.6.6-2), python-pyrex, python-gobject-dev, python-gtk2-dev
+Build-Depends: debhelper (>= 7.0.50~), libx11-dev, libxtst-dev, libxcomposite-dev, libxdamage-dev, python-all-dev (>= 2.6.6-2), cython, python-gobject-dev, python-gtk2-dev
 X-Python-Version: all
-Standards-Version: 3.9.2
+Standards-Version: 3.9.1
 Homepage: http://partiwm.org/
 Vcs-Svn: svn://svn.debian.org/python-apps/packages/parti-all/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/parti-all/trunk/

Modified: packages/xpra/trunk/debian/copyright
===================================================================
--- packages/xpra/trunk/debian/copyright	2011-08-25 22:08:18 UTC (rev 7483)
+++ packages/xpra/trunk/debian/copyright	2011-08-25 22:11:29 UTC (rev 7484)
@@ -4,25 +4,22 @@
 Source: http://partiwm.org/
 
 Files: *
-Copyright: 2008-2009 Nathaniel Smith <njs at pobox.com>
+Copyright: 2008-2010 Nathaniel Smith <njs at pobox.com>
 License: GPL-2+
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- .
- On a Debian system, you can find a copy of GPL version 2 in
- /usr/share/common-licenses/GPL-2.
 
+Files: xpra/server.py
+       xpra/scripts/main.py
+Copyright: 2008, Nathaniel Smith <njs at pobox.com>
+           2010-2011, Antoine Martin <antoine at devloop.org.uk>,
+           2011, Serviware (Arthur Huillet, <ahuillet at serviware.com>)
+License: GPL-2+
+
+Files: xpra/client.py
+Copyright: 2008,2010, Nathaniel Smith <njs at pobox.com>
+           2010-2011, Antoine Martin <antoine at devloop.org.uk>,
+           2011, Serviware (Arthur Huillet, <ahuillet at serviware.com>)
+License: GPL-2+
+
 Files: parti/addons/ipython_view.py
 Copyright: 2007, IBM Corporation
 License: BSD
@@ -51,3 +48,28 @@
  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Files: debian/*
+Copyright: 2009, Evan Dandrea <evand at ubuntu.com>
+           2010, Michael Schutte <michi at uiae.at>
+           2010-2011, Miguel Landaeta <miguel at miguel.cc>
+           2010-2011, أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
+License: GPL-2+
+
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ .
+ On a Debian system, you can find a copy of GPL version 2 in
+ /usr/share/common-licenses/GPL-2.

Modified: packages/xpra/trunk/debian/patches/manpage.patch
===================================================================
--- packages/xpra/trunk/debian/patches/manpage.patch	2011-08-25 22:08:18 UTC (rev 7483)
+++ packages/xpra/trunk/debian/patches/manpage.patch	2011-08-25 22:11:29 UTC (rev 7484)
@@ -1,20 +1,15 @@
 Description: Corrections to manual pages
- * xpra.1: The command line option referred to in the “Environment”
-   section is called --start-child, not --with-child.
- * xpra.1: Use real minus signs (\-) rather than hyphens.
+ * Use real minus signs (\-) rather than hyphens.
 Origin: Debian
-Author: Michael Schutte <michi at uiae.at>
-Forwarded: http://code.google.com/p/partiwm/source/detail?r=604e612777
+Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
 
-Index: devel/xpra.1
-===================================================================
---- devel.orig/xpra.1	2010-02-17 18:36:45.000000000 +0100
-+++ devel/xpra.1	2010-02-17 18:42:25.000000000 +0100
-@@ -216,7 +216,7 @@
+--- a/xpra.1
++++ b/xpra.1
+@@ -344,7 +344,7 @@
  .SH ENVIRONMENT
  .TP
  \fBDISPLAY\fP
--\fBxpra start --with-child=...\fP sets this variable in the
+-\fBxpra start \-\-start-child=...\fP sets this variable in the
 +\fBxpra start \-\-start\-child=...\fP sets this variable in the
  environment of the child to point to the xpra display.
  

Modified: packages/xpra/trunk/debian/patches/series
===================================================================
--- packages/xpra/trunk/debian/patches/series	2011-08-25 22:08:18 UTC (rev 7483)
+++ packages/xpra/trunk/debian/patches/series	2011-08-25 22:11:29 UTC (rev 7484)
@@ -1,3 +1,4 @@
 manpage.patch
 run_xauth.patch
 private-pkg.diff
+setup.diff

Added: packages/xpra/trunk/debian/patches/setup.diff
===================================================================
--- packages/xpra/trunk/debian/patches/setup.diff	                        (rev 0)
+++ packages/xpra/trunk/debian/patches/setup.diff	2011-08-25 22:11:29 UTC (rev 7484)
@@ -0,0 +1,11 @@
+--- a/setup.py
++++ b/setup.py
+@@ -24,7 +24,7 @@
+                 '-l': 'libraries'}
+     cmd = "pkg-config --libs --cflags %s" % (" ".join(packages),)
+     (status, output) = commands.getstatusoutput(cmd)
+-    if not (os.WIFEXITED(status) and os.WEXITSTATUS(status) == 0):
++    if not (os.WIFEXITED(status) and os.WEXITSTATUS(status) == 0) and not ('clean' in sys.argv):
+         raise Exception, ("call to pkg-config ('%s') failed" % (cmd,))
+     for token in output.split():
+         if flag_map.has_key(token[:2]):

Modified: packages/xpra/trunk/debian/rules
===================================================================
--- packages/xpra/trunk/debian/rules	2011-08-25 22:08:18 UTC (rev 7483)
+++ packages/xpra/trunk/debian/rules	2011-08-25 22:11:29 UTC (rev 7484)
@@ -3,5 +3,9 @@
 %:
 	dh $@ --with python2
 
+override_dh_auto_build:
+	python make_constants_pxi.py wimpiggy/lowlevel/constants.txt wimpiggy/lowlevel/constants.pxi
+	dh_auto_build
+
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS

Modified: packages/xpra/trunk/debian/watch
===================================================================
--- packages/xpra/trunk/debian/watch	2011-08-25 22:08:18 UTC (rev 7483)
+++ packages/xpra/trunk/debian/watch	2011-08-25 22:11:29 UTC (rev 7484)
@@ -1,6 +1,7 @@
 version=3
 opts="dversionmangle=s/\+dfsg//,uversionmangle=s/$/\+dfsg/," \
-http://code.google.com/p/partiwm/downloads/list \
-  http://partiwm.googlecode.com/files/parti-all-(.*)\.tar\.gz \
-debian ./debian/repack
+  http://winswitch.org/src/ xpra-(.*)\.tar\.bz2 \
+  debian ./debian/repack
 
+#http://code.google.com/p/partiwm/downloads/list \
+#  http://partiwm.googlecode.com/files/parti-all-(.*)\.tar\.gz \

More information about the Python-apps-commits mailing list