[Pkg-erlang-commits] r1448 - yaws/trunk/debian

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2012-06-08 05:27:48 +0000 (Fri, 08 Jun 2012)
New Revision: 1448

Modified:
   yaws/trunk/debian/changelog
   yaws/trunk/debian/compat
   yaws/trunk/debian/control
   yaws/trunk/debian/rules
Log:
[yaws]
  * Removed unnecessary suggested dependency on erlang-dev.
  * Cleaned up debian/rules a bit.
  * Bumped debhelper competibility version to 7 because of dh_lintian.
  * Bumped standards version to 3.9.3.


Modified: yaws/trunk/debian/changelog
===================================================================
--- yaws/trunk/debian/changelog	2012-06-02 06:59:45 UTC (rev 1447)
+++ yaws/trunk/debian/changelog	2012-06-08 05:27:48 UTC (rev 1448)
@@ -1,8 +1,11 @@
-yaws (1.92-4) UNRELEASED; urgency=low
+yaws (1.92-4) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Removed unnecessary suggested dependency on erlang-dev.
+  * Cleaned up debian/rules a bit.
+  * Bumped debhelper competibility version to 7 because of dh_lintian.
+  * Bumped standards version to 3.9.3.
 
- -- Sergei Golovan <sgolovan at debian.org>  Mon, 14 May 2012 17:05:38 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Fri, 08 Jun 2012 09:20:57 +0400
 
 yaws (1.92-3) unstable; urgency=low
 

Modified: yaws/trunk/debian/compat
===================================================================
--- yaws/trunk/debian/compat	2012-06-02 06:59:45 UTC (rev 1447)
+++ yaws/trunk/debian/compat	2012-06-08 05:27:48 UTC (rev 1448)
@@ -1 +1 @@
-5
+7

Modified: yaws/trunk/debian/control
===================================================================
--- yaws/trunk/debian/control	2012-06-02 06:59:45 UTC (rev 1447)
+++ yaws/trunk/debian/control	2012-06-08 05:27:48 UTC (rev 1448)
@@ -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 (>= 5.0.0), autotools-dev, libpam0g-dev,
+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.2
+Standards-Version: 3.9.3
 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/
@@ -28,7 +28,7 @@
 Package: erlang-yaws
 Architecture: any
 Depends: ${erlang-abi:Depends}, ${erlang:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Suggests: ${erlang-dev:Depends}, yaws, yaws-doc, zip, bzip2
+Suggests: yaws, yaws-doc, zip, bzip2
 Replaces: yaws (<< 1.88-2)
 Description: Erlang application which implements HTTP webserver
  Yaws is a high performance HTTP 1.1 webserver written in Erlang. It is a 

Modified: yaws/trunk/debian/rules
===================================================================
--- yaws/trunk/debian/rules	2012-06-02 06:59:45 UTC (rev 1447)
+++ yaws/trunk/debian/rules	2012-06-08 05:27:48 UTC (rev 1448)
@@ -6,8 +6,6 @@
 # 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.
 
-VSN=1.92
-
 export HOME := $(CURDIR)/debian
 
 # Uncomment this to turn on verbose mode.
@@ -23,8 +21,6 @@
 DESTDIR1=$(CURDIR)/debian/erlang-yaws
 TMPDIR=$(CURDIR)/debian/tmp
 
--include vsn.mk
-
 CFLAGS = -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -51,13 +47,13 @@
 
 config.status: patch-stamp configure
 	dh_testdir
-	# Add here commands to configure the package.
+	#
 	CFLAGS="$(CFLAGS)" \
 	./configure --host=$(DEB_HOST_GNU_TYPE) \
 		    --build=$(DEB_BUILD_GNU_TYPE) \
 		    --prefix=/usr \
-		    --mandir=\$${prefix}/share/man \
-		    --infodir=\$${prefix}/share/info \
+		    --mandir=/usr/share/man \
+		    --infodir=/usr/share/info \
 		    --sysconfdir=/etc \
 		    --localstatedir=/var
 	ln -s . yaws
@@ -143,8 +139,8 @@
 	dh_installdirs -i
 	#
 	# Install applications (and READMEs) included into yaws distribution
-	# Application beams go to /usr/lib/yaws
-	# Other application files go to /usr/share/yaws-application/docroot
+	# Application beams go to /usr/lib/yaws/$application/ebin
+	# Other application files go to /usr/share/yaws-$application/docroot
 	for appdir in applications/* ; do \
 	    (cd $$appdir ; \
 	     app=`basename $$appdir` ; \
@@ -205,8 +201,7 @@
 	dh_installdocs -a
 	dh_installexamples -a
 	dh_install -a
-	install -m 644 debian/erlang-yaws.lintian-overrides \
-		$(DESTDIR1)/usr/share/lintian/overrides/erlang-yaws
+	dh_lintian -a
 	dh_installinit -a
 	dh_installman -a
 	dh_link -a
@@ -222,6 +217,8 @@
 
 binary: binary-arch binary-indep
 
+VSN=1.92
+
 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)