--- bitpim-1.0.5.dfsg.1.orig/debian/bitpim.1 +++ bitpim-1.0.5.dfsg.1/debian/bitpim.1 @@ -0,0 +1,90 @@ +.TH BITPIM 1 "2007-12-12" +.SH NAME +bitpim \- utility to communicate with many CDMA phones +.SH SYNOPSIS +.B bitpim +[\ \fB-c\fP\ \fIfile\fP | \fB-d\fP\ \fIdir\fP\ ] +[\ \fB-f\fP\ \fImodel\fP\ ] +[\ \fB-p\fP\ \fIdevice\fP\ ] +[\ \fBbitfling\fP\ ] +[\ \fBdebug\fP\ ] +[\ \fIcli-command\fP\ ] +.SH DESCRIPTION +This manual page documents briefly the +.B bitpim +command. +.PP +BitPim allows you to view and manipulate data on many phones from LG, +Samsung, Sanyo, and other manufacturers that use Qualcomm CDMA chips. +Depending on your phone model, you may be able to access the phone +book, the calendar, wallpapers, ring tones, and the filesystem. +.SH OPTIONS +A summary of options is included below. +.TP +\fB-c\fP\ \fIfile\fP +Read configuration from \fIfile\fP. +.TP +\fB-d\fP\ \fIdir\fP +Read configuration from \fIdir\fP\fB/.bitpim\fP. +.TP +\fB-f\fP\ \fImodel\fP +Assume a phone type of \fImodel\fP rather than what the configuration +file specifies. Particularly useful in CLI mode. +.TP +\fB-p\fP\ \fIdevice\fP +Communicate with the phone via the device ("port") \fIdevice\fP. +.TP +\fBbitfling\fP +Run as \fBbitfling\fP(1). +.TP +\fBdebug\fP +Print debugging information to standard output and standard error. +.TP +\fIcli-command\fP +Interact with the phone's filesystem via a command-line interface. +The command must be a \fBsingle\fP (quoted) argument, and can take any +of the following forms: +.RS +.PD 0 +.TP +\fBcli\fP +Bring up an interactive shell, allowing all of the below commands as +well as a few others (\fBcd\fP \fIdir\fP, \fBcdu\fP, \fBexit\fP, and +\fBpwd\fP or equivalently \fBcwd\fP). +.TP +\fBcp\fP \fIsrc [...] destdir\fP +Copy files to, from, or within the phone. +.TP +\fBll\fP \fIdir [...]\fP +Print a detailed listing of the specified phone directory or directories. +.TP +\fBls\fP \fIdir [...]\fP +Print a brief listing of the specified phone directory or directories. +.TP +\fBmkdir\fP \fIdir [...]\fP +Create a directory on the phone. +.TP +\fBrm\fP \fIfile [...]\fP +Remove one or more files from the phone. +.TP +\fBrmdir\fP \fIdir [...]\fP +Remove one or more directories, which must already be empty, from the phone. +.PD +.P +Please note that none of these commands accepts wildcards. To +indicate that an argument denotes a file or directory on the phone, +you can prefix it with \fBphone:\fP; this is mainly relevant for +\fBcp\fP, which performs phone-to-PC copies unless otherwise directed. +.RE +.SH FILES +.TP +\fB$HOME/.bitpim-files/.bitpim\fP +The default configuration file. +.SH SEE ALSO +.BR bitfling (1), +http://www.bitpim.org/. +.SH AUTHOR +\fBbitpim\fP was primarily written by Roger Binns . +.PP +This manual page was written by Aaron M. Ucko , +for the Debian project (but may be used by others). --- bitpim-1.0.5.dfsg.1.orig/debian/bitpim.install +++ bitpim-1.0.5.dfsg.1/debian/bitpim.install @@ -0,0 +1,7 @@ +etc/default/bitpim +lib/udev/bpudev +usr/bin/bitfling +usr/bin/bitpim +usr/share/applications +usr/share/bitpim +usr/share/pixmaps --- bitpim-1.0.5.dfsg.1.orig/debian/bitpim.default +++ bitpim-1.0.5.dfsg.1/debian/bitpim.default @@ -0,0 +1,16 @@ +# -*- shell-script -*- + +# If you would like USB devices that BitPim supports to have specific +# ownership settings, you can specify them here. (For instance, you +# can assign all such devices to the appropriate user account, or to a +# standard group such as dialout or plugdev, or to a custom group such +# as cellusers.) If you leave these blank, BitPim will leave their +# ownership alone (root:root by default). + +BPUDEV_USER= +BPUDEV_GROUP= + +# You can also specify Unix permissions for the devices, though the +# default should be reasonable in most cases. + +# BPUDEV_MODE=0664 --- bitpim-1.0.5.dfsg.1.orig/debian/copyright +++ bitpim-1.0.5.dfsg.1/debian/copyright @@ -0,0 +1,203 @@ +This package was debianized by Aaron M. Ucko on +Fri, 3 Feb 2006 18:28:52 -0500. + +It was downloaded from http://www.bitpim.org/ + +Copyright Holder: Roger Binns and others + +License: + Copyright (C) 2003-2008 Roger Binns and others - see http://www.bitpim.org/ + + This package 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 package 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 package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + In addition, as a special exception, the BitPim copyright holders + give permission to link the code of this program with the OpenSSL + library (or with modified versions of OpenSSL), and distribute + linked combinations including the two. You must obey the GNU + General Public License in all respects for all of the code used + other than OpenSSL. If you modify any files, you may extend this + exception to your version of the file, but you are not obligated to + do so. If you do not wish to do so, delete this exception statement + from your version. + +On Debian systems, the complete text of the GNU General Public +License, version 2, can be found in +`/usr/share/common-licenses/GPL-2'. + +Please also note that some code is taken from other projects with a +GPL compatible license. In alphabetical order by file: + +* src/bitfling/xmlrpcstuff.py is double licensed as the BitPim License + [above] and the standard Python license [1]. It incorporates code + from the standard Python library which was then modified to work + properly. + +* src/fixedscrollpanel.py and fixedwxpTag.py fall under the wxWidgets + license [2]: the GNU LGPL v2+ with a static-linking exception. + +* src/native/usb/libusb.i falls under the GNU Library/Lesser General + Public License, which can be found in `/usr/share/common-licenses/LGPL'. + +* src/native/usb/usb.py is in the public domain. + +* src/xyaptu.py is licensed under the BSD license, which can be found in + `/usr/share/common-licenses/BSD'. + +[1] This is the Python license. In short, you can use this product in +commercial and non-commercial applications, modify it, redistribute it. +A notification to the author when you use and/or modify it is welcome. + + +TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING THIS SOFTWARE +=================================================================== + +LICENSE AGREEMENT +----------------- + +1. This LICENSE AGREEMENT is between the copyright holder of this +product, and the Individual or Organization ("Licensee") accessing +and otherwise using this product in source or binary form and its +associated documentation. + +2. Subject to the terms and conditions of this License Agreement, +the copyright holder hereby grants Licensee a nonexclusive, +royalty-free, world-wide license to reproduce, analyze, test, +perform and/or display publicly, prepare derivative works, distribute, +and otherwise use this product alone or in any derivative version, +provided, however, that copyright holders License Agreement and +copyright holders notice of copyright are retained in this product +alone or in any derivative version prepared by Licensee. + +3. In the event Licensee prepares a derivative work that is based on +or incorporates this product or any part thereof, and wants to make +the derivative work available to others as provided herein, then +Licensee hereby agrees to include in any such work a brief summary of +the changes made to this product. + +4. The copyright holder is making this product available to Licensee on +an "AS IS" basis. THE COPYRIGHT HOLDER MAKES NO REPRESENTATIONS OR +WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, +THE COPYRIGHT HOLDER MAKES NO AND DISCLAIMS ANY REPRESENTATION OR +WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR +THAT THE USE OF THIS PRODUCT WILL NOT INFRINGE ANY THIRD PARTY RIGHTS. + +5. THE COPYRIGHT HOLDER SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER +USERS OF THIS PRODUCT FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL +DAMAGES OR LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE +USING THIS PRODUCT, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE +POSSIBILITY THEREOF. + +6. This License Agreement will automatically terminate upon a material +breach of its terms and conditions. + +7. Nothing in this License Agreement shall be deemed to create any +relationship of agency, partnership, or joint venture between the +copyright holder and Licensee. This License Agreement does not grant +permission to use trademarks or trade names from the copyright holder +in a trademark sense to endorse or promote products or services of +Licensee, or any third party. + +8. By copying, installing or otherwise using this product, Licensee +agrees to be bound by the terms and conditions of this License +Agreement. + +[2] +Preamble +======== + +The licensing of the wxWindows library is intended to protect the wxWindows +library, its developers, and its users, so that the considerable investment +it represents is not abused. + +Under the terms of the wxWindows Licence, you as a user are not +obliged to distribute wxWindows source code with your products, if you +distribute these products in binary form. However, you are prevented from +restricting use of the library in source code form, or denying others the +rights to use or distribute wxWindows library source code in the way +intended. + +The wxWindows Licence establishes the copyright for the code and related +material, and it gives you legal permission to copy, distribute and/or +modify the library. It also asserts that no warranty is given by the authors +for this or derived code. + +The core distribution of the wxWindows library contains files +under two different licences: + +- Most files are distributed under the GNU Library General Public + Licence, version 2, with the special exception that you may create and + distribute object code versions built from the source code or modified + versions of it (even if these modified versions include code under a + different licence), and distribute such binaries under your own + terms. + +- Most core wxWindows manuals are made available under the "wxWindows + Free Documentation Licence", which allows you to distribute modified + versions of the manuals, such as versions documenting any modifications + made by you in your version of the library. However, you may not restrict + any third party from reincorporating your changes into the original + manuals. + + wxWindows Library Licence, Version 3 + ==================================== + + Copyright (c) 1998 Julian Smart, Robert Roebling et al + + Everyone is permitted to copy and distribute verbatim copies + of this licence document, but changing it is not allowed. + + WXWINDOWS LIBRARY LICENCE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public Licence as published by + the Free Software Foundation; either version 2 of the Licence, or (at + your option) any later version. + + This library 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 Library + General Public Licence for more details. + + You should have received a copy of the GNU Library General Public Licence + along with this software, usually in a file named COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + Boston, MA 02110-1301 USA. + + EXCEPTION NOTICE + + 1. As a special exception, the copyright holders of this library give + permission for additional uses of the text contained in this release of + the library as licenced under the wxWindows Library Licence, applying + either version 3 of the Licence, or (at your option) any later version of + the Licence as published by the copyright holders of version 3 of the + Licence document. + + 2. The exception is that you may use, copy, link, modify and distribute + under the user's own terms, binary object code versions of works based + on the Library. + + 3. If you copy code from files distributed under the terms of the GNU + General Public Licence or the GNU Library General Public Licence into a + copy of this library, as this licence permits, the exception does not + apply to the code that you add in this way. To avoid misleading anyone as + to the status of such modified files, you must delete this exception + notice from such code and/or adjust the licensing conditions notice + accordingly. + + 4. If you write modifications of your own for this library, it is your + choice whether to permit this exception to apply to your modifications. + If you do not wish that, you must delete the exception notice from such + code and/or adjust the licensing conditions notice accordingly. --- bitpim-1.0.5.dfsg.1.orig/debian/README.Debian +++ bitpim-1.0.5.dfsg.1/debian/README.Debian @@ -0,0 +1,29 @@ +BitPim for Debian +================= + +device permissions +------------------ +I second the upstream developers' recommendation of running BitPim as +a regular user rather than root. However, for this to be possible, +you will probably first need to configure appropriate device +permissions. If your system runs udev (installed by default) and you +have a USB-connected phone that BitPim fully recognizes, it should +suffice to edit the settings in /etc/default/bitpim according to that +file's comments. Otherwise, you can define local rules akin to those +in /etc/udev/rules.d/z60_bitpim.rules. + +mp3 ringtones +------------- +Many of the phones BitPim supports allow users to upload ringtones in +the popular MP3 format. Although BitPim offers to convert WAV files +to this format, please be advised that such conversion *will not work* +on a stock Debian system, as patent concerns prevent Debian from +distributing any MP3 encoders via official channels. + +On the other hand, uploading existing MP3 (or, for that matter, MIDI) +ringtones as is should still work. Moreover, you can ease this +restriction by installing an unofficial version of the ffmpeg package +with support for MP3 encoding; at the time of this writing, +http://www.debian-multimedia.org/ has such packages. + + -- Aaron M. Ucko , Sat, 10 Nov 2007 18:38:59 -0500 --- bitpim-1.0.5.dfsg.1.orig/debian/bitpim.dirs +++ bitpim-1.0.5.dfsg.1/debian/bitpim.dirs @@ -0,0 +1 @@ +usr/share/bitpim/helpers --- bitpim-1.0.5.dfsg.1.orig/debian/bitpim.sh +++ bitpim-1.0.5.dfsg.1/debian/bitpim.sh @@ -0,0 +1,2 @@ +#!/bin/sh +exec /usr/bin/python -OO /usr/share/bitpim/code/bp.py "$@" --- bitpim-1.0.5.dfsg.1.orig/debian/changelog +++ bitpim-1.0.5.dfsg.1/debian/changelog @@ -0,0 +1,371 @@ +bitpim (1.0.5.dfsg.1-5ubuntu1) jaunty; urgency=low + + * Bump build-depend on debhelper to install udev rules into + /lib/udev/rules.d, add Breaks on udev to get correct version. + + -- Scott James Remnant Tue, 13 Jan 2009 02:16:04 +0000 + +bitpim (1.0.5.dfsg.1-5) unstable; urgency=low + + * Clean up /usr/share/bitpim/resources; in particular, use usbutils's + usb.ids rather than a stale copy. (LP: #77929.) + * Update path to evolution's contacts. (LP: #221006.) + * src/database.py (Database._getindirect): strip spurious trailing L + characters that have started showing up in row numbers. + * src/bp.py: explicitly use wxPython 2.6, as other versions aren't 100% + compatible. (LP: #177569.) + + -- Aaron M. Ucko Thu, 24 Jul 2008 19:59:08 -0400 + +bitpim (1.0.5.dfsg.1-4) unstable; urgency=low + + * debian/{compat,control,rules}: Migrate from CDBS to Debhelper 7. + * debian/control: Declare compliance with Policy 3.8.0. (No changes needed.) + + -- Aaron M. Ucko Sat, 14 Jun 2008 17:10:59 -0400 + +bitpim (1.0.5.dfsg.1-3) unstable; urgency=medium + + * src/native/usb/libusb.i: accommodate libusb-dev 2:0.1.12-10, which now + declares write functions' buffers const in response to Bug #473814. + + -- Aaron M. Ucko Tue, 15 Apr 2008 22:19:06 -0400 + +bitpim (1.0.5.dfsg.1-2) unstable; urgency=low + + * Python 2.5 transition. + * Bump build and runtime dependencies on Python metapackages. + * Drop dependency on python-ctypes, which python now provides. + * Reinstate upstream's 2.5isms, thereby eliminating roughly two thirds + of the Debian diff; most of the remaining changes to upstream code + should be able to go away if and when wxwidgets2.8 hits unstable. + * Clean src/native/usb/*.pyc, which package.generate_udevrules() now + additionally creates (along with various *.pyc files elsewhere). + + -- Aaron M. Ucko Mon, 14 Apr 2008 19:50:27 -0400 + +bitpim (1.0.5.dfsg.1-1) unstable; urgency=medium + + * New upstream release; urgency medium as before. + * src/phones/com_samsungscha870.py: rewrite conditional expression, as + Debian still uses Python 2.4 rather than the requisite 2.5. + * debian/bitpim.default (/etc/default/bitpim): suggest plugdev as + another reasonable choice of standard system group. + + -- Aaron M. Ucko Tue, 29 Jan 2008 20:23:15 -0500 + +bitpim (1.0.4.dfsg.1-1) unstable; urgency=medium + + * New upstream release; urgency medium as this adds more phone models + but doesn't change anything else particularly disruptively. + * debian/{compat,control}: Advance to Debhelper V6 mode, because I can. + * debian/copyright: Extend through 2008. + + -- Aaron M. Ucko Sun, 13 Jan 2008 19:44:08 -0500 + +bitpim (1.0.3.dfsg.1-1) unstable; urgency=low + + * New upstream release. + * src/native/av/bmp2avi/{avi,bmp}_file.cxx: explicitly #include + in anticipation of eventually building with GCC 4.3, as the other + headers in use no longer pull it in implicitly. (Closes: #455312.) + * src/{bp_cli.py,phones/{com_samsungsphm300media.py,p_samsungsphm300.*}}: + rewrite Python2.5isms (with statements, conditional expressions). + * debian/control: bump Standards-Version to 3.7.3 (changes already done). + * debian/rules, resources/bpudev: compensate for udev's quirky handling + of "remove" events, which were failing to get logged. + * debian/bitpim.1: document new options, including in particular the + recently added command-line interface. + + -- Aaron M. Ucko Wed, 12 Dec 2007 22:40:01 -0500 + +bitpim (1.0.2.dfsg.1-3) unstable; urgency=low + + * debian/control: Copy most of bitpim's runtime dependencies to + Build-Depends-Indep, as udev rules generation tries to import them. + (Closes: #451407.) + + -- Aaron M. Ucko Wed, 21 Nov 2007 17:20:56 -0500 + +bitpim (1.0.2.dfsg.1-2) unstable; urgency=low + + * Revive (reworked) udev rules, and document how to ensure suitable + device ownership and permissions. (Closes: #450550.) + * Correct watch file to ignore prerelease snapshots. + * Note upstream's homepage in debian/control. + * Clarify (L)GPL versioning (no upper bounds) in debian/copyright. + + -- Aaron M. Ucko Sun, 11 Nov 2007 21:31:05 -0500 + +bitpim (1.0.2.dfsg.1-1) unstable; urgency=low + + * New upstream release. + * Revert upstream changes that require Python 2.5, but keep those that + merely require 2.4, bumping (build) dependencies accordingly. + * Fix bitpim.desktop to satisfy desktop-file-validate; in particular, + don't lose Category= when adjusting its value! (Closes: #443519.) + + -- Aaron M. Ucko Thu, 11 Oct 2007 19:33:36 -0400 + +bitpim (1.0.1.dfsg.1-1) unstable; urgency=low + + * New upstream release. + * Fix bitpim.desktop to cite Utility rather than Application as its main + category. + * debian/menu: Apps/Tools -> Applications/Mobile Devices per new policy; + belatedly add icons (converted from upstream's). + + -- Aaron M. Ucko Fri, 10 Aug 2007 19:00:11 -0400 + +bitpim (1.0.0.dfsg.1-1) unstable; urgency=medium + + * Official 1.0 release (with only minor changes from 0.9.15). + + -- Aaron M. Ucko Wed, 13 Jun 2007 19:49:39 -0400 + +bitpim (0.9.15.dfsg.1-1) unstable; urgency=low + + * New upstream release. + + -- Aaron M. Ucko Wed, 23 May 2007 18:35:49 -0400 + +bitpim (0.9.14.dfsg.1-2) unstable; urgency=low + + * Depend on apsw 3.3.13-r1, and restore the new database code that + upstream introduced in 0.9.12. + * Build-Depend on debhelper 5.0.47 for direct udev rules.d installation + (though the rules themselves remain commented out). + + -- Aaron M. Ucko Tue, 17 Apr 2007 17:49:41 -0400 + +bitpim (0.9.14.dfsg.1-1) unstable; urgency=low + + * The "spring holiday of your choice" release. + * New upstream release. + * src/{bphtml,fileview,gui,guiwidgets,imp_cal_wizard,newdb_wiz}.py: + revert wx2.8-isms for the time being, as Debian still only has 2.6. + + -- Aaron M. Ucko Sun, 8 Apr 2007 18:25:57 -0400 + +bitpim (0.9.13.dfsg.1-1) unstable; urgency=low + + * New upstream release. + * packaging/buildmodules.py, src/native/evolution/evolution.py, + src/conversions.py: treat GNU/kFreeBSD (sys.platform gnukfreebsd*) + equivalently to Linux (sys.platform linux2). (Closes: #414274.) + * src/{memo,todo}.py (*Widget._OnSave): make sure to enable the item + list before attempting to query its selection. (Closes: #413113.) + + -- Aaron M. Ucko Tue, 20 Mar 2007 19:50:24 -0400 + +bitpim (0.9.12.dfsg.1-1) unstable; urgency=low + + * New upstream release (skipping 0.9.11). + * src/{database,fileview,phone_root}.py: revert use of SQLite virtual + tables, as they require a newer version of apsw than Debian ships at + present (or is likely to until etch releases). + * src/native/usb/libusb.i: add more typedefs for compatibility with + libusb 2:0.1.12-4, as SWIG doesn't automatically recognize the new + names either. (Bug #315165 documents the change.) + * src/{importexport,phones/com_samsung}.py: Continue using Debian's + DSV.py (from my python-dsv package) rather than a (new) private copy. + + -- Aaron M. Ucko Tue, 27 Feb 2007 19:45:52 -0500 + +bitpim (0.9.10.dfsg.1-1) unstable; urgency=low + + * New upstream release. + + -- Aaron M. Ucko Thu, 28 Dec 2006 16:14:51 -0500 + +bitpim (0.9.09.dfsg.1-1) unstable; urgency=medium + + * New upstream release; urgency medium because it fixes some more bugs + and seems pretty stable. + + -- Aaron M. Ucko Thu, 7 Dec 2006 19:32:29 -0500 + +bitpim (0.9.08.dfsg.1-1) unstable; urgency=medium + + * New upstream release; urgency medium because it fixes several bugs and + adds (at least partial) support for three more phone models. + * Comment out udev rules by default because they can make BitPim perform + full scans, which don't always terminate. + + -- Aaron M. Ucko Thu, 23 Nov 2006 15:40:35 -0500 + +bitpim (0.9.07.dfsg.1-1) unstable; urgency=medium + + * New upstream release; urgency medium due to bug fixes and the addition + of LGVX8500 (Chocolate) support. + * Adjust src/comm_notify.py to look for /var/*run*/bitpim/dnotify.log, + and deploy appropriate udev rules. (These rules are broad-sweeping, + but leave ownership and permissions alone.) + * Work around bogus OverflowErrors in comm_notify.py on 64-bit systems. + * Build with python-support 0.42, and drop the explicit python + dependency introduced to work around #383958. + + -- Aaron M. Ucko Thu, 7 Sep 2006 17:46:36 -0400 + +bitpim (0.9.06.dfsg.1-1) unstable; urgency=medium + + * New upstream release, mostly for bug fixes. + * Build with python-support 0.4.1 (dispensing with dh_python). + - give bitpim a direct dependency on python to avoid Lintian errors. + - lose debian/pycompat and the X-Python-Version: fields. + - loosen the build dependency on debhelper. + + -- Aaron M. Ucko Fri, 11 Aug 2006 18:41:36 -0400 + +bitpim (0.9.05.dfsg.1-1) unstable; urgency=medium + + * New upstream release; adds SCH-A930 support, avoids hanging upon exit, + and includes other safe improvements. + * Build-depend on debhelper >= 5.0.37.3 to keep bitpim-lib from hitting + bug #375948 (wrong metadata for private extensions). + + -- Aaron M. Ucko Sun, 16 Jul 2006 16:35:59 -0400 + +bitpim (0.9.04.dfsg.1-1) unstable; urgency=medium + + * New upstream release; adds preliminary VX8300 support and some safe + bugfixes. + * Don't try to run ffmpeg with -hq, which not all versions recognize + even if they actually support mp3 output. (Closes: #375600.) + * Update pointer to unofficial ffmpeg packages in README.Debian. + * Bump debian/compat to 5 on principle; should be a no-op here, though. + + -- Aaron M. Ucko Wed, 28 Jun 2006 19:36:14 -0400 + +bitpim (0.9.03.dfsg.1-1) unstable; urgency=medium + + * New upstream release, mostly for bugfixes. + * Explicitly request new dh_python behavior via debian/pycompat ("2"). + + -- Aaron M. Ucko Fri, 23 Jun 2006 20:31:05 -0400 + +bitpim (0.9.02.dfsg.1-2) unstable; urgency=low + + * Update for new (0.4) Python policy, using python-support (unfixing + #358023 for the moment, but so be it), with additional logic to ensure + that BitPim's own code remains available in optimized (.pyo) form. + + -- Aaron M. Ucko Thu, 15 Jun 2006 18:10:49 -0400 + +bitpim (0.9.02.dfsg.1-1) unstable; urgency=medium + + * New upstream release (0.9.01 skipped due to bugs); urgency medium + because the set of supported phones has grown yet again. + + -- Aaron M. Ucko Wed, 7 Jun 2006 08:53:55 -0400 + +bitpim (0.9.00.dfsg.1-1) unstable; urgency=medium + + * New upstream milestone release. + + -- Aaron M. Ucko Wed, 17 May 2006 18:09:41 -0400 + +bitpim (0.8.14.dfsg.1-1) unstable; urgency=medium + + * New upstream release; urgency medium due to added support for further + phone models. + * Adjust for bmp2avi's new makefile, which buildmodules.py can now use. + * Require python-apsw >= 3.3.5r1 per upstream. + * Standards-Version: 3.7.2 (still no changes required). + + -- Aaron M. Ucko Tue, 9 May 2006 20:21:24 -0400 + +bitpim (0.8.13.dfsg.1-2) unstable; urgency=low + + * Stop patching brewcompressedimage.py in favor of depending on a + version of python-wxgtk2.6 new enough to support what upstream ships. + * Standards-Version: 3.7.1 (no changes required). + + -- Aaron M. Ucko Wed, 3 May 2006 20:49:30 -0400 + +bitpim (0.8.13.dfsg.1-1) unstable; urgency=medium + + * New upstream release; urgency medium because it fixes some + moderately annoying bugs and adds support for yet more phones. + * README.Debian: drop note about udev configuration, which upstream's + own documentation now addresses. + * Install upstream's (new) .desktop file. + + -- Aaron M. Ucko Tue, 25 Apr 2006 21:08:19 -0400 + +bitpim (0.8.12.dfsg.1-2) unstable; urgency=medium + + * The "I just shot myself in the foot, didn't I?" release. + * Add a symlink to work around python-support bug #363505, which + interferes with bitpim's ability to find python-dsv 1.4.0-2. + + -- Aaron M. Ucko Wed, 19 Apr 2006 19:07:05 -0400 + +bitpim (0.8.12.dfsg.1-1) unstable; urgency=medium + + * New upstream release; urgency medium due to interface bug fixes and + new (partial) support for one more phone model. + * Merge bitfling into the main bitpim package, as there wasn't actually + much point in keeping it separate. + + -- Aaron M. Ucko Sun, 16 Apr 2006 12:23:56 -0400 + +bitpim (0.8.11.dfsg.1-1) unstable; urgency=medium + + * New upstream release; urgency medium because it offers significant + improvements over previous versions, including support for four + additional phone models. + * Adjust packaging to reflect new upstream layout (and avoid version + skew between bitpim and bitfling). + * Fix typo in bitfling's short description. (Closes: #357647.) + * Optimize debian/rules slightly; in particular, take advantage of + upstream's new buildmodules.py script. + * Byte-compile bitpim's .py files with -Wignore to suppress + FutureWarnings that upstream characterizes as spurious. (Closes: + #358023.) + * Make a couple of minor corrections to debian/copyright per upstream's + feedback. + + -- Aaron M. Ucko Sat, 8 Apr 2006 17:38:46 -0400 + +bitpim (0.8.08.dfsg.2-3) unstable; urgency=low + + * Increase optimization to -OO per upstream's recommendation. + * README.Debian: Advise users that stock Debian systems do not support + encoding ringtones into the MP3 format due to patent concerns. + + -- Aaron M. Ucko Fri, 17 Mar 2006 18:34:10 -0500 + +bitpim (0.8.08.dfsg.2-2) unstable; urgency=low + + * More fixes to debian/copyright; in particular, spell the wxWidgets + license that applies to some components out rather than merely citing + it. + + -- Aaron M. Ucko Mon, 27 Feb 2006 19:38:51 -0500 + +bitpim (0.8.08.dfsg.2-1) unstable; urgency=low + + * New upstream tarball, with the outlook plugin removed on the grounds + of being useless on Unix and possibly derived from non-free code. + * Document remaining non-GPLed components' (GPL-compatible!) licenses in + debian/copyright. + + -- Aaron M. Ucko Sun, 26 Feb 2006 19:35:23 -0500 + +bitpim (0.8.08.dfsg.1-1) unstable; urgency=low + + * New upstream release, extracted from upstream CVS as before. + * Supply a plain-text version of upstream's changelog. + + -- Aaron M. Ucko Wed, 22 Feb 2006 14:06:07 -0500 + +bitpim (0.8.07.dfsg.1-1) unstable; urgency=low + + * Initial release, from an upstream CVS checkout with prebuilt binaries + removed. (Closes: #265585.) + * Backported brewcompressedimage.py to wxPython 2.6.1, as Debian does + not yet provide a newer version (thanks to #342189). + + -- Aaron M. Ucko Tue, 7 Feb 2006 18:46:22 -0500 + --- bitpim-1.0.5.dfsg.1.orig/debian/bitfling.sh +++ bitpim-1.0.5.dfsg.1/debian/bitfling.sh @@ -0,0 +1,2 @@ +#!/bin/sh +exec /usr/bin/python -OO /usr/share/bitpim/code/bp.py bitfling "$@" --- bitpim-1.0.5.dfsg.1.orig/debian/bitpim.postinst +++ bitpim-1.0.5.dfsg.1/debian/bitpim.postinst @@ -0,0 +1,21 @@ +#!/bin/sh +set -e + +#DEBHELPER# + +# Standard tools just arrange to produce unoptimized .pyc files; ensure +# that we also have optimized .pyo files for better performance. +# Also, supply -Wignore to suppress spurious FutureWarnings. (See #358023.) + +if test -x /usr/bin/pyversions; then + PYTHON=`pyversions -d` +else + PYTHON=python2.3 +fi + +if which $PYTHON >/dev/null 2>&1 && [ -e /usr/lib/$PYTHON/compileall.py ]; then + # $PYTHON -Wignore /usr/lib/$PYTHON/compileall.py -q /usr/share/bitpim + $PYTHON -OO -Wignore /usr/lib/$PYTHON/compileall.py -q /usr/share/bitpim/code +fi + +exit 0 --- bitpim-1.0.5.dfsg.1.orig/debian/bitpim.links +++ bitpim-1.0.5.dfsg.1/debian/bitpim.links @@ -0,0 +1,7 @@ +usr/lib/bitpim/bmp2avi.lbin usr/share/bitpim/helpers/bmp2avi.lbin +usr/bin/ffmpeg usr/share/bitpim/helpers/ffmpeg.lbin +usr/bin/pngtopnm usr/share/bitpim/helpers/pngtopnm.lbin +usr/bin/pnmtopng usr/share/bitpim/helpers/pnmtopng.lbin +usr/bin/ppmquant usr/share/bitpim/helpers/ppmquant.lbin +usr/share/python-support/python-dsv/DSV usr/share/bitpim/code/DSV +usr/share/misc/usb.ids usr/share/bitpim/resources/usb.ids --- bitpim-1.0.5.dfsg.1.orig/debian/bitpim.manpages +++ bitpim-1.0.5.dfsg.1/debian/bitpim.manpages @@ -0,0 +1,2 @@ +debian/bitfling.1 +debian/bitpim.1 --- bitpim-1.0.5.dfsg.1.orig/debian/compat +++ bitpim-1.0.5.dfsg.1/debian/compat @@ -0,0 +1 @@ +7 --- bitpim-1.0.5.dfsg.1.orig/debian/bitpim-lib.postinst +++ bitpim-1.0.5.dfsg.1/debian/bitpim-lib.postinst @@ -0,0 +1,24 @@ +#!/bin/sh +set -e + +#DEBHELPER# + +# Standard tools just arrange to produce unoptimized .pyc files; ensure +# that we also have optimized .pyo files for better performance. +# (Compile with -Wignore per #358023, and cover /usr/share/bitpim/code +# in addition to /usr/lib/bitpim to ensure that bitpim's .pyo files +# will remain valid when the default Python version changes.) + +if test -x /usr/bin/pyversions; then + PYTHON=`pyversions -d` +else + PYTHON=python2.3 +fi + +if which $PYTHON >/dev/null 2>&1 && [ -e /usr/lib/$PYTHON/compileall.py ]; then + for d in /usr/lib/bitpim /usr/share/bitpim/code; do + test -d $d && $PYTHON -OO -Wignore /usr/lib/$PYTHON/compileall.py -q $d + done +fi + +exit 0 --- bitpim-1.0.5.dfsg.1.orig/debian/control +++ bitpim-1.0.5.dfsg.1/debian/control @@ -0,0 +1,35 @@ +Source: bitpim +Section: comm +Priority: extra +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Aaron M. Ucko +Build-Depends: debhelper (>= 7.0.17ubuntu2), dpkg-dev (>= 1.14.17), lynx, python-dev (>= 2.5), python-support (>= 0.4.2), libusb-dev, swig, unzip +Build-Depends-Indep: imagemagick, python-apsw (>= 3.3.13-r1), python-crypto, python-dsv, python-paramiko, python-serial, python-wxgtk2.6 (>= 2.6.2) +Standards-Version: 3.8.0 +Homepage: http://www.bitpim.org/ + +Package: bitpim +Architecture: all +Depends: bitpim-lib, ${python:Depends}, python-apsw (>= 3.3.13-r1), python-crypto, python-dsv, python-paramiko, python-serial, python-wxgtk2.6 (>= 2.6.2), usbutils +Recommends: netpbm +Suggests: ffmpeg, udev +Provides: bitfling +Replaces: bitfling +Conflicts: bitfling +Breaks: udev (<< 136-1) +Description: utility to communicate with many CDMA phones + BitPim allows you to view and manipulate data on many phones from LG, + Samsung, Sanyo, and other manufacturers that use Qualcomm CDMA chips. + Depending on your phone model, you may be able to access the phone + book, the calendar, wallpapers, ring tones, and the filesystem. + +Package: bitpim-lib +Architecture: any +Depends: ${python:Depends}, ${shlibs:Depends} +Description: architecture-dependent helper files for BitPim + BitPim allows you to view and manipulate data on many phones from LG, + Samsung, Sanyo, and other manufacturers that use Qualcomm CDMA chips. + Depending on your phone model, you may be able to access the phone + book, the calendar, wallpapers, ring tones, and the filesystem. + . + This package contains a handful of architecture-dependent helper files. --- bitpim-1.0.5.dfsg.1.orig/debian/bitpim.prerm +++ bitpim-1.0.5.dfsg.1/debian/bitpim.prerm @@ -0,0 +1,9 @@ +#!/bin/sh +set -e + +#DEBHELPER# + +dpkg -L bitpim | + awk '$0~/\.py$/ {print $0"c\n" $0"o"}' | + xargs rm -f >&2 +exit 0 --- bitpim-1.0.5.dfsg.1.orig/debian/bitfling.1 +++ bitpim-1.0.5.dfsg.1/debian/bitfling.1 @@ -0,0 +1,23 @@ +.TH BITFLING 1 "2006-02-04" +.SH NAME +bitfling \- secure remote access to BitFling +.SH SYNOPSIS +.B bitfling +.SH DESCRIPTION +This manual page documents briefly the +.B bitfling +command. +.PP +BitFling lets BitPim run on one machine while your phone is connected +to a different machine, even across the Internet. It uses a protocol +over a secure connection to ensure this is safe. +.SH OPTIONS +None. +.SH SEE ALSO +.BR bitpim (1), +http://www.bitpim.org/. +.SH AUTHOR +\fBbitfling\fP was primarily written by Roger Binns . +.PP +This manual page was written by Aaron M. Ucko , +for the Debian project (but may be used by others). --- bitpim-1.0.5.dfsg.1.orig/debian/bitpim-lib.install +++ bitpim-1.0.5.dfsg.1/debian/bitpim-lib.install @@ -0,0 +1 @@ +usr/lib/bitpim --- bitpim-1.0.5.dfsg.1.orig/debian/pyversions +++ bitpim-1.0.5.dfsg.1/debian/pyversions @@ -0,0 +1 @@ +2.5- --- bitpim-1.0.5.dfsg.1.orig/debian/rules +++ bitpim-1.0.5.dfsg.1/debian/rules @@ -0,0 +1,119 @@ +#!/usr/bin/make -f +DEB_DESTDIR = $(CURDIR)/debian/tmp +datadir = /usr/share/bitpim +libdir = /usr/lib/bitpim +data_dest = $(DEB_DESTDIR)$(datadir) +lib_dest = $(DEB_DESTDIR)$(libdir) +code_dest = $(data_dest)/code +res_dest = $(data_dest)/resources +dtop_dest = $(DEB_DESTDIR)/usr/share/applications +udev_bin = $(DEB_DESTDIR)/lib/udev +conf_dest = $(DEB_DESTDIR)/etc/default +icon_dest = $(DEB_DESTDIR)/usr/share/pixmaps + +clean: + dh clean +# $(MAKE) -C src/native/av/bmp2avi clean PLATFORM=linux + rm -f src/native/av/bmp2avi/bmp2avi.lbin helpers/bmp2avi.lbin + cd src/native/strings && python setup.py clean -a && \ + rm -rf build *.so *.pyc + cd src/native/usb && rm -f libusb_wrap.c libusb.py _libusb.so *.pyc + chmod -x examples/* + rm -f debian/changelog.upstream debian/stamp-built + rm -f resources/60-bitpim.rules debian/bitpim.udev src/*.pyc src/*/*.pyc + +build: build-stamp +build-stamp: + dh build + mkdir -p helpers +# $(MAKE) -C src/native/av/bmp2avi PLATFORM=linux CXXFLAGS="$(CXXFLAGS)" +# cd src/native/strings && python setup.py build --build-base="./build" +# cd src/native/usb && sh -x ./build.sh + python packaging/buildmodules.py all + unzip -p resources/bitpim.htb versionhistory.htm \ + | lynx -dump -stdin -nolist > debian/changelog.upstream + touch $@ + +install-common: install-common-stamp +install-common-stamp: build-stamp + dh install --before dh_install + touch $@ + +install-arch: install-arch-stamp +install-arch-stamp: install-common-stamp + mkdir -p $(lib_dest)/native/usb + cp src/native/av/bmp2avi/bmp2avi.lbin $(lib_dest) + cd src/native/strings && \ + python setup.py install --root=$(DEB_DESTDIR) --no-compile -O0 \ + --install-lib=$(libdir)/native/strings + install -m644 src/native/strings/__init__.py $(lib_dest)/native/strings + cp src/native/usb/*.py src/native/usb/*.so $(lib_dest)/native/usb + dh install -a --until dh_perl + dh_pysupport -pbitpim-lib /usr/lib/bitpim + dh_installchangelogs -a debian/changelog.upstream + dh install -a --remaining + touch $@ + +install-indep: install-indep-stamp +install-indep-stamp: install-common-stamp + mkdir -p $(res_dest) + install -m644 resources/* $(res_dest) + rm -f $(res_dest)/bitpim.chm $(res_dest)/bpudev $(res_dest)/usb.ids + PYTHONPATH=src python -c 'import package; package.generate_udevrules()' + sort resources/60-bitpim.rules | sed -e 's:/usr/bin:/lib/udev:' \ + -e 's:RUN+=\("[^ ]*\) \(.*"\):&, ENV{REMOVE_CMD}=\1 --del \2:' \ + > debian/bitpim.udev + mkdir -p $(DEB_DESTDIR)/usr/bin + install -m755 debian/bitfling.sh $(DEB_DESTDIR)/usr/bin/bitfling + install -m755 debian/bitpim.sh $(DEB_DESTDIR)/usr/bin/bitpim + mkdir -p $(code_dest) + install -m644 src/*.py $(code_dest) + sed -e 's/^\(vendor=\)".*"/\1"Debian"/' src/version.py \ + > $(code_dest)/version.py + cd $(code_dest) && chmod +x analyser.py bp.py \ + brewcompressedimage.py calendarcontrol.py comdiagnose.py \ + comscan.py hexeditor.py setphone_wizard.py usb_ids.py version.py + mkdir $(code_dest)/native + install -m644 src/native/*.py $(code_dest)/native + install -m644 src/native/strings/jarowpy.py \ + $(code_dest)/native/strings.py + for x in egroupware evolution qtopiadesktop; do \ + mkdir -p $(code_dest)/native/$$x && \ + install -m644 src/native/$$x/*.py $(code_dest)/native/$$x; \ + done + mkdir $(code_dest)/phones + install -m644 src/phones/*.py $(code_dest)/phones + mkdir $(code_dest)/bitfling + install -m644 src/bitfling/*.py $(code_dest)/bitfling + chmod +x $(code_dest)/bitfling/xmlrpcstuff.py + mkdir -p $(dtop_dest) + sed -e 's,%%INSTALLBINDIR%%,/usr/bin,g' \ + -e 's,%%INSTALLLIBDIR%%,$(datadir),g' \ + -e 's,^\(Categories=\)Application;\(.*\);\(Utility\),\1\3;\2,' \ + -e 's,^\(Terminal=\)0,\1false,' \ + packaging/bitpim.desktop > $(dtop_dest)/bitpim.desktop + mkdir -p $(udev_bin) + install -m755 resources/bpudev $(udev_bin) + mkdir -p $(conf_dest) + install -m644 debian/bitpim.default $(conf_dest)/bitpim + mkdir -p $(icon_dest) + convert resources/bitfling.png $(icon_dest)/bitfling.xpm + convert resources/bitpim.ico $(icon_dest)/bitpim.xpm + dh install -i --until dh_perl + dh_pysupport -pbitpim + dh_installchangelogs -i debian/changelog.upstream + dh install -i --remaining + touch $@ + +install: install-arch install-indep + +binary-arch: install-arch-stamp + dh binary-arch + +binary-indep: install + dh binary-indep + +binary: binary-arch binary-indep + +.PHONY: build clean install-arch install-indep install +.PHONY: binary-arch binary-indep binary --- bitpim-1.0.5.dfsg.1.orig/debian/watch +++ bitpim-1.0.5.dfsg.1/debian/watch @@ -0,0 +1,8 @@ +# See uscan(1) for format +version=3 +# Upstream doesn't actually distribute tarballs, so we have to use +# binary packages as proxies and pull sources from Subversion. +opts=dversionmangle=s/\.dfsg\.\d+$// \ + http://sf.net/bitpim/bitpim-(\d+\.\d+\.\d+)-0\.i386\.rpm + + --- bitpim-1.0.5.dfsg.1.orig/debian/bitpim.menu +++ bitpim-1.0.5.dfsg.1/debian/bitpim.menu @@ -0,0 +1,13 @@ +?package(bitpim): \ + needs="x11" \ + section="Applications/Mobile Devices" \ + title="BitFling" \ + command="/usr/bin/bitfling" \ + icon="/usr/share/pixmaps/bitfling.xpm" + +?package(bitpim): \ + needs="x11" \ + section="Applications/Mobile Devices" \ + title="BitPim" \ + command="/usr/bin/bitpim" \ + icon="/usr/share/pixmaps/bitpim.xpm" --- bitpim-1.0.5.dfsg.1.orig/src/bp.py +++ bitpim-1.0.5.dfsg.1/src/bp.py @@ -16,6 +16,10 @@ @Note: Only gui mode is supported at the moment """ from __future__ import with_statement + +import wxversion +wxversion.select('2.6') + import sys import bp_cli --- bitpim-1.0.5.dfsg.1.orig/src/guiwidgets.py +++ bitpim-1.0.5.dfsg.1/src/guiwidgets.py @@ -2051,93 +2051,6 @@ if retcode==wx.ID_OK: data_recording.set_start(_dlg.GetSelection()) -# About Dialog----------------------------------------------------------------- -_license="""The BitPim code is under the GNU General Public License as detailed -below. Specific permission is granted for this code to be linked to -OpenSSL (this is necessary because the OpenSSL license is not -GPL-compatible). - - In addition, as a special exception, the BitPim copyright holders - give permission to link the code of this program with the OpenSSL - library (or with modified versions of OpenSSL), and distribute - linked combinations including the two. You must obey the GNU - General Public License in all respects for all of the code used - other than OpenSSL. If you modify any files, you may extend this - exception to your version of the file, but you are not obligated to - do so. If you do not wish to do so, delete this exception statement - from your version. - -Please also note that some code is taken from other projects with a -GPL compatible license. This is noted in the specific files. - -BitPim also uses several other components with GPL compatible -licenses. The online help details those components, credits the -authors and details the licenses. ---------------------------------------------------------------------- -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License version 2 as published by -the Free Software Foundation. - -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. Also see the BitPim Help for more details -""" - -_copyright="""(C) 2003-2007 The code in BitPim is copyright by several people. Please note the -comments at the top of each file, as well as version control history. -""" -_description=""" BitPim is a program that allows you to view and manipulate data on many CDMA phones - from LG, Samsung, Sanyo and other manufacturers. This includes the PhoneBook, - Calendar, WallPapers, RingTones (functionality varies by phone) and the - Filesystem for most Qualcomm CDMA chipset based phones. To see when phones will - be supported, which ones are already supported and which features are supported, - see online help. - -[%s] -""" -def _component_string(): - """return a CSV string of various software components being used by BitPim""" - _res=[] - _str=[] - # Python version - _str.append('Python %s'%sys.version.split()[0]) - _str.append('wxPython %s'%wx.version()) - _res.append(', '.join(_str)) - _str=[] - _str.append('APSW %s'%apsw.apswversion()) - _str.append('SQLITE %s'%apsw.sqlitelibversion()) - _res.append(', '.join(_str)) - _str=[] - _str.append('serial %s'%serial.VERSION) - # pywin32 version - try: - _pywin32ver=file(os.path.join(sys.prefix,'lib','site-packages', 'pywin32.version.txt'), - 'rt').read()[:-1] - _str.append('pywin32 %s'%_pywin32ver) - except: - pass - _res.append(', '.join(_str)) - return '\n'.join(_res) - -def show_about_dlg(parent): - global _license, _copyright, _description - info = wx.AboutDialogInfo() - info.Name = "BitPim" - info.Version = version.versionstring+" - "+version.vendor - info.Copyright=_copyright - info.Description = _description%_component_string() - info.WebSite = ("http://www.bitpim.org", "www.bitpim.org") - info.Developers = [ "Joe Pham", - "Stephen Wood", - "Sean Burke", - "Nathan Hjelm", - "and others ..."] - - info.License = _license - # Then we call wx.AboutBox giving it that info object - wx.AboutBox(info) - # Generic Print Dialog---------------------------------------------------------- class PrintDialog(wx.Dialog): """A generic print dialog from which other can subclass for their own use""" @@ -2168,7 +2081,7 @@ vbs.Add(wx.StaticLine(self, -1), 0, wx.EXPAND|wx.TOP|wx.BOTTOM, 5) hbs=wx.BoxSizer(wx.HORIZONTAL) for b in ((None, wx.ID_PRINT, self.OnPrint), - ('Page Setup', wx.ID_PAGE_SETUP, self.OnPageSetup), + ('Page Setup', wx.ID_PRINT_SETUP, self.OnPageSetup), (None, wx.ID_PREVIEW, self.OnPrintPreview), ('Save as HTML', -1, self.OnSaveHTML), (None, wx.ID_CLOSE, self.OnClose)): --- bitpim-1.0.5.dfsg.1.orig/src/comm_notify.py +++ bitpim-1.0.5.dfsg.1/src/comm_notify.py @@ -14,6 +14,7 @@ import signal import sys +import ctypes import wx bpCOMM_NOTIFICATION_EVENT = wx.NewEventType() @@ -58,8 +59,8 @@ self.mw.OnCommNotification(self.evt) return True -NotificationPath='/var/bitpim' -NotificationFile='/var/bitpim/dnotify.log' +NotificationPath='/var/run/bitpim' +NotificationFile='/var/run/bitpim/dnotify.log' def _process_notification(commobj): # read the log file & process its content @@ -98,8 +99,10 @@ if __debug__: raise return False - fcntl.fcntl(_global_fd, fcntl.F_NOTIFY, - fcntl.DN_MODIFY|fcntl.DN_CREATE|fcntl.DN_MULTISHOT) + flags=fcntl.DN_MODIFY|fcntl.DN_CREATE|fcntl.DN_MULTISHOT + # The business with ctypes ensures that fcntl's argument fits into + # a C integer, which might not otherwise occur on 64-bit systems. + fcntl.fcntl(_global_fd, fcntl.F_NOTIFY, ctypes.c_int(flags).value) mainwindow.log('USB Comm Watch started') return True --- bitpim-1.0.5.dfsg.1.orig/src/conversions.py +++ bitpim-1.0.5.dfsg.1/src/conversions.py @@ -25,10 +25,13 @@ helperdir=os.path.join(common.get_main_dir(), "helpers") -osext={'win32': '.exe', - 'darwin': '.mbin', - 'linux2': '.lbin'} \ - [sys.platform] +if sys.platform.startswith('gnukfreebsd'): + osext='.lbin' +else: + osext={'win32': '.exe', + 'darwin': '.mbin', + 'linux2': '.lbin'} \ + [sys.platform] # This shortname crap is needed because Windows programs (including ffmpeg) # don't correctly parse command line arguments. @@ -79,7 +82,7 @@ path=shell.SHGetFolderPath(0, shellcon.CSIDL_WINDOWS, None, 0) if path: lookin.append(path) - elif sys.platform=='linux2': + elif sys.platform=='linux2' or sys.platform.startswith('gnukfreebsd'): binary="pvconv" lookin.append(_expand("~/bin")) lookin.append(_expand("~")) @@ -134,7 +137,7 @@ osext=".exe" if sys.platform=='darwin': osext=".mbin" - if sys.platform=='linux2': + if sys.platform=='linux2' or sys.platform.startswith('gnukfreebsd'): osext=".lbin" pngtopnmbin=gethelperbinary('pngtopnm') @@ -239,7 +242,7 @@ ffmpeg=gethelperbinary("ffmpeg") with common.usetempfile('mp3') as mp3file: try: - run(ffmpeg, "-i", shortfilename(inputfilename), "-hq", "-ab", `bitrate`, "-ar", `samplerate`, "-ac", `channels`, shortfilename(mp3file)) + run(ffmpeg, "-i", shortfilename(inputfilename), "-ab", `bitrate`, "-ar", `samplerate`, "-ac", `channels`, shortfilename(mp3file)) except common.CommandExecutionFailed, e: # we get this exception on bad parameters, or any other # issue so we assume bad parameters for the moment. --- bitpim-1.0.5.dfsg.1.orig/src/todo.py +++ bitpim-1.0.5.dfsg.1/src/todo.py @@ -723,6 +723,8 @@ def _OnSave(self, evt): # save the current changes self.ignoredirty=True + # Enable the list to get the selection + self._item_list.Enable() sel_idx=self._item_list.GetSelection() k=self._item_list.GetClientData(sel_idx) entry=self._data[k] --- bitpim-1.0.5.dfsg.1.orig/src/gui.py +++ bitpim-1.0.5.dfsg.1/src/gui.py @@ -1088,7 +1088,13 @@ # about and help def OnHelpAbout(self,_): - guiwidgets.show_about_dlg(self) + import version + + str="BitPim Version "+version.versionstring+" - "+version.vendor + + d=wx.MessageDialog(self, str, "About BitPim", wx.OK|wx.ICON_INFORMATION) + d.ShowModal() + d.Destroy() def OnHelpHelp(self, _): wx.GetApp().displayhelpid(self.GetCurrentActiveWidget().GetHelpID()) --- bitpim-1.0.5.dfsg.1.orig/src/memo.py +++ bitpim-1.0.5.dfsg.1/src/memo.py @@ -514,6 +514,8 @@ def _OnSave(self, evt): # save the current changes self.ignoredirty=True + # Enable the list to get the selection + self._item_list.Enable() sel_idx=self._item_list.GetSelection() k=self._item_list.GetClientData(sel_idx) entry=self._data[k] --- bitpim-1.0.5.dfsg.1.orig/src/database.py +++ bitpim-1.0.5.dfsg.1/src/database.py @@ -653,7 +653,7 @@ schema=self.getcolumns(tablename) res=[] - for row in self.sqlmany("select * from %s where __rowid__=?" % (idquote(tablename),), [(int(r),) for r in rows.split(',') if len(r)]): + for row in self.sqlmany("select * from %s where __rowid__=?" % (idquote(tablename),), [(int(r.rstrip('Ll')),) for r in rows.split(',') if len(r)]): record={} for colnum,name,type in schema: if name.startswith("__") or type not in ("valueBLOB", "indirectBLOB", "indirectdictBLOB") or row[colnum] is None: --- bitpim-1.0.5.dfsg.1.orig/src/importexport.py +++ bitpim-1.0.5.dfsg.1/src/importexport.py @@ -23,7 +23,7 @@ import wx.html # Others -from thirdparty import DSV +from DSV import DSV # My modules import common --- bitpim-1.0.5.dfsg.1.orig/src/newdb_wiz.py +++ bitpim-1.0.5.dfsg.1/src/newdb_wiz.py @@ -21,7 +21,6 @@ # wx modules import wx import wx.wizard as wiz -from wx.lib.expando import ExpandoTextCtrl # BitPim modules import bp_config @@ -68,7 +67,7 @@ vbs=wx.BoxSizer(wx.VERTICAL) vbs.Add(wx.StaticText(self, -1, 'Storage Dir:'), 0, wx.EXPAND|wx.ALL, 5) - self.path=ExpandoTextCtrl(self, -1, '', style=wx.TE_READONLY) + self.path=wx.StaticText(self, -1, '') self.path.SetBackgroundColour(self.GetBackgroundColour()) vbs.Add(self.path, 0, wx.EXPAND|wx.ALL, 5) btn=wx.Button(self, -1, 'Browse') @@ -77,14 +76,14 @@ return vbs def ok(self): - return bool(self.path.GetValue()) + return bool(self.path.GetLabel()) def get(self, data): - data['path']=self.path.GetValue() + data['path']=self.path.GetLabel() def set(self, data): path=data.get('path', '') if not path: path=os.path.join(self.defaultdir, data.get('name', '')) - self.path.SetValue(path) + self.path.SetLabel(path) def OnBrowse(self, _): with guihelper.WXDialogWrapper(wx.DirDialog(self, defaultPath=self.path.GetLabel(), @@ -137,7 +136,7 @@ def GetMyControls(self): vbs=wx.StaticBoxSizer(wx.StaticBox(self, -1, 'Selection Summary:'), wx.VERTICAL) - self.summary=ExpandoTextCtrl(self, -1, '') + self.summary=wx.StaticText(self, -1, '') self.summary.SetBackgroundColour(self.GetBackgroundColour()) vbs.Add(self.summary, 0, wx.EXPAND|wx.ALL, 5) self._box=vbs @@ -154,7 +153,7 @@ text.append('Create a shortcut on your Desktop.') if data.get('startmenu', False): text.append('Create a shortcut in your Start Menu.') - self.summary.SetValue('\n\n'.join(text)) + self.summary.SetLabel('\n\n'.join(text)) #------------------------------------------------------------------------------- class NewDBWizard(wiz.Wizard): --- bitpim-1.0.5.dfsg.1.orig/src/imp_cal_wizard.py +++ bitpim-1.0.5.dfsg.1/src/imp_cal_wizard.py @@ -18,7 +18,6 @@ import wx import wx.wizard as wiz import wx.lib.scrolledpanel as scrolled -from wx.lib.expando import ExpandoTextCtrl # BitPim import common_calendar @@ -91,17 +90,27 @@ vbs=wx.BoxSizer(wx.VERTICAL) vbs.Add(wx.StaticText(self, -1, 'Source of data:'), 0, wx.ALL|wx.EXPAND, 5) - self._source_lbl=ExpandoTextCtrl(self, -1, '', style=wx.TE_READONLY) + # set the label in a scrolled panel, so the user can scroll to view + # the file name if it's too long. + sp=scrolled.ScrolledPanel(self, -1, size=(-1, 50)) + boxsizer=wx.BoxSizer(wx.VERTICAL) + self._source_lbl=wx.StaticText(sp, -1, '') self._source_lbl.SetBackgroundColour(self.GetBackgroundColour()) - vbs.Add(self._source_lbl, 0, wx.ALL|wx.EXPAND, 5) - + boxsizer.Add(self._source_lbl, 1, wx.ALL|wx.EXPAND, 5) + sp.SetSizer(boxsizer) + sp.SetAutoLayout(True) + sp.SetupScrolling(scroll_y=False) + vbs.Add(sp, 0, wx.ALL|wx.EXPAND, 5) + self.sp=sp _btn=wx.Button(self, -1, 'Browse') wx.EVT_BUTTON(self, _btn.GetId(), self._OnBrowse) vbs.Add(_btn, 0, wx.ALL, 5) return vbs def setlabel(self): - self._source_lbl.SetValue(self._source.name()) + self._source_lbl.SetLabel(self._source.name()) + # update the scrolled panel + self.sp.SetVirtualSize(self.sp.GetBestVirtualSize()) @guihelper.BusyWrapper def _OnBrowse(self, _=None): @@ -200,7 +209,9 @@ ID_ADD=wx.NewId() ID_MERGE=wx.NewId() def __init__(self, parent, id=-1, title='Calendar Import Wizard'): - super(ImportCalendarWizard, self).__init__(parent, id, title) + super(ImportCalendarWizard, self).__init__(parent, id, title, + style=wx.DEFAULT_DIALOG_STYLE|\ + wx.RESIZE_BORDER) self._data={} _import_type_page=ImportTypePage(self) _import_source_page=ImportSourcePage(self) --- bitpim-1.0.5.dfsg.1.orig/src/bphtml.py +++ bitpim-1.0.5.dfsg.1/src/bphtml.py @@ -468,7 +468,7 @@ if Renderer._lastsize!=size or Renderer._lastfont!=font: Renderer._hdc.SetFonts(font, "", [int(x*size) for x in _scales]) Renderer._hdc.SetHtmlText(html, basepath) - Renderer._hdc.Render(0, 0, (), 0, False) + Renderer._hdc.Render(0,0,0,False) return (Renderer._mdc.MaxX(), Renderer._mdc.MaxY()) def getbestsize(dc, html, basepath="", font="", size=10): @@ -484,7 +484,7 @@ hdc.SetDC(dc, 1) hdc.SetSize(rect.width, rect.height) hdc.SetHtmlText(html, basepath) - hdc.Render(rect.x, rect.y, (), 0, False) + hdc.Render(rect.x, rect.y, 0, False) dc.SetUserScale(*origscale) --- bitpim-1.0.5.dfsg.1.orig/src/fileview.py +++ bitpim-1.0.5.dfsg.1/src/fileview.py @@ -198,17 +198,17 @@ def OnDragOver(self, x, y, d): if self.drag_over: return self.target.OnDragOver(x,y,d) - return wx.FileDropTarget.OnDragOver(self, x, y, d) + return wx.FileDropTarget.base_OnDragOver(self, x, y, d) def OnEnter(self, x, y, d): if self.enter_leave: return self.target.OnEnter(x,y,d) - return wx.FileDropTarget.OnEnter(self, x, y, d) + return wx.FileDropTarget.base_OnEnter(self, x, y, d) def OnLeave(self): if self.enter_leave: return self.target.OnLeave() - return wx.FileDropTarget.OnLeave(self) + return wx.FileDropTarget.base_OnLeave(self) class FileView(wx.Panel, widgets.BitPimWidget): --- bitpim-1.0.5.dfsg.1.orig/src/native/__init__.py +++ bitpim-1.0.5.dfsg.1/src/native/__init__.py @@ -1 +1,3 @@ -# keep python happy +# Handle Debian's split-up layout +__path__.insert(0, '/usr/lib/bitpim/native') + --- bitpim-1.0.5.dfsg.1.orig/src/native/av/bmp2avi/avi_file.cxx +++ bitpim-1.0.5.dfsg.1/src/native/av/bmp2avi/avi_file.cxx @@ -10,6 +10,8 @@ #include "avi_file.h" #include "byte_order.h" +#include + // endian conversion routines AVIMAINHEADER endian(const AVIMAINHEADER &hdr) { --- bitpim-1.0.5.dfsg.1.orig/src/native/av/bmp2avi/Makefile +++ bitpim-1.0.5.dfsg.1/src/native/av/bmp2avi/Makefile @@ -14,5 +14,5 @@ SRC=avi_file.cxx bmp_file.cxx b2a.cxx bmp2avi.lbin bmp2avi.mbin bmp2avi.exe: $(SRC) - $(CXX) $(EXTRADEFINES) -O2 -o $@ $(SRC) + $(CXX) $(EXTRADEFINES) $(CXXFLAGS) -o $@ $(SRC) --- bitpim-1.0.5.dfsg.1.orig/src/native/av/bmp2avi/bmp_file.cxx +++ bitpim-1.0.5.dfsg.1/src/native/av/bmp2avi/bmp_file.cxx @@ -12,6 +12,8 @@ #include "bmp_file.h" #include "byte_order.h" +#include + using namespace std; BMPFile::BMPFile(): --- bitpim-1.0.5.dfsg.1.orig/src/native/usb/build.sh +++ bitpim-1.0.5.dfsg.1/src/native/usb/build.sh @@ -1,7 +1,8 @@ -PYTHONVER=python2.5 +#!/bin/sh +PYTHONVER=python INCLUDEDIR=`$PYTHONVER -c "import distutils.sysconfig; print distutils.sysconfig.get_python_inc()"` swig -python -I/usr/include libusb.i -gcc -fPIC -Wall -fno-strict-aliasing -O2 -g -shared -I $INCLUDEDIR -o _libusb.so libusb_wrap.c -lusb -strip _libusb.so +gcc -fPIC -Wall -fno-strict-aliasing $CFLAGS -shared -I $INCLUDEDIR -o _libusb.so libusb_wrap.c -lusb +# strip _libusb.so --- bitpim-1.0.5.dfsg.1.orig/src/native/usb/libusb.i +++ bitpim-1.0.5.dfsg.1/src/native/usb/libusb.i @@ -51,11 +51,11 @@ // in usb_get_string{,_simple} %cstring_output_maxsize(char *buf, size_t buflen); -// usb_bulk_write - binary string with length +// usb_{bulk,interrupt}_write - binary string with length %apply (char *STRING, int LENGTH) { (char *bytes, int size) } -// usb_interrupt_write - binary string with length -%apply (char *STRING, int LENGTH) { (char *bytes, int size) } +// bytes is const in Debian's packaging as of 2:0.2.12-10, per #473814. +%apply (char *STRING, int LENGTH) { (const char *bytes, int size) } // these types occur in Linux and SWIG doesn't know they are ints unless we tell typedef unsigned short u_int16_t; --- bitpim-1.0.5.dfsg.1.orig/src/native/evolution/evolution.py +++ bitpim-1.0.5.dfsg.1/src/native/evolution/evolution.py @@ -38,7 +38,7 @@ import os import re -if sys.platform!="linux2": +if sys.platform!="linux2" and not sys.platform.startswith('gnukfreebsd'): raise ImportError() try: @@ -48,7 +48,7 @@ userdir=os.path.expanduser("~") -evolutionpath="evolution/local" +evolutionpath=".evolution/addressbook/local/system" evolutionbasedir=os.path.join(userdir, evolutionpath) evolutionexporter = { 'command' : "evolution-addressbook-export", --- bitpim-1.0.5.dfsg.1.orig/src/phones/com_samsung.py +++ bitpim-1.0.5.dfsg.1/src/phones/com_samsung.py @@ -16,7 +16,7 @@ import time # site-packages -from thirdparty import DSV +from DSV import DSV # BitPim modules import bpcalendar --- bitpim-1.0.5.dfsg.1.orig/resources/bpudev +++ bitpim-1.0.5.dfsg.1/resources/bpudev @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh ### ### BITPIM ### @@ -14,6 +14,15 @@ # $3=SYSFS{devnum} # +if [ "x$1" = "x--del" ]; then + action=del + # Compensate for udev quirkiness + test -n "$2" || set del "$DEVNAME" "$3" "$4" + shift +else + action=add +fi + # Some basic checking for args if [ $# -ne 3 ]; then exit 1 @@ -26,14 +35,23 @@ exit 2 fi -# Change the device file group to "cellusers", if such group exists. -chgrp cellusers "$1" || true -# ensure the proper permission -chmod 0664 "$1" || true +BPUDEV_USER= +BPUDEV_GROUP= +BPUDEV_MODE=0664 + +if test -r /etc/default/bitpim; then + . /etc/default/bitpim +fi + +if [ "$action" = "add" ]; then + [ -z "$BPUDEV_USER" ] || chown "$BPUDEV_USER" "$1" || true + [ -z "$BPUDEV_GROUP" ] || chgrp "$BPUDEV_GROUP" "$1" || true + chmod "$BPUDEV_MODE" "$1" || true +fi # Notify BitPim that there's a new USB device -if [ ! -d /var/bitpim ] +if [ ! -d /var/run/bitpim ] then - mkdir /var/bitpim + mkdir /var/run/bitpim fi -echo add $1 > /var/bitpim/dnotify.log +echo $action $1 > /var/run/bitpim/dnotify.log --- bitpim-1.0.5.dfsg.1.orig/packaging/buildmodules.py +++ bitpim-1.0.5.dfsg.1/packaging/buildmodules.py @@ -35,7 +35,7 @@ if "usb" in args: # USB print "===== src/native/usb" - if sys.platform in ('darwin', 'linux2'): + if sys.platform != 'win32': os.chdir("src/native/usb") if os.path.exists("_libusb.so"): os.remove("_libusb.so") @@ -68,9 +68,12 @@ if "bmp2avi" in args: # BMP2AVI convertor print "==== src/native/av/bmp2avi" - fname={'linux2': 'bmp2avi.lbin', - 'darwin': 'bmp2avi.mbin', - 'win32': 'bmp2avi.exe'}[sys.platform] + if sys.platform.startswith('gnukfreebsd'): + fname='bmp2avi.lbin' + else: + fname={'linux2': 'bmp2avi.lbin', + 'darwin': 'bmp2avi.mbin', + 'win32': 'bmp2avi.exe'}[sys.platform] if os.path.exists(os.path.join("helpers", fname)): os.remove(os.path.join("helpers", fname)) os.chdir("src/native/av/bmp2avi")