[Pkg-gtkpod-devel] r240 - in libgpod/branches/etch-bpo: debian src
djpig at alioth.debian.org
djpig at alioth.debian.org
Fri Aug 31 19:02:45 UTC 2007
Author: djpig
Date: 2007-08-31 19:02:45 +0000 (Fri, 31 Aug 2007)
New Revision: 240
Added:
libgpod/branches/etch-bpo/debian/libgpod2-nogtk.lintian-overrides
libgpod/branches/etch-bpo/debian/patches/
Modified:
libgpod/branches/etch-bpo/debian/changelog
libgpod/branches/etch-bpo/debian/control
libgpod/branches/etch-bpo/debian/rules
libgpod/branches/etch-bpo/src/itdb_artwork.c
Log:
Merge changes between 0.5.2-2 and 0.5.2-4
Modified: libgpod/branches/etch-bpo/debian/changelog
===================================================================
--- libgpod/branches/etch-bpo/debian/changelog 2007-08-31 18:55:47 UTC (rev 239)
+++ libgpod/branches/etch-bpo/debian/changelog 2007-08-31 19:02:45 UTC (rev 240)
@@ -1,10 +1,26 @@
-libgpod (0.5.2-2~bpo.1) etch-backports; urgency=low
+libgpod (0.5.2-4~bpo.1) etch-backports; urgency=low
- [ Frank Lichtenheld ]
* Recompile against etch
- -- Frank Lichtenheld <djpig at debian.org> Sat, 28 Jul 2007 15:29:30 +0200
+ -- Frank Lichtenheld <djpig at debian.org> Fri, 31 Aug 2007 21:01:32 +0200
+libgpod (0.5.2-4) unstable; urgency=low
+
+ * Upload to unstable.
+ * Included patch to fix missing check for strchr return
+ value, 01_strchr_return_value.dpatch (Closes: #438126).
+
+ -- Nico Golde <nion at debian.org> Thu, 16 Aug 2007 01:37:25 +0200
+
+libgpod (0.5.2-3) experimental; urgency=low
+
+ * Build a package without artwork support, which
+ avoids the libgtk dependency (Closes: #386715).
+ * Redo build system without cdbs.
+ * Both based on a patch by Sune Vuorela, thanks.
+
+ -- Frank Lichtenheld <djpig at debian.org> Tue, 17 Jul 2007 17:30:17 +0200
+
libgpod (0.5.2-2) unstable; urgency=low
* Upload to unstable
Modified: libgpod/branches/etch-bpo/debian/control
===================================================================
--- libgpod/branches/etch-bpo/debian/control 2007-08-31 18:55:47 UTC (rev 239)
+++ libgpod/branches/etch-bpo/debian/control 2007-08-31 19:02:45 UTC (rev 240)
@@ -3,16 +3,46 @@
Section: libs
Maintainer: gtkpod Maintainers <pkg-gtkpod-devel at lists.alioth.debian.org>
Uploaders: Frank Lichtenheld <djpig at debian.org>, Nico Golde <nion at debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), autotools-dev, cdbs, libglib2.0-dev (>= 2.4), libgtk2.0-dev, intltool, pkg-config, swig, python (>= 2.3.5-7), python-all-dev, python-central (>= 0.5), python-mutagen
+Build-Depends: debhelper (>= 5.0.37.2), autotools-dev, libglib2.0-dev (>= 2.4), libgtk2.0-dev, intltool, pkg-config, swig, python (>= 2.3.5-7), python-all-dev, python-central (>= 0.5), python-mutagen, dpatch
Standards-Version: 3.7.2
XS-Python-Version: all
XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-gtkpod/libgpod/trunk/
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-gtkpod/libgpod/trunk/
+Package: libgpod-nogtk-dev
+Section: libdevel
+Architecture: any
+Depends: libgpod2-nogtk (= ${binary:Version}), libglib2.0-dev
+Conflicts: libgpod-dev
+Description: a library to read and write songs and artwork to an iPod
+ libgpod is a library meant to abstract access to an iPod content. It
+ provides an easy to use API to retrieve the list of files and playlist
+ stored on an iPod, to modify them and to save them back to the iPod
+ .
+ This version does not include artwork support.
+ .
+ This package contains the include files and static library.
+
+Package: libgpod2-nogtk
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libgpod2
+Recommends: libgpod-common
+Description: a library to read and write songs and artwork to an iPod
+ libgpod is a library meant to abstract access to an iPod content. It
+ provides an easy to use API to retrieve the list of files and playlist
+ stored on an iPod, to modify them and to save them back to the iPod
+ .
+ This version does not include artwork support.
+ .
+ This package contains the shared library.
+
Package: libgpod-dev
Section: libdevel
Architecture: any
Depends: libgpod2 (= ${binary:Version}), libgtk2.0-dev, libglib2.0-dev
+Conflicts: libgpod-nogtk-dev
Description: a library to read and write songs and artwork to an iPod
libgpod is a library meant to abstract access to an iPod content. It
provides an easy to use API to retrieve the list of files and playlist
@@ -25,6 +55,7 @@
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: libgpod-common
+Conflicts: libgpod2-nogtk
Description: a library to read and write songs and artwork to an iPod
libgpod is a library meant to abstract access to an iPod content. It
provides an easy to use API to retrieve the list of files and playlist
Copied: libgpod/branches/etch-bpo/debian/libgpod2-nogtk.lintian-overrides (from rev 239, libgpod/tags/0.5.2-4/debian/libgpod2-nogtk.lintian-overrides)
===================================================================
--- libgpod/branches/etch-bpo/debian/libgpod2-nogtk.lintian-overrides (rev 0)
+++ libgpod/branches/etch-bpo/debian/libgpod2-nogtk.lintian-overrides 2007-08-31 19:02:45 UTC (rev 240)
@@ -0,0 +1 @@
+libgpod2-nogtk: package-name-doesnt-match-sonames libgpod2
Copied: libgpod/branches/etch-bpo/debian/patches (from rev 239, libgpod/tags/0.5.2-4/debian/patches)
Modified: libgpod/branches/etch-bpo/debian/rules
===================================================================
--- libgpod/branches/etch-bpo/debian/rules 2007-08-31 18:55:47 UTC (rev 239)
+++ libgpod/branches/etch-bpo/debian/rules 2007-08-31 19:02:45 UTC (rev 240)
@@ -1,23 +1,114 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/class/gnome.mk
+SONAME=2
+VERSION=
+
+include /usr/share/dpatch/dpatch.make
+
DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-O1 -Wl,--as-needed"
-DEB_CONFIGURE_EXTRA_FLAGS += --with-python=no
-DEB_DH_MAKESHLIBS_ARGS_libgpod2 := -V 'libgpod2'
+export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-install/python-gpod::
+# FOR AUTOCONF 2.52 AND NEWER ONLY
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+ confflags += --build $(DEB_HOST_GNU_TYPE)
+else
+ confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+endif
+
+DEB_CONFIGURE_INVOKE=$(CURDIR)/configure $(confflags) --prefix=/usr --includedir="\$${prefix}/include" --mandir="\$${prefix}/share/man" --infodir="\$${prefix}/share/info" --sysconfdir=/etc --localstatedir=/var --libexecdir="\$${prefix}/lib/libgpod" --disable-maintainer-mode --disable-dependency-tracking --srcdir=$(CURDIR)
+
+build/libgpod$(SONAME)/config.status:
+ cp -f /usr/share/misc/config.sub config.sub
+ cp -f /usr/share/misc/config.guess config.guess
+ mkdir -p $(dir $@)
+ cd $(dir $@) && $(DEB_CONFIGURE_SCRIPT_ENV) $(DEB_CONFIGURE_INVOKE) --with-python=no $(DEB_CONFIGURE_EXTRA_FLAGS)
+
+build/libgpod$(SONAME)-nogtk/config.status:
+ cp -f /usr/share/misc/config.sub config.sub
+ cp -f /usr/share/misc/config.guess config.guess
+ mkdir -p $(dir $@)
+ cd $(dir $@) && $(DEB_CONFIGURE_SCRIPT_ENV) $(DEB_CONFIGURE_INVOKE) --with-python=no --disable-gdk-pixbuf $(DEB_CONFIGURE_EXTRA_FLAGS)
+
+configure-stamp: patch-stamp build/libgpod$(SONAME)/config.status build/libgpod$(SONAME)-nogtk/config.status
+ touch $@
+
+
+build/libgpod$(SONAME)/build-stamp build/libgpod$(SONAME)-nogtk/build-stamp: configure-stamp
+ cd $(dir $@) && $(MAKE)
+
+build-stamp: build/libgpod$(SONAME)/build-stamp build/libgpod$(SONAME)-nogtk/build-stamp
+ touch $@
+
+build: build-stamp
+
+
+build/libgpod$(SONAME)/install-stamp build/libgpod$(SONAME)-nogtk/install-stamp:
+ cd $(dir $@) && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp$(subst build/libgpod$(SONAME),,$(dir $@))
+
+build/python-gpod:
PYVERS=$$(pyversions -v -r ./debian/control) ; \
- for PYVER in $$PYVERS; do \
- export PYTHON=python$$PYVER ; $(DEB_CONFIGURE_INVOKE) && \
+ cd build/libgpod$(SONAME) && for PYVER in $$PYVERS; do \
+ export PYTHON=python$$PYVER ; $(DEB_CONFIGURE_SCRIPT_ENV) $(DEB_CONFIGURE_INVOKE) --with-python=yes $(DEB_CONFIGURE_EXTRA_FLAGS) && \
cd bindings/python && \
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp && \
cd ../.. ; \
done
+ touch $@
-binary-install/python-gpod::
+install-stamp: build/libgpod$(SONAME)/install-stamp build/libgpod$(SONAME)-nogtk/install-stamp build/python-gpod
+ touch $@
+
+clean: unpatch
+ rm -rf build
+ dh_clean
+ rm -rf debian/tmp-nogtk
+ rm -f configure-stamp build-stamp install-stamp
+ rm -f debian/libgpod-nogtk-dev.install debian/libgpod$(SONAME)-nogtk.install debian/libgpod-nogtk-dev.links
+
+binary-arch: build-stamp install-stamp
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs -a ChangeLog
+ dh_installdocs -a -A AUTHORS README
+ dh_installexamples -a
+ sed 's#debian/tmp/##' debian/libgpod$(SONAME).install > debian/libgpod$(SONAME)-nogtk.install
+ sed 's#debian/tmp/##' debian/libgpod-dev.install > debian/libgpod-nogtk-dev.install
+ dh_install -a -Nlibgpod$(SONAME)-nogtk -Nlibgpod-nogtk-dev
+ dh_install -plibgpod$(SONAME)-nogtk -plibgpod-nogtk-dev --sourcedir=debian/tmp-nogtk
+ install -D -m 0644 debian/libgpod$(SONAME)-nogtk.lintian-overrides debian/libgpod$(SONAME)-nogtk/usr/share/lintian/overrides/libgpod$(SONAME)-nogtk
dh_pycentral -ppython-gpod
+ dh_link -a
+ dh_strip -a
+ dh_compress -a
+ dh_fixperms -a
+ dh_makeshlibs -plibgpod$(SONAME) -V 'libgpod$(SONAME)$(VERSION)'
+ dh_makeshlibs -plibgpod$(SONAME)-nogtk -V 'libgpod$(SONAME)-nogtk$(VERSION) | libgpod$(SONAME)$(VERSION)'
+ dh_shlibdeps -a -Llibgpod$(SONAME)
+ dh_installdeb -a
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
+
+binary-indep:
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs -i ChangeLog
+ dh_installdocs -i -A AUTHORS README
+ dh_installexamples -i
+ dh_install -i
+ dh_link -i
+ dh_compress -i
+ dh_fixperms -i
+ dh_installdeb -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
+
+binary: binary-arch binary-indep
+
+
+.PHONY: build binary-arch binary-indep binary
+
Modified: libgpod/branches/etch-bpo/src/itdb_artwork.c
===================================================================
--- libgpod/branches/etch-bpo/src/itdb_artwork.c 2007-08-31 18:55:47 UTC (rev 239)
+++ libgpod/branches/etch-bpo/src/itdb_artwork.c 2007-08-31 19:02:45 UTC (rev 240)
@@ -849,9 +849,11 @@
g_return_if_fail (thumb);
g_free (thumb->image_data);
+#ifdef HAVE_GDKPIXBUF
if (thumb->pixbuf) {
g_object_unref (G_OBJECT (thumb->pixbuf));
}
+#endif
g_free (thumb->filename);
g_free (thumb);
}
@@ -883,9 +885,11 @@
memcpy (new_thumb->image_data, thumb->image_data,
new_thumb->image_data_len);
}
+#ifdef HAVE_GDKPIXBUF
if (thumb->pixbuf) {
g_object_ref (G_OBJECT (thumb->pixbuf));
}
+#endif
return new_thumb;
}
More information about the Pkg-gtkpod-devel
mailing list