[xml/sgml-commit] r1085 - in /packages/expat/trunk/debian: changelog lib64expat1.shlibs libexpat1-dev.examples libexpat1.shlibs rules

[dleidert-guest at users.alioth.debian.org]

Author: dleidert-guest
Date: Wed May  7 04:20:55 2008
New Revision: 1085

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1085
Log:
* debian/libexpat1-dev.examples: Only install the C sources.
* debian/libexpat1.shlibs: Adjusted for libexpatw.
* debian/lib64expat1.shlibs: Ditto.
* debian/rules: Build and install libexpatw with XML_UNICODE support enabled
  (closes: #277133).


Modified:
    packages/expat/trunk/debian/changelog
    packages/expat/trunk/debian/lib64expat1.shlibs
    packages/expat/trunk/debian/libexpat1-dev.examples
    packages/expat/trunk/debian/libexpat1.shlibs
    packages/expat/trunk/debian/rules

Modified: packages/expat/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/expat/trunk/debian/changelog?rev=1085&op=diff
==============================================================================
--- packages/expat/trunk/debian/changelog (original)
+++ packages/expat/trunk/debian/changelog Wed May  7 04:20:55 2008
@@ -22,10 +22,16 @@
     (Uploaders): Added myself.
   * debian/copyright: Added missing copyright of the last years.
   * debian/expat.install: Do not copy the upstream manpage (see debian/rules).
+  * debian/libexpat1-dev.examples: Only install the C sources.
+  * debian/libexpat1.shlibs: Adjusted for libexpatw.
+  * debian/lib64expat1.shlibs: Ditto.
   * debian/rules: Rewritten to make it shorter (yeah sorry, I removed the
-    comments too). Added dpatch and 64bit stuff (thanks to Matthias Klose for
-    his intial work). Create the manpage xmlwf.1 on-the-fly (there is
-    doc/xmlwf.1, but it has issues and gets patched, so we recreate it).
+    comments too).
+    - Added dpatch stuff.
+    - Create the manpage xmlwf.1 on-the-fly (there is doc/xmlwf.1, but it has
+      issues and gets patched, so we recreate it).
+    - Build and install libexpatw with XML_UNICODE support enabled (closes:
+      #277133).
   * debian/patches/82763_xmlwf_error_out_2.dpatch: Added (#82763).
   * debian/patches/302191_install_expat_config_h.dpatch: Added (#302191).
   * debian/patches/342684_libtoolize.dpatch: Added (#342684).

Modified: packages/expat/trunk/debian/lib64expat1.shlibs
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/expat/trunk/debian/lib64expat1.shlibs?rev=1085&op=diff
==============================================================================
--- packages/expat/trunk/debian/lib64expat1.shlibs (original)
+++ packages/expat/trunk/debian/lib64expat1.shlibs Wed May  7 04:20:55 2008
@@ -1,1 +1,2 @@
 libexpat 1 lib64expat1 (>= 1.95.8)
+libexpatw 1 lib64expat1 (>= 2.0.1)

Modified: packages/expat/trunk/debian/libexpat1-dev.examples
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/expat/trunk/debian/libexpat1-dev.examples?rev=1085&op=diff
==============================================================================
--- packages/expat/trunk/debian/libexpat1-dev.examples (original)
+++ packages/expat/trunk/debian/libexpat1-dev.examples Wed May  7 04:20:55 2008
@@ -1,1 +1,1 @@
-examples/*
+examples/*.c

Modified: packages/expat/trunk/debian/libexpat1.shlibs
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/expat/trunk/debian/libexpat1.shlibs?rev=1085&op=diff
==============================================================================
--- packages/expat/trunk/debian/libexpat1.shlibs (original)
+++ packages/expat/trunk/debian/libexpat1.shlibs Wed May  7 04:20:55 2008
@@ -1,2 +1,3 @@
 libexpat 1 libexpat1 (>= 1.95.8)
+libexpatw 1 libexpat1 (>= 2.0.1)
 udeb: libexpat 1 libexpat1-udeb (>= 1.95.8)

Modified: packages/expat/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/expat/trunk/debian/rules?rev=1085&op=diff
==============================================================================
--- packages/expat/trunk/debian/rules (original)
+++ packages/expat/trunk/debian/rules Wed May  7 04:20:55 2008
@@ -15,7 +15,7 @@
 BUILD64 = $(filter $(DEB_HOST_ARCH), i386 powerpc sparc s390)
 
 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)
 endif
@@ -38,25 +38,38 @@
 	(mkdir -p $(@D); cd $(@D); CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
 	 ../configure $(CONFFLAGS) --prefix=/usr --mandir=\$${prefix}/share/man)
 
+buildw/config.status: configure
+	dh_testdir
+	(mkdir -p $(@D); cd $(@D); CFLAGS="$(CFLAGS) -DXML_UNICODE" LDFLAGS="$(LDFLAGS)" \
+	 ../configure $(CONFFLAGS) --prefix=/usr --mandir=\$${prefix}/share/man)
+
 build64/config.status: configure
 	dh_testdir
 	(mkdir -p $(@D); cd $(@D); CFLAGS="-m64 $(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
 	 ../configure $(CONFFLAGS) $(HOST64FLAG) --prefix=/usr --mandir=\$${prefix}/share/man \
 	 --libdir=\$${prefix}/lib64)
 
+buildw64/config.status: configure
+	dh_testdir
+	(mkdir -p $(@D); cd $(@D); CFLAGS="-m64 $(CFLAGS) -DXML_UNICODE" LDFLAGS="$(LDFLAGS)" \
+	 ../configure $(CONFFLAGS) $(HOST64FLAG) --prefix=/usr --mandir=\$${prefix}/share/man \
+	 --libdir=\$${prefix}/lib64)
+
 clean: unpatch
 	dh_testdir
 	dh_testroot
-	rm -rf build/ build64/
+	rm -rf build/ build64/ buildw/ buildw64/
 	rm -rf debian/tmp/
 	dh_clean build-stamp patch-stamp debian/xmlwf.1
 
 build: build-stamp
-build-stamp: patch-stamp build/config.status $(if $(BUILD64), build64/config.status)
+build-stamp: patch-stamp build/config.status buildw/config.status $(if $(BUILD64), build64/config.status buildw64/config.status)
 	dh_testdir
 	$(MAKE) -C build/
+	$(MAKE) -C buildw/ buildlib LIBRARY=libexpatw.la
 ifdef BUILD64
 	$(MAKE) -C build64/ buildlib
+	$(MAKE) -C buildw64/ buildlib LIBRARY=libexpatw.la
 endif
 	docbook-to-man doc/xmlwf.sgml > debian/xmlwf.1
 	touch $@
@@ -67,8 +80,10 @@
 	dh_clean -k
 	dh_installdirs
 	$(MAKE) -C build/ install DESTDIR=$(CURDIR)/debian/tmp
+	$(MAKE) -C buildw/ installlib LIBRARY=libexpatw.la DESTDIR=$(CURDIR)/debian/tmp APIHEADER=
 ifdef BUILD64
 	$(MAKE) -C build64/ installlib DESTDIR=$(CURDIR)/debian/tmp
+	$(MAKE) -C buildw64/ installlib LIBRARY=libexpatw.la DESTDIR=$(CURDIR)/debian/tmp APIHEADER=
 endif
 
 binary-indep: