[Pkg-erlang-commits] r1507 - in yaws/trunk: . debian debian/patches debian/source

sgolovan at alioth.debian.org sgolovan at alioth.debian.org
Fri May 10 18:35:49 UTC 2013 

Author: sgolovan
Date: 2013-05-10 18:35:48 +0000 (Fri, 10 May 2013)
New Revision: 1507

Added:
   yaws/trunk/debian/source/
   yaws/trunk/debian/source/format
Removed:
   yaws/trunk/debian/README.source
Modified:
   yaws/trunk/
   yaws/trunk/debian/changelog
   yaws/trunk/debian/compat
   yaws/trunk/debian/control
   yaws/trunk/debian/erlang-yaws.install
   yaws/trunk/debian/erlang-yaws.lintian-overrides
   yaws/trunk/debian/patches/docs.diff
   yaws/trunk/debian/patches/gnu.diff
   yaws/trunk/debian/patches/installapps.diff
   yaws/trunk/debian/patches/m32m64.diff
   yaws/trunk/debian/rules
   yaws/trunk/debian/yaws.README.Debian
Log:
[yaws]
  * Switched to 3.0 (quilt) source package version.
  * Bumped debhelper compatibility version to 8.
  * Bumped standards version to 3.9.4.
  * Separated arch-independent build dependencies from arch-dependent ones.
  * Install yaws_soap_lib.5 manpage.
  * Added a few forgotten objects to clean target.



Property changes on: yaws/trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /yaws/branches/experimental:1296-1329
   + /yaws/branches/experimental:1296-1329,1473-1506

Deleted: yaws/trunk/debian/README.source
===================================================================
--- yaws/trunk/debian/README.source	2013-05-09 18:12:08 UTC (rev 1506)
+++ yaws/trunk/debian/README.source	2013-05-10 18:35:48 UTC (rev 1507)
@@ -1,8 +0,0 @@
-This package uses quilt to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-To get detailed instructions on how to apply the series of patches
-and modify them, please read /usr/share/doc/quilt/README.source
-
- -- Sergei Golovan <sgolovan at debian.org>  Sat, 17 Oct 2009 17:23:05 +0400

Modified: yaws/trunk/debian/changelog
===================================================================
--- yaws/trunk/debian/changelog	2013-05-09 18:12:08 UTC (rev 1506)
+++ yaws/trunk/debian/changelog	2013-05-10 18:35:48 UTC (rev 1507)
@@ -1,9 +1,30 @@
-yaws (1.94-2) UNRELEASED; urgency=low
+yaws (1.96-2) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Switched to 3.0 (quilt) source package version.
+  * Bumped debhelper compatibility version to 8.
+  * Bumped standards version to 3.9.4.
+  * Separated arch-independent build dependencies from arch-dependent ones.
+  * Install yaws_soap_lib.5 manpage.
+  * Added a few forgotten objects to clean target.
 
- -- Sergei Golovan <sgolovan at debian.org>  Tue, 26 Jun 2012 10:14:25 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Fri, 10 May 2013 22:34:36 +0400
 
+yaws (1.96-1) experimental; urgency=low
+
+  * New upstream release.
+  * Removed patch which fixed building mime_types.beam because it's no longer
+    necessary.
+
+ -- Sergei Golovan <sgolovan at debian.org>  Wed, 20 Mar 2013 13:02:55 +0400
+
+yaws (1.95-1) experimental; urgency=low
+
+  * New upstream feature release.
+  * Fixed build of mime_types.beam in case when unversioned yaws link is
+    removed from the sources tarball.
+
+ -- Sergei Golovan <sgolovan at debian.org>  Thu, 18 Oct 2012 23:58:09 +0400
+
 yaws (1.94-1) unstable; urgency=low
 
   * New upstream bugfix release.

Modified: yaws/trunk/debian/compat
===================================================================
--- yaws/trunk/debian/compat	2013-05-09 18:12:08 UTC (rev 1506)
+++ yaws/trunk/debian/compat	2013-05-10 18:35:48 UTC (rev 1507)
@@ -1 +1 @@
-7
+8

