[xml/sgml-commit] r212 - packages/libxslt/trunk/debian
Mike Hommey
glandium-guest@haydn.debian.org
Sun, 01 Aug 2004 04:29:30 -0600
Author: glandium-guest
Date: 2004-08-01 04:29:23 -0600 (Sun, 01 Aug 2004)
New Revision: 212
Added:
packages/libxslt/trunk/debian/xsltproc.manpages
Modified:
packages/libxslt/trunk/debian/changelog
packages/libxslt/trunk/debian/control
packages/libxslt/trunk/debian/libxslt1-dev.install
packages/libxslt/trunk/debian/libxslt1-dev.manpages
packages/libxslt/trunk/debian/rules
packages/libxslt/trunk/debian/xsltproc.install
Log:
debian/control: Remove Build-Depends on python.
debian/rules: Several changes to the build system, including additions of workarounds for svn-buildpackage and dpkg-buildpackage to be idempotent.
debian/*.install: Removed all references to manual pages.
debian/*.manpages: Added appropriate references to manual pages.
Modified: packages/libxslt/trunk/debian/changelog
===================================================================
--- packages/libxslt/trunk/debian/changelog 2004-07-31 20:55:48 UTC (rev 211)
+++ packages/libxslt/trunk/debian/changelog 2004-08-01 10:29:23 UTC (rev 212)
@@ -1,3 +1,13 @@
+libxslt (1.1.8-3) unstable; urgency=low
+
+ * debian/control: Remove Build-Depends on python.
+ * debian/rules: Several changes to the build system, including additions
+ of workarounds for svn-buildpackage and dpkg-buildpackage to be idempotent.
+ * debian/*.install: Removed all references to manual pages.
+ * debian/*.manpages: Added appropriate references to manual pages.
+
+ -- Mike Hommey <mh@glandium.org> Sun, 1 Aug 2004 19:27:20 +0900
+
libxslt (1.1.8-2) unstable; urgency=low
* Add a Build-Depends on python (closes: #260579)
Modified: packages/libxslt/trunk/debian/control
===================================================================
--- packages/libxslt/trunk/debian/control 2004-07-31 20:55:48 UTC (rev 211)
+++ packages/libxslt/trunk/debian/control 2004-08-01 10:29:23 UTC (rev 212)
@@ -4,7 +4,7 @@
Maintainer: Debian XML/SGML Group <debian-xml-sgml-pkgs@lists.alioth.debian.org>
Uploaders: Mike Hommey <mh@glandium.org>
Standards-Version: 3.6.1
-Build-Depends: debhelper (>= 4.1), libxml2-dev (>= 2.6.8), libxml2-python2.3 (>= 2.6.8), python2.3-dev, zlib1g-dev (>= 1:1.1.4), python
+Build-Depends: debhelper (>= 4.1), libxml2-dev (>= 2.6.8), libxml2-python2.3 (>= 2.6.8), python2.3-dev, zlib1g-dev (>= 1:1.1.4)
Package: libxslt1-dev
Section: libdevel
Modified: packages/libxslt/trunk/debian/libxslt1-dev.install
===================================================================
--- packages/libxslt/trunk/debian/libxslt1-dev.install 2004-07-31 20:55:48 UTC (rev 211)
+++ packages/libxslt/trunk/debian/libxslt1-dev.install 2004-08-01 10:29:23 UTC (rev 212)
@@ -1,5 +1,4 @@
usr/include
-usr/share/man/man3
usr/lib/libxslt.a
usr/lib/libexslt.a
usr/lib/libxslt.la
Modified: packages/libxslt/trunk/debian/libxslt1-dev.manpages
===================================================================
--- packages/libxslt/trunk/debian/libxslt1-dev.manpages 2004-07-31 20:55:48 UTC (rev 211)
+++ packages/libxslt/trunk/debian/libxslt1-dev.manpages 2004-08-01 10:29:23 UTC (rev 212)
@@ -1 +1,3 @@
debian/xslt-config.1
+libexslt/libexslt.3
+libxslt/libxslt.3
Modified: packages/libxslt/trunk/debian/rules
===================================================================
--- packages/libxslt/trunk/debian/rules 2004-07-31 20:55:48 UTC (rev 211)
+++ packages/libxslt/trunk/debian/rules 2004-08-01 10:29:23 UTC (rev 212)
@@ -7,106 +7,125 @@
## uncomment this to turn on verbose mode
#export DH_VERBOSE=1
+WORKAROUND_REMOVED_FILES=libexslt/exsltconfig.h libxslt/xsltconfig.h libxslt/xsltwin32config.h libxslt.spec
+WORKAROUND_MODIFIED_FILES=python/libxslt-py.c
+
## ----------------------------------------------------------------------
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
## ----------------------------------------------------------------------
-CONFFLAGS =
+CONFFLAGS =
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
- CONFFLAGS += --build $(DEB_HOST_GNU_TYPE)
+ CONFFLAGS += --build $(DEB_HOST_GNU_TYPE)
else
- CONFFLAGS += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+ CONFFLAGS += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
endif
## ----------------------------------------------------------------------
-CFLAGS = -Wall -g
-INSTALL = install
-INSTALL_FILE = $(INSTALL) -p -o root -g root -m 644
-INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755
-INSTALL_SCRIPT = $(INSTALL) -p -o root -g root -m 755
-INSTALL_DIR = $(INSTALL) -p -o root -g root -m 755 -d
+CFLAGS = -Wall -g
## ----------------------------------------------------------------------
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
+ CFLAGS += -O0
else
- CFLAGS += -O2
+ CFLAGS += -O2
endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
## ----------------------------------------------------------------------
-TMP_DIR = debian/tmp
+TMP_DIR = debian/tmp
## ----------------------------------------------------------------------
## targets
-clean: configure
- dh_testdir
- dh_testroot
- [ ! -f Makefile ] || $(MAKE) distclean
- dh_clean -X.orig
- rm -f configure-stamp build-stamp install-stamp
+configure: configure-stamp
+configure-stamp:
+ dh_testdir
-configure:
- ./autogen.sh
+ # Workaround backups because of non-idempotent upstream:
+ for file in $(WORKAROUND_REMOVED_FILES) $(WORKAROUND_MODIFIED_FILES); do \
+ cp -f -a $${file} $${file}-tmp; \
+ done
-configure-stamp:
- dh_testdir
- touch configure.in && touch aclocal.m4 && touch configure
- CFLAGS="$(CFLAGS)" \
- ./configure $(CONFFLAGS) \
- --prefix=/usr \
- --mandir=\$${prefix}/share/man \
- --with-html-dir=\$${prefix}/share/doc
- touch configure-stamp
+ # ./configure
+ CFLAGS="$(CFLAGS)" \
+ ./configure $(CONFFLAGS) \
+ --prefix=/usr \
+ --with-python=/usr/bin/python2.3
-build: build-stamp
-build-stamp: configure-stamp
- dh_testdir
- cp -f -a python/libxslt-py.c python/libxslt-py.c-tmp
- $(MAKE)
- touch build-stamp
+ touch configure-stamp
-install: install-stamp
-install-stamp: build
- dh_testdir
- dh_testroot
- dh_clean -k -X.orig
- dh_installdirs
- $(MAKE) install prefix=$(PWD)/$(TMP_DIR)/usr
- -test -r python/libxslt-py.c-tmp && \
- cat python/libxslt-py.c-tmp > python/libxslt-py.c && \
- rm -f python/libxslt-py.c-tmp
- touch install-stamp
+build: build-stamp
+build-stamp: configure-stamp
+ dh_testdir
+ # Build libxslt
+ $(MAKE)
+
+ touch build-stamp
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp
+
+ -$(MAKE) distclean
+
+ # Restore workaround backups of removed and modified files
+ -for file in $(WORKAROUND_REMOVED_FILES) $(WORKAROUND_MODIFIED_FILES); do \
+ test -r $${file}-tmp && \
+ mv -f $${file}-tmp $${file}; \
+ done
+
+ -test -r /usr/share/misc/config.sub && \
+ cp -f /usr/share/misc/config.sub config.sub
+ -test -r /usr/share/misc/config.guess && \
+ cp -f /usr/share/misc/config.guess config.guess
+
+ dh_clean -X.orig
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k -X.orig
+ dh_installdirs
+
+ $(MAKE) prefix=$(PWD)/$(TMP_DIR)/usr \
+ PYTHON_SITE_PACKAGES=$(PWD)/$(TMP_DIR)/usr/lib/python2.3/site-packages \
+ install
+
+ # Special workaround for svn-buildpackage:
+ # Restore workaround backups of modified files.
+ -for file in $(WORKAROUND_MODIFIED_FILES); do \
+ test -r $${file}-tmp && \
+ cat $${file}-tmp > $${file}; \
+ done
+
binary-indep:
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_install -a --sourcedir=$(TMP_DIR)
- install -D -m 644 debian/xsltproc.presubj debian/xsltproc/usr/share/bug/xsltproc/presubj
- dh_installman -a
- dh_installdocs -a
- dh_installexamples -a
- dh_installchangelogs -a ChangeLog
- dh_link -a
- dh_strip -a
- dh_compress -a
- dh_fixperms -a
- dh_makeshlibs -a -V
- dh_installdeb -a
- dh_shlibdeps -L libxslt1.1 -l $(PWD)/debian/libxslt1.1/usr/lib
- dh_shlibdeps -L libxslt1 -l $(PWD)/debian/libxslt1/usr/lib
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_install -a --sourcedir=$(TMP_DIR)
+ install -D -m 644 debian/xsltproc.presubj debian/xsltproc/usr/share/bug/xsltproc/presubj
+ dh_installman -a
+ dh_installdocs -a
+ dh_installexamples -a
+ dh_installchangelogs -a ChangeLog
+ dh_link -a
+ dh_strip -a
+ dh_compress -a
+ dh_fixperms -a
+ dh_makeshlibs -a -V
+ dh_installdeb -a
+ dh_shlibdeps -L libxslt1.1 -l $(PWD)/debian/libxslt1.1/usr/lib
+ dh_shlibdeps -L libxslt1 -l $(PWD)/debian/libxslt1/usr/lib
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
-binary: binary-indep binary-arch
+source diff:
+ @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-.PHONY: clean build install binary-indep binary-arch binary
-
-## ----------------------------------------------------------------------
+binary: binary-indep binary-arch
+.PHONY: clean build install binary-indep binary-arch binary configure
Modified: packages/libxslt/trunk/debian/xsltproc.install
===================================================================
--- packages/libxslt/trunk/debian/xsltproc.install 2004-07-31 20:55:48 UTC (rev 211)
+++ packages/libxslt/trunk/debian/xsltproc.install 2004-08-01 10:29:23 UTC (rev 212)
@@ -1,2 +1 @@
usr/bin/xsltproc
-usr/share/man/man1/xsltproc.1
Added: packages/libxslt/trunk/debian/xsltproc.manpages
===================================================================
--- packages/libxslt/trunk/debian/xsltproc.manpages 2004-07-31 20:55:48 UTC (rev 211)
+++ packages/libxslt/trunk/debian/xsltproc.manpages 2004-08-01 10:29:23 UTC (rev 212)
@@ -0,0 +1 @@
+doc/xsltproc.1