--- gpixpod-0.6.2.orig/debian/changelog +++ gpixpod-0.6.2/debian/changelog @@ -0,0 +1,93 @@ +gpixpod (0.6.2-0ubuntu8) natty; urgency=low + + * Rebuild with python 2.7 as the python default. + + -- Matthias Klose Wed, 08 Dec 2010 15:04:06 +0000 + +gpixpod (0.6.2-0ubuntu7) natty; urgency=low + + * Rebuild to add support for python 2.7. + + -- Matthias Klose Fri, 03 Dec 2010 00:00:48 +0000 + +gpixpod (0.6.2-0ubuntu6) jaunty; urgency=low + + * python 2.6 transition (LP: #341258) + - debian/control: XS-Python-Version: 2.5 -> current + - debian/rules: + + Disable Makefile, using direct setup.py commands and python.mk + * Clean direct patches, restored original Makefile, gpixpod, + imgconvert/Makefile from orig.tar.gz + * Add patches 10_gpixpod_python.dpatch, 20_imgconvert_Makefile_fix.dpatch + * debian/control: Standards-Version: 3.7.3 -> 3.8.0 (using Homepage field) + + -- Savvas Radevic Wed, 11 Mar 2009 18:54:37 +0100 + +gpixpod (0.6.2-0ubuntu5) hardy; urgency=low + + * debian/watch: + + Updated download page. (LP: #180947) + * debian/rules: + + Complemented the package's clean call to fix a lintian warning: + debian-rules-ignores-make-clean-error. + * debian/control: + + Fixed a typo error with Python version to avoid a lintian warning: + malformed-python-version. + + Bumped Standards-Version to 3.7.3. + * debian/patches: + + Added the description of both patches to fix a lintian warning: + dpatch-missing-description. + + -- Miguel Ruiz Mon, 07 Jan 2008 01:38:50 -0300 + +gpixpod (0.6.2-0ubuntu4) gutsy; urgency=low + + * debian/control: adding dpatch to build-depends + * debian/rules: adding patching rules for dpatch + * Added 01_about-window patch, now about window can + be closed using "close" button.(Thanks to Diego Ongaro + for the patch) (LP: #64206) + * Added 02_new-album patch (Thanks to Luca Falavigna)to prevent + a crash while opening a new album with another album already open. (LP: #94404) + + -- Andrea Veri Thu, 14 Jun 2007 23:38:48 +0200 + +gpixpod (0.6.2-0ubuntu3) feisty; urgency=low + + * Use python by default (LP: 93506) + * Switch to python2.5 in debian/changelog + * Update maintainer field in debian/control + + -- Luca Falavigna Sat, 24 Mar 2007 12:07:23 +0100 + +gpixpod (0.6.2-0ubuntu2) feisty; urgency=low + + * Rebuild for python2.5 as the default python version. + + -- Matthias Klose Fri, 12 Jan 2007 13:20:00 +0000 + +gpixpod (0.6.2-0ubuntu1) feisty; urgency=low + + * New upstream release. + + -- Lukas Fittl Tue, 12 Dec 2006 00:43:32 +0100 + +gpixpod (0.6.0-0ubuntu2) edgy; urgency=low + + * Switch python2.4-* dependencies to python-* dependencies. + (Closes: Malone #64263) + + -- Jeremie Corbier Sat, 7 Oct 2006 10:51:31 -0700 + +gpixpod (0.6.0-0ubuntu1) edgy; urgency=low + + * Debian package for GPixPod 0.6.0 release. + * Following new Debian policy for python applications. + . + [Daniel Holbach] + * debian/control: + - added libgtk2.0-dev as Build-Depends. + - Architecture: i386 -> any. + + -- Flavio Gargiulo Sat, 09 Sep 2006 19:07:41 +0200 + --- gpixpod-0.6.2.orig/debian/compat +++ gpixpod-0.6.2/debian/compat @@ -0,0 +1 @@ +5 --- gpixpod-0.6.2.orig/debian/control +++ gpixpod-0.6.2/debian/control @@ -0,0 +1,36 @@ +Source: gpixpod +Section: graphics +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Flavio Gargiulo +Build-Depends: debhelper(>= 5.0.37.2), python-all-dev, python-support (>= 0.3), libgtk2.0-dev, dpatch +Standards-Version: 3.8.0 +XS-Python-Version: current +Homepage: http://www.gpixpod.org + +Package: gpixpod +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-gtk2 (>= 2.8), python-glade2 (>= 2.8) +XB-Python-Version: ${python:Versions} +Description: Organize photos on your iPod, freely! + GPixPod is a new PyGTK application to organize photos and photo + albums on recent photo-capable Apple iPod models, developed by + Flavio Gargiulo, www.FLAGAR.com. + . + It is at the moment the free, open source and cross-platform + alternative to iTunes for uploading photos on your iPod. Its + approach to modify manually the elements in the Photo Database + of your iPod could be also more useful than the syncing-only + method of iTunes. + . + For the GNU/Linux user, it is the perfect complement of GtkPod + and similar programs (such as Rhythmbox, Banshee) which organize + music and videos. In fact, managing photos was the only feature + of my iPod that I was not able to use from my GNU/Linux box: + thus I decided to write my own application, following the great + documentation about the formats of the files on the iPod found + on the iPodLinux.org portal. + . + Nothing could have been done without the great effort in + documenting done on that wiki. Special thanks go to Henryk Plotz, + for its original concept code. --- gpixpod-0.6.2.orig/debian/copyright +++ gpixpod-0.6.2/debian/copyright @@ -0,0 +1,31 @@ +This package was debianized by Flavio Gargiulo on +Sat, 09 Sep 2006 19:07:41 +0200. + +It was downloaded from http://sourceforge.net/projects/gpixpod + +Copyright Holder: Flavio Gargiulo (FLAGAR.com) + +License: + + Copyright (C) 2006 Flavio Gargiulo (FLAGAR.com) + + iTunes and iPod are trademarks of Apple. + GPixPod is not supported/written/published by Apple! + + 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 + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + --- gpixpod-0.6.2.orig/debian/docs +++ gpixpod-0.6.2/debian/docs @@ -0,0 +1,2 @@ +README +TODO --- gpixpod-0.6.2.orig/debian/pycompat +++ gpixpod-0.6.2/debian/pycompat @@ -0,0 +1 @@ +2 --- gpixpod-0.6.2.orig/debian/rules +++ gpixpod-0.6.2/debian/rules @@ -0,0 +1,96 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/dpatch/dpatch.make +# py_setup_install_args +include /usr/share/python/python.mk + +CFLAGS = -Wall -g +DESTDIR=$(CURDIR)/debian/gpixpod +libinstalldir=usr/lib/gpixpod + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +configure: configure-stamp +configure-stamp: + dh_testdir + # Add here commands to configure the package. + touch configure-stamp + + +build: build-stamp + +build-stamp: patch-stamp configure-stamp + dh_testdir + # Add here commands to compile the package. + python setup.py build + #docbook-to-man debian/gpixpod.sgml > gpixpod.1 + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + # Add here commands to clean up after the build process. + python setup.py clean --all + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + # Add here commands to install the package into debian/gpixpod. + python setup.py install --no-compile --root=$(DESTDIR) --install-lib=/usr/lib/gpixpod $(py_setup_install_args) + chmod 0755 $(DESTDIR)/$(libinstalldir)/gpixpod.py $(DESTDIR)/$(libinstalldir)/gpixpod_cli.py $(DESTDIR)/$(libinstalldir)/mh.py + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs CHANGELOG + dh_installdocs + dh_installexamples +# dh_install +# dh_installmenu +# dh_installdebconf +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_installinit +# dh_installcron +# dh_installinfo + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms +# dh_perl + dh_pysupport /$(libinstalldir) +# dh_python /usr/lib/gpixpod +# dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- gpixpod-0.6.2.orig/debian/watch +++ gpixpod-0.6.2/debian/watch @@ -0,0 +1,3 @@ +version=3 + +http://sf.net/gpixpod/gpixpod-([\d\.]*)\.tar\.gz debian uupdate --- gpixpod-0.6.2.orig/debian/patches/00list +++ gpixpod-0.6.2/debian/patches/00list @@ -0,0 +1,4 @@ +01_about-window.dpatch +02_new-album.dpatch +10_gpixpod_python.dpatch +20_imgconvert_Makefile_fix.dpatch --- gpixpod-0.6.2.orig/debian/patches/10_gpixpod_python.dpatch +++ gpixpod-0.6.2/debian/patches/10_gpixpod_python.dpatch @@ -0,0 +1,13 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_gpixpod_python.dpatch by Savvas Radevic +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: python2.4 -> python + +@DPATCH@ +--- gpixpod-0.6.2.orig/gpixpod ++++ gpixpod-0.6.2/gpixpod +@@ -1,2 +1,2 @@ + #!/bin/bash +-exec python2.4 /usr/lib/gpixpod/gpixpod.py "$@" ++exec python /usr/lib/gpixpod/gpixpod.py "$@" --- gpixpod-0.6.2.orig/debian/patches/01_about-window.dpatch +++ gpixpod-0.6.2/debian/patches/01_about-window.dpatch @@ -0,0 +1,26 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_about-window.dpatch by Andrea Veri +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Enable the "close" window button. + +@DPATCH@ +--- gpixpod.orig/gpixpod.py 2006-10-11 23:24:21.000000000 -0500 ++++ gpixpod.mod/gpixpod.py 2006-10-11 23:39:42.000000000 -0500 +@@ -1411,11 +1411,16 @@ + gtk.about_dialog_set_url_hook(self.LaunchBrowser) + self.about = gtk.glade.XML('gpixpod.glade', 'aboutdialog1', 'gpixpod') + self.aboutdlg = self.about.get_widget('aboutdialog1') ++ self.aboutdlg.connect('response', self.DestroyAbout) + if self.icon: + self.aboutdlg.set_icon_from_file(self.icon) + if self.logo: + self.aboutdlg.set_logo(gtk.gdk.pixbuf_new_from_file(self.logo)) + ++ def DestroyAbout(self, dialog, response_id): ++ """ Destroy the About dialog """ ++ self.aboutdlg.destroy() ++ + def ShowPreferences(self, widget): + """ Show the preferences dialog """ + self.preferences = gtk.glade.XML('gpixpod.glade', 'preferencesdialog', 'gpixpod') --- gpixpod-0.6.2.orig/debian/patches/02_new-album.dpatch +++ gpixpod-0.6.2/debian/patches/02_new-album.dpatch @@ -0,0 +1,27 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_new-album.dpatch by Andrea Veri +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Prevent a crash while opening a new album with another album already open. + +@DPATCH@ +--- gpixpod-0.6.2.orig/mh.py ++++ gpixpod-0.6.2/mh.py +@@ -86,6 +86,8 @@ + self.thumbdims = tuple(map(lambda(x): x[0]*x[1]*2, self.thumbsizes)) + if opening: + self.Open() ++ self.PX_ADDED = [] ++ self.PX_REMOVED = [] + + def Open(self): + """ Actually open and process the Photo Database file """ +@@ -117,8 +119,6 @@ + self._ThumbsExtract() + self.WriteDatabaseLog() + # Enfast saving, avoiding rebuilding thumbs if there are no deletions +- self.PX_ADDED = [] +- self.PX_REMOVED = [] + + def _PhotoCreationDate(self, filename): + """ Try to get the date of the image from the EXIF headers, otherwise from the file """ --- gpixpod-0.6.2.orig/debian/patches/20_imgconvert_Makefile_fix.dpatch +++ gpixpod-0.6.2/debian/patches/20_imgconvert_Makefile_fix.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 20_imgconvert_Makefile_fix.dpatch by Savvas Radevic +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix imgconvert/Makefile + +@DPATCH@ +--- gpixpod-0.6.2.orig/imgconvert/Makefile ++++ gpixpod-0.6.2/imgconvert/Makefile +@@ -1,7 +1,7 @@ + CC=gcc + LD=gcc +-CFLAGS=-Wall -fPIC `pkg-config --cflags gtk+-2.0` -I/usr/include/python2.4 -g +-LLDFLAGS=-Wall -shared `pkg-config --libs gtk+-2.0` -lpython2.4 -g ++CFLAGS=-Wall -fPIC `pkg-config --cflags gtk+-2.0` -I/usr/include/python -g ++LLDFLAGS=-Wall -shared `pkg-config --libs gtk+-2.0` -lpython -g + SLDFLAGS=-Wall `pkg-config --libs gtk+-2.0` -g + + all: imgconvert.o imgconvertmodule.o