Modified: yaws/trunk/debian/control
===================================================================
--- yaws/trunk/debian/control	2013-05-09 18:12:08 UTC (rev 1506)
+++ yaws/trunk/debian/control	2013-05-10 18:35:48 UTC (rev 1507)
@@ -3,11 +3,11 @@
 Priority: optional
 Maintainer: Debian Erlang Packagers <pkg-erlang-devel at lists.alioth.debian.org>
 Uploaders: Sergei Golovan <sgolovan at debian.org>
-Build-Depends: debhelper (>= 7.0.0), autotools-dev, libpam0g-dev,
- erlang-dev (>= 1:13.b.1-3), erlang-edoc, erlang-mnesia,
- texlive-latex-base, texlive-latex-recommended, texlive-fonts-recommended,
- texlive-font-utils, texlive-extra-utils, ghostscript, quilt
-Standards-Version: 3.9.3
+Build-Depends: debhelper (>= 8.9.7), autotools-dev, libpam0g-dev,
+ erlang-dev (>= 1:13.b.1-3), erlang-edoc, erlang-mnesia
+Build-Depends-Indep: texlive-latex-base, texlive-latex-recommended,
+ texlive-fonts-recommended, texlive-font-utils, texlive-extra-utils, ghostscript
+Standards-Version: 3.9.4
 Homepage: http://yaws.hyber.org/
 Vcs-Svn: svn://svn.debian.org//svn/pkg-erlang/yaws/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-erlang/yaws/trunk/

Modified: yaws/trunk/debian/erlang-yaws.install
===================================================================
--- yaws/trunk/debian/erlang-yaws.install	2013-05-09 18:12:08 UTC (rev 1506)
+++ yaws/trunk/debian/erlang-yaws.install	2013-05-10 18:35:48 UTC (rev 1507)
@@ -1,2 +1,3 @@
 debian/tmp/usr/lib				/usr/
 debian/tmp/usr/share/man/man5/yaws_api.5	/usr/share/man/man5/
+debian/tmp/usr/share/man/man5/yaws_soap_lib.5	/usr/share/man/man5/


Property changes on: yaws/trunk/debian/erlang-yaws.lintian-overrides
___________________________________________________________________
Modified: svn:mergeinfo
   - /yaws/branches/experimental/debian/erlang-yaws.lintian-overrides:1296-1329
   + /yaws/branches/experimental/debian/erlang-yaws.lintian-overrides:1296-1329,1473-1506

Modified: yaws/trunk/debian/patches/docs.diff
===================================================================
--- yaws/trunk/debian/patches/docs.diff	2013-05-09 18:12:08 UTC (rev 1506)
+++ yaws/trunk/debian/patches/docs.diff	2013-05-10 18:35:48 UTC (rev 1507)
@@ -2,8 +2,8 @@
 docs. Also, it renames \ifpdf to \ifpdfoutput to avoid clash with ifpdf
 package (sourced by geometry package in TeXLive 2009).
 
---- yaws-1.93.orig/doc/Makefile
-+++ yaws-1.93/doc/Makefile
+--- yaws-1.96.orig/doc/Makefile
++++ yaws-1.96/doc/Makefile
 @@ -17,9 +17,6 @@
  	@if [ -z "$(PDFLATEX)" ]; then \
  		echo "Need pdflatex"; exit 1; \
@@ -14,8 +14,8 @@
  
  
  
---- yaws-1.93.orig/doc/yaws.tex
-+++ yaws-1.93/doc/yaws.tex
+--- yaws-1.96.orig/doc/yaws.tex
++++ yaws-1.96/doc/yaws.tex
 @@ -34,7 +34,7 @@
  
  \usepackage[T1]{fontenc}
@@ -25,3 +25,14 @@
  
  \makeatother
  \begin{document}
+--- yaws-1.96.orig/man/Makefile
++++ yaws-1.96/man/Makefile
+@@ -7,6 +7,7 @@
+ 	cp yaws.1 $(DESTDIR)$(PREFIX)/share/man/man1
+ 	cp yaws.conf.5 $(DESTDIR)$(PREFIX)/share/man/man5
+ 	cp yaws_api.5 $(DESTDIR)$(PREFIX)/share/man/man5
++	cp yaws_soap_lib.5 $(DESTDIR)$(PREFIX)/share/man/man5
+ 
+ 
+ 
+ 

