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

Ian Wienand ianw at alioth.debian.org
Mon Apr 23 04:27:26 UTC 2007


Author: ianw
Date: 2007-04-23 04:27:25 +0000 (Mon, 23 Apr 2007)
New Revision: 15

Added:
   trunk/debian/python-libiptcdata.dirs
   trunk/debian/python-libiptcdata.docs
   trunk/debian/python-libiptcdata.examples
   trunk/debian/python-libiptcdata.install
Removed:
   trunk/debian/patches/
Modified:
   trunk/debian/changelog
   trunk/debian/control
   trunk/debian/control.in
   trunk/debian/copyright
   trunk/debian/libiptcdata0-dev.install
   trunk/debian/rules
Log:
new upstream

convert away from cdbs in an attempt to build python package



Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-04-23 02:14:55 UTC (rev 14)
+++ trunk/debian/changelog	2007-04-23 04:27:25 UTC (rev 15)
@@ -1,7 +1,18 @@
-libiptcdata (0.2.1+cvs20070221) unstable; urgency=low
+libiptcdata (1.0.1-1) unstable; urgency=low
 
   [ Ian Wienand ]
   
+  * New upstream
+  * Don't use CDBS in an attempt to build the python modules correctly.
+    This probably needs some work, but seems to work for an initial
+    implementation
+
+ -- Ian Wienand <ianw at debian.org>  Mon, 23 Apr 2007 12:20:05 +1000
+
+libiptcdata (0.2.1+cvs20070221-1) unstable; urgency=low
+
+  [ Ian Wienand ]
+  
   * Take upstream from CVS
   * debian/rules : add configure flags for python and documentation
   * debian/control.in : add dependency for gtk-tools-doc

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2007-04-23 02:14:55 UTC (rev 14)
+++ trunk/debian/control	2007-04-23 04:27:25 UTC (rev 15)
@@ -3,8 +3,7 @@
 Priority: extra
 Maintainer: Ian Wienand <ianw at debian.org>
 Uploaders: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, po4a, gtk-doc-tools, docbook-xml (>= 4.4), docbook-xsl, libxml2-utils, xsltproc, autotools-dev,
- dpkg-dev (>= 1.13.19)
+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/
 
@@ -69,3 +68,19 @@
  .
   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

Modified: trunk/debian/control.in
===================================================================
--- trunk/debian/control.in	2007-04-23 02:14:55 UTC (rev 14)
+++ trunk/debian/control.in	2007-04-23 04:27:25 UTC (rev 15)
@@ -69,3 +69,14 @@
  .
   Homepage: http://libiptcdata.sourceforge.net/
 
+Package: python-iptcdata
+Architecture: any
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Provides: ${python:Provides}
+Description: Python bindings for the iptcdata library
+ 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.
+ .
+ This package contains the python bindings for libiptcdata.

Modified: trunk/debian/copyright
===================================================================
--- trunk/debian/copyright	2007-04-23 02:14:55 UTC (rev 14)
+++ trunk/debian/copyright	2007-04-23 04:27:25 UTC (rev 15)
@@ -30,5 +30,6 @@
   Texts. You may obtain a copy of the GNU Free
   Documentation License from the Free Software
   Foundation by visiting their Web site (http://www.fsf.org) or by
-  writing to: Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
\ No newline at end of file
+  writing to: 
+  Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+  MA 02110-1301, USA.

Modified: trunk/debian/libiptcdata0-dev.install
===================================================================
--- trunk/debian/libiptcdata0-dev.install	2007-04-23 02:14:55 UTC (rev 14)
+++ trunk/debian/libiptcdata0-dev.install	2007-04-23 04:27:25 UTC (rev 15)
@@ -1,3 +1,2 @@
 usr/lib/pkgconfig/libiptcdata.pc
 usr/include/libiptcdata/*
-usr/lib/lib*.{a,la,so}

Added: trunk/debian/python-libiptcdata.dirs
===================================================================
--- trunk/debian/python-libiptcdata.dirs	2007-04-23 02:14:55 UTC (rev 14)
+++ trunk/debian/python-libiptcdata.dirs	2007-04-23 04:27:25 UTC (rev 15)
@@ -0,0 +1 @@
+usr/lib
\ No newline at end of file

Added: trunk/debian/python-libiptcdata.docs
===================================================================
--- trunk/debian/python-libiptcdata.docs	2007-04-23 02:14:55 UTC (rev 14)
+++ trunk/debian/python-libiptcdata.docs	2007-04-23 04:27:25 UTC (rev 15)
@@ -0,0 +1 @@
+python/README 
\ No newline at end of file

Added: trunk/debian/python-libiptcdata.examples
===================================================================
--- trunk/debian/python-libiptcdata.examples	2007-04-23 02:14:55 UTC (rev 14)
+++ trunk/debian/python-libiptcdata.examples	2007-04-23 04:27:25 UTC (rev 15)
@@ -0,0 +1 @@
+python/examples/*
\ No newline at end of file

Added: trunk/debian/python-libiptcdata.install
===================================================================
--- trunk/debian/python-libiptcdata.install	2007-04-23 02:14:55 UTC (rev 14)
+++ trunk/debian/python-libiptcdata.install	2007-04-23 04:27:25 UTC (rev 15)
@@ -0,0 +1 @@
+usr/lib/python2.4
\ No newline at end of file

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2007-04-23 02:14:55 UTC (rev 14)
+++ trunk/debian/rules	2007-04-23 04:27:25 UTC (rev 15)
@@ -1,45 +1,113 @@
 #!/usr/bin/make -f
-# 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.
+# -*- 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.
 
-# Generate debian/control using
-# fakeroot debian/rules debian/control DEB_AUTO_UPDATE_DEBIAN_CONTROL:=yes
+# Uncomment this to turn on verbose mode.
+export DH_VERBOSE=1
 
-DEB_DH_INSTALL_SOURCEDIR = $(CURDIR)/debian/tmp
-DEB_DH_STRIP_ARGS := --dbg-package=libiptcdata0
 
-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 $(CURDIR)/debian/mk/docbook-manpage.mk
+# 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)
 
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-python --enable-gtk-doc
+CFLAGS = -Wall -g
 
-DEB_INSTALL_MANPAGES_libiptcdata-bin := debian/xml-man/en/iptc.1
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
 
-PO4A_SOURCES := $(CURDIR)/debian/xml-man/po4a/po4a.cfg
+# 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)}'`
 
-DOCBOOK_MANPAGE_SOURCES := $(CURDIR)/debian/xml-man/en/iptc.xml
+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
 
-DOCBOOK_MANPAGE_EXTRA_SOURCES := $(CURDIR)/debian/xml-man/en/license.xml      \
-                                 $(CURDIR)/debian/xml-man/en/refentryinfo.xml
 
-clean::
-	-$(RM) $(CURDIR)/debian/xml-man/en/iptc.1
+build: build-stamp
+build-stamp:  config.status
+	dh_testdir
+
+	# Add here commands to compile the package.
+	$(MAKE)
+
+	touch $@
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp 
+
+	# 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
+
+
+	dh_clean 
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	dh_installdirs
+
+	# Add here commands to install the package into debian/tmp
+	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+
+# 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
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install 




More information about the Pkg-libiptcdata-commits mailing list