[Pkg-libiptcdata-commits] r17 - trunk/debian

Thu May 10 05:46:43 UTC 2007

Author: ianw
Date: 2007-05-10 05:46:43 +0000 (Thu, 10 May 2007)
New Revision: 17

Added:
   trunk/debian/pycompat
Removed:
   trunk/debian/control
Modified:
   trunk/debian/python-libiptcdata.install
   trunk/debian/rules
Log:
revert to using cdbs, based on gnome-menu


Deleted: trunk/debian/control
===================================================================

--- trunk/debian/control	2007-04-23 04:34:33 UTC (rev 16)
+++ trunk/debian/control	2007-05-10 05:46:43 UTC (rev 17)
@@ -1,86 +0,0 @@
-Source: libiptcdata
-Section: libs
-Priority: extra
-Maintainer: Ian Wienand <ianw at debian.org>
-Uploaders: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: debhelper (>= 5), dpatch, po4a, gtk-doc-tools, docbook-xml (>= 4.4), docbook-xsl, libxml2-utils, xsltproc, autotools-dev, dpkg-dev (>= 1.13.19), python-dev, python-support (>= 0.3)
-Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-libiptcdata/
-
-Package: libiptcdata0-dev
-Section: libdevel
-Provides: libiptcdata-dev
-Architecture: any
-Suggests: libiptcdata-doc
-Depends: libiptcdata0 (= ${binary:Version}), libc6-dev
-Description: Library to parse IPTC metadata (development files)
- libiptcdata is a library, for manipulating the International Press
- Telecommunications Council (IPTC) metadata stored within multimedia
- files such as images. The library provides routines for parsing,
- viewing, modifying, and saving this metadata.
- .
-  Homepage: http://libiptcdata.sourceforge.net/
-
-Package: libiptcdata0-dbg
-Architecture: any
-Depends: libiptcdata0 (= ${binary:Version})
-Description: Library to parse IPTC metadata (debug files)
- libiptcdata is a library, for manipulating the International Press
- Telecommunications Council (IPTC) metadata stored within multimedia
- files such as images. The library provides routines for parsing,
- viewing, modifying, and saving this metadata.
- .
-  Homepage: http://libiptcdata.sourceforge.net/
-
-Package: libiptcdata-doc
-Section: doc
-Architecture: all
-Description: Library to parse IPTC metadata (documentation)
- libiptcdata is a library, for manipulating the International Press
- Telecommunications Council (IPTC) metadata stored within multimedia
- files such as images. The library provides routines for parsing,
- viewing, modifying, and saving this metadata.
- .
-  Homepage: http://libiptcdata.sourceforge.net/
-
-Package: libiptcdata-bin
-Section: graphics
-Architecture: any
-Depends: libiptcdata0 (= ${binary:Version})
-Description: Library to parse IPTC metadata (programs)
- libiptcdata is a library, for manipulating the International Press
- Telecommunications Council (IPTC) metadata stored within multimedia
- files such as images. The library provides routines for parsing,
- viewing, modifying, and saving this metadata.
- .
-  Homepage: http://libiptcdata.sourceforge.net/
-
-Package: libiptcdata0
-Section: libs
-Architecture: any
-Provides: libiptcdata
-Depends: ${shlibs:Depends}
-Description: Library to parse IPTC metadata
- libiptcdata is a library, for manipulating the International Press
- Telecommunications Council (IPTC) metadata stored within multimedia
- files such as images. The library provides routines for parsing,
- viewing, modifying, and saving this metadata.
- .
-  Homepage: http://libiptcdata.sourceforge.net/
-
-Package: python-libiptcdata
-Architecture: any
-Section: libs
-Depends: ${python:Depends}, ${misc:Depends}, ${shlibs:Depends}
-Provides: ${python:Provides}
-Conflicts: python2.4-libiptcdata (<< 1.0.1-1)
-Replaces: python2.4-libiptcdata (<< 1.0.1-1)
-Description: Python bindings for libiptcdata
- libiptcdata is a library, for manipulating the International Press
- Telecommunications Council (IPTC) metadata stored within multimedia
- files such as images. The library provides routines for parsing,
- viewing, modifying, and saving this metadata.
- .
-  Homepage: http://libiptcdata.sourceforge.net/
- .
- This module provides Python bindings for the library
\ No newline at end of file

Added: trunk/debian/pycompat
===================================================================
--- trunk/debian/pycompat	2007-04-23 04:34:33 UTC (rev 16)
+++ trunk/debian/pycompat	2007-05-10 05:46:43 UTC (rev 17)
@@ -0,0 +1 @@
+2

Modified: trunk/debian/python-libiptcdata.install
===================================================================
--- trunk/debian/python-libiptcdata.install	2007-04-23 04:34:33 UTC (rev 16)
+++ trunk/debian/python-libiptcdata.install	2007-05-10 05:46:43 UTC (rev 17)
@@ -1 +1 @@
-usr/lib/python2.4
\ No newline at end of file
+debian/tmp/usr/lib/python*/site-packages/iptcdata.so
\ No newline at end of file

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2007-04-23 04:34:33 UTC (rev 16)
+++ trunk/debian/rules	2007-05-10 05:46:43 UTC (rev 17)
@@ -1,113 +1,83 @@
 #!/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.
+# debian/rules for libiptcdata package
+# Copyright (C) 2006-2007 Sylvain Le Gall <gildor at-stmp-server debian.org>
+# Copyright (C) 2006-2007 Ian Wienand <ianw at-stmp-server debian.org>
+# Copyright (C) 2006 Hubert Figuiere <hub at-smtp-server figuiere.net>
+#
+# 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, 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 St, Fifth Floor, Boston,
+# MA 02110-1301, USA.
 
-# Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
+# Generate debian/control using
+# fakeroot debian/rules debian/control DEB_AUTO_UPDATE_DEBIAN_CONTROL:=yes
 
+DEB_DH_INSTALL_SOURCEDIR = $(CURDIR)/debian/tmp
+DEB_DH_STRIP_ARGS := --dbg-package=libiptcdata0
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/utils.mk
+include $(CURDIR)/debian/mk/docbook-manpage.mk
 
-CFLAGS = -Wall -g
+PY_VERSIONS = $(shell pyversions --requested debian/control)
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
+DEB_BUILDDIR := build
 
-# shared library versions, option 1
-version=0.3.1
-major=0
-# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
-#version=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-#major=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-python --enable-gtk-doc
 
-config.status: configure
-	dh_testdir
-	# Add here commands to configure the package.
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)"  --enable-python --enable-gtk-doc
+configure-stamp-%:
+	mkdir build-$*
+	cd build-$* && PYTHON=`which $*` $(DEB_CONFIGURE_SCRIPT_ENV) \
+	    $(DEB_CONFIGURE_SCRIPT) \
+		$(DEB_CONFIGURE_NORMAL_ARGS) \
+		--disable-maintainer-mode \
+		$(cdbs_configure_flags) \
+		$(DEB_CONFIGURE_EXTRA_FLAGS) \
+		$(DEB_CONFIGURE_USER_FLAGS)
+	touch $@
 
 
-build: build-stamp
-build-stamp:  config.status
-	dh_testdir
+configure/python-libiptcdata:: $(addprefix configure-stamp-, $(PY_VERSIONS))
 
-	# Add here commands to compile the package.
-	$(MAKE)
-
+build-stamp-%:
+	make -C build-$*
 	touch $@
 
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
+build/python-libiptcdata:: $(addprefix build-stamp-, $(PY_VERSIONS))
 
-	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
+install-stamp-%:
+	make -C build-$* install DESTDIR=$(CURDIR)/debian/tmp
+	touch $@
 
+install/python-libiptcdata:: $(addprefix install-stamp-, $(PY_VERSIONS))
 
-	dh_clean 
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
+DEB_INSTALL_MANPAGES_libiptcdata-bin := debian/xml-man/en/iptc.1
 
-	# Add here commands to install the package into debian/tmp
-	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+PO4A_SOURCES := $(CURDIR)/debian/xml-man/po4a/po4a.cfg
 
+DOCBOOK_MANPAGE_SOURCES := $(CURDIR)/debian/xml-man/en/iptc.xml
 
-# Build architecture-independent files here.
-binary-indep: build install
+DOCBOOK_MANPAGE_EXTRA_SOURCES := $(CURDIR)/debian/xml-man/en/license.xml      \
+				 $(CURDIR)/debian/xml-man/en/refentryinfo.xml
 
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_installexamples
-	dh_install --sourcedir=debian/tmp
-#	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_makeshlibs -plibiptcdata0 -V
-	dh_pysupport -ppython-libiptcdata
-#	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+clean::
+	-$(RM) $(CURDIR)/debian/xml-man/en/iptc.1
+	-rm -rf $(DEB_BUILDDIR)
+	-rm -rf $(addprefix build-, $(PY_VERSIONS))
+	-rm -rf $(addprefix configure-stamp-, $(PY_VERSIONS))
+	-rm -rf $(addprefix build-stamp-, $(PY_VERSIONS))
+	-rm -rf $(addprefix install-stamp-, $(PY_VERSIONS))
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 