Modified: yaws/trunk/debian/patches/gnu.diff
===================================================================
--- yaws/trunk/debian/patches/gnu.diff	2013-05-09 18:12:08 UTC (rev 1506)
+++ yaws/trunk/debian/patches/gnu.diff	2013-05-10 18:35:48 UTC (rev 1507)
@@ -1,8 +1,8 @@
 Patch by Sergei Golovan allows YWAS to build on hurd-i386 architecture.
 
---- yaws-1.93.orig/configure
-+++ yaws-1.93/configure
-@@ -4222,6 +4222,16 @@
+--- yaws-1.96.orig/configure
++++ yaws-1.96/configure
+@@ -4240,6 +4240,16 @@
             FPIC=-fPIC
  
             ;;
@@ -19,9 +19,9 @@
           *cygwin*)
             # Extract the first word of "werl", so it can be a program name with args.
  set dummy werl; ac_word=$2
---- yaws-1.93.orig/configure.in
-+++ yaws-1.93/configure.in
-@@ -303,6 +303,13 @@
+--- yaws-1.96.orig/configure.in
++++ yaws-1.96/configure.in
+@@ -304,6 +304,13 @@
             FPIC=-fPIC
             AC_SUBST(FPIC)
             ;;

Modified: yaws/trunk/debian/patches/installapps.diff
===================================================================
--- yaws/trunk/debian/patches/installapps.diff	2013-05-09 18:12:08 UTC (rev 1506)
+++ yaws/trunk/debian/patches/installapps.diff	2013-05-10 18:35:48 UTC (rev 1507)
@@ -1,8 +1,8 @@
 Patch makes yaws applications installing under /usr/lib/yaws directory
 and docs installing to /usr/share/doc/yaws directory.
 
---- yaws-1.93.orig/applications/yapp/Makefile
-+++ yaws-1.93/applications/yapp/Makefile
+--- yaws-1.96.orig/applications/yapp/Makefile
++++ yaws-1.96/applications/yapp/Makefile
 @@ -24,8 +24,10 @@
  	rm -rf doc/*.html doc/edoc-info doc/stylesheet.css doc/*.png
  

Modified: yaws/trunk/debian/patches/m32m64.diff
===================================================================
--- yaws/trunk/debian/patches/m32m64.diff	2013-05-09 18:12:08 UTC (rev 1506)
+++ yaws/trunk/debian/patches/m32m64.diff	2013-05-10 18:35:48 UTC (rev 1507)
@@ -1,9 +1,9 @@
 Patch by Sergei Golovan removes -m32 or -m64 gcc command line options
 (which lead to FTBFS) for all non-x86* architectures.
 
---- yaws-1.93.orig/configure
-+++ yaws-1.93/configure
-@@ -4072,15 +4072,15 @@
+--- yaws-1.96.orig/configure
++++ yaws-1.96/configure
+@@ -4089,16 +4089,15 @@
    { $as_echo "$as_me:${as_lineno-$LINENO}: found 64-bit Erlang" >&5
  $as_echo "$as_me: found 64-bit Erlang" >&6;}
                     case "$host_cpu" in
@@ -17,15 +17,16 @@
  $as_echo "$as_me: found 32-bit Erlang" >&6;}
                     case "$host_cpu" in
 -                       i?86) CBIT= ;;
+-                       armv6l) CBIT= ;;
 -                       *) CBIT=-m32 ;;
 +                       x86_64) CBIT=-m32 ;;
 +                       *) CBIT= ;;
                     esac
  fi
  rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
---- yaws-1.93.orig/configure.in
-+++ yaws-1.93/configure.in
-@@ -231,13 +231,13 @@
+--- yaws-1.96.orig/configure.in
++++ yaws-1.96/configure.in
+@@ -231,14 +231,13 @@
                              end end)])],
  	       [AC_MSG_NOTICE(found 64-bit Erlang)
                     case "$host_cpu" in
@@ -37,6 +38,7 @@
  	       [AC_MSG_NOTICE(found 32-bit Erlang)
                     case "$host_cpu" in
 -                       i?86) CBIT= ;;
+-                       armv6l) CBIT= ;;
 -                       *) CBIT=-m32 ;;
 +                       x86_64) CBIT=-m32 ;;
 +                       *) CBIT= ;;

Modified: yaws/trunk/debian/rules
===================================================================
--- yaws/trunk/debian/rules	2013-05-09 18:12:08 UTC (rev 1506)
+++ yaws/trunk/debian/rules	2013-05-10 18:35:48 UTC (rev 1507)
@@ -8,10 +8,6 @@
 
 export HOME := $(CURDIR)/debian
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-export QUILT_PATCHES := debian/patches
-
 # 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)
@@ -33,19 +29,33 @@
 	TYPE = debug
 endif
 
-patch: patch-stamp
-patch-stamp:
-	dh_testdir
-	quilt push -a || test $$? = 2
-	touch patch-stamp
+%:
+	dh $@
 
-unpatch: patch-stamp
+override_dh_clean:
 	dh_testdir
-	quilt pop -a || test $$? = 2
-	rm -rf .pc
-	rm -f patch-stamp
+	dh_testroot
+	#
+	# Clean up applications included into yaws distribution
+	[ ! -f include.mk ] || \
+	for appdir in applications/* ; do \
+	    (cd $$appdir ; \
+	     $(MAKE) clean || exit 1 ; \
+	     $(MAKE) cleandocs || exit 1) \
+	done
+	rm -rf applications/chat/ebin
+	#
+	# Clean up after the build process.
+	[ ! -f include.mk ] || $(MAKE) clean
+	[ ! -f include.mk ] || $(MAKE) conf_clean
+	rm -f priv/charset.def
+	#
+	rm -f erl_crash.dump
+	rm -f debian/yaws-*.postinst debian/yaws-*.postrm
+	#
+	dh_clean
 
-config.status: patch-stamp configure
+override_dh_auto_configure:
 	dh_testdir
 	#
 	CFLAGS="$(CFLAGS)" \
@@ -56,24 +66,15 @@
 		    --infodir=/usr/share/info \
 		    --sysconfdir=/etc \
 		    --localstatedir=/var
-	ln -s . yaws
 
-
-build: build-arch build-indep
-
-build-arch: build-arch-stamp
-build-arch-stamp: config.status
+override_dh_auto_build-arch:
 	dh_testdir
 	#
 	# Compile the package.
 	mkdir -p examples/ebin
 	TYPE="$(TYPE)" $(MAKE) DLL_LIBS=-lc
-	$(MAKE) docs
-	#
-	touch build-arch-stamp
 
-build-indep: build-indep-stamp
-build-indep-stamp: config.status
+override_dh_auto_build-indep:
 	dh_testdir
 	#
 	# Build applications included into yaws distribution
@@ -83,38 +84,16 @@
 	     TYPE="$(TYPE)" $(MAKE) || exit 1) \
 	done
 	#
-	touch build-indep-stamp
+	# Build documentation
+	$(MAKE) docs
 
-clean: clean-patched unpatch
-	dh_testdir
-	dh_testroot
-	dh_clean
+override_dh_auto_test:
+	# Do nothing because the tests require downloading some tools from
+	# the Internet.
 
-clean-patched: patch-stamp
+override_dh_auto_install-arch:
 	dh_testdir
-	dh_testroot
 	#
-	# Clean up applications included into yaws distribution
-	[ ! -f include.mk ] || \
-	for appdir in applications/* ; do \
-	    (cd $$appdir ; \
-	     $(MAKE) clean || exit 1 ; \
-	     $(MAKE) cleandocs || exit 1) \
-	done
-	#
-	# Clean up after the build process.
-	[ ! -f include.mk ] || $(MAKE) clean
-	[ ! -f include.mk ] || $(MAKE) conf_clean
-	#
-	rm -f build-*-stamp 
-	rm -f yaws erl_crash.dump
-	rm -f debian/yaws-*.postinst debian/yaws-*.postrm
-
-install-arch: build-arch
-	dh_testdir
-	dh_testroot
-	dh_installdirs -a
-	#
 	# Install the package into debian/yaws.
 	$(MAKE) install DESTDIR=$(TMPDIR)
 	#
@@ -132,11 +111,11 @@
 	#
 	# Remove empty directories
 	rm -rf $(TMPDIR)/usr/lib/yaws/examples/
+	#
+	dh_install -a
 
-install-indep: build-indep
+override_dh_auto_install-indep:
 	dh_testdir
-	dh_testroot
-	dh_installdirs -i
 	#
 	# Install applications (and READMEs) included into yaws distribution
 	# Application beams go to /usr/lib/yaws/$application/ebin
@@ -171,59 +150,24 @@
 	    sed -e "s/@APPLICATION@/$$app/g" \
 	    	debian/yaws-application.postrm.in >debian/yaws-$$app.postrm || exit 1 ; \
 	done
-
-# Build architecture-independent files here.
-binary-indep: install-arch install-indep
-	dh_testdir -i
-	dh_testroot -i
-	dh_installchangelogs -i ChangeLog
-	dh_installdocs -i
-	dh_installexamples -i
+	#
 	dh_install -i
-	dh_installinit -i
-	dh_installman -i
-	dh_link -i
-	dh_strip -i
-	dh_compress -i -X.erl -X.beam -X.yaws -X.pdf -X .ps -X .eps
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_shlibdeps -i
-	erlang-depends -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
 
-# Build architecture-dependent files here.
-binary-arch: install-arch
-	dh_testdir -a
-	dh_testroot -a
-	dh_installchangelogs -a ChangeLog
-	dh_installdocs -a
-	dh_installexamples -a
-	dh_install -a
-	dh_lintian -a
-	dh_installinit -a
-	dh_installman -a
-	dh_link -a
-	dh_strip -a
-	dh_compress -a -X.erl -X.beam -X.yaws -X.pdf -X.ps -X.eps
-	dh_fixperms -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	erlang-depends -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
+override_dh_compress:
+	dh_compress -X.erl -X.beam -X.yaws -X.pdf -X .ps -X .eps
 
-binary: binary-arch binary-indep
+override_dh_gencontrol:
+	erlang-depends
+	dh_gencontrol
 
-VSN=1.94
+v=1.96
 
 get-orig-source:
-	wget -O - http://yaws.hyber.org/download/yaws-$(VSN).tar.gz | tar zx
-	tar zcf yaws_$(VSN).orig.tar.gz yaws-$(VSN)
-	rm -r yaws-$(VSN)
+	wget -O - http://yaws.hyber.org/download/yaws-$(v).tar.gz | tar zx
+	tar zcf yaws_$(v).orig.tar.gz yaws-$(v)
+	rm -r yaws-$(v)
 	rm yaws
 
-.PHONY: build build-indep build-arch clean binary-indep binary-arch binary \
-	install-arch install-indep get-orig-source patch unpatch clean-patched
+.PHONY: override_dh_clean override_dh_auto_configure override_dh_auto_build-arch override_dh_auto_build-indep \
+	override_dh_auto_test override_dh_auto_install-arch override_dh_auto_install-indep \
+	override_dh_compress override_dh_gencontrol get-orig-source

Added: yaws/trunk/debian/source/format
===================================================================
--- yaws/trunk/debian/source/format	                        (rev 0)
+++ yaws/trunk/debian/source/format	2013-05-10 18:35:48 UTC (rev 1507)
@@ -0,0 +1 @@
+3.0 (quilt)


Property changes on: yaws/trunk/debian/yaws.README.Debian
___________________________________________________________________
Modified: svn:mergeinfo
   - /yaws/branches/experimental/debian/yaws.README.Debian:1296-1329
   + /yaws/branches/experimental/debian/yaws.README.Debian:1296-1329,1473-1506

More information about the Pkg-erlang-commits mailing list