[Pkg-erlang-commits] r1499 - in erlang/trunk/debian: . source

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2013-05-06 04:32:56 +0000 (Mon, 06 May 2013)
New Revision: 1499

Added:
   erlang/trunk/debian/source/
   erlang/trunk/debian/source/format
Removed:
   erlang/trunk/debian/README.source
Modified:
   erlang/trunk/debian/changelog
   erlang/trunk/debian/control
   erlang/trunk/debian/rules
Log:
[erlang]
  * Upload to unstable.
  * Switched to 3.0 (quilt) source format.
  * Bumped standards version to 3.9.4.


Deleted: erlang/trunk/debian/README.source
===================================================================
--- erlang/trunk/debian/README.source	2013-05-05 10:17:16 UTC (rev 1498)
+++ erlang/trunk/debian/README.source	2013-05-06 04:32:56 UTC (rev 1499)
@@ -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>  Tue, 18 Aug 2009 01:27:36 +0400

Modified: erlang/trunk/debian/changelog
===================================================================
--- erlang/trunk/debian/changelog	2013-05-05 10:17:16 UTC (rev 1498)
+++ erlang/trunk/debian/changelog	2013-05-06 04:32:56 UTC (rev 1499)
@@ -1,9 +1,10 @@
 erlang (1:16.b-dfsg-3) unstable; urgency=low
 
   * Upload to unstable.
+  * Switched to 3.0 (quilt) source format.
   * Bumped standards version to 3.9.4.
 
- -- Sergei Golovan <sgolovan at debian.org>  Sun, 05 May 2013 14:13:50 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Mon, 06 May 2013 08:30:31 +0400
 
 erlang (1:16.b-dfsg-2) experimental; urgency=low
 

Modified: erlang/trunk/debian/control
===================================================================
--- erlang/trunk/debian/control	2013-05-05 10:17:16 UTC (rev 1498)
+++ erlang/trunk/debian/control	2013-05-06 04:32:56 UTC (rev 1499)
@@ -5,7 +5,7 @@
 Priority: optional
 Standards-Version: 3.9.4
 Build-Depends: debhelper (>= 5.0.0), autoconf (>= 2.50), openssl, libssl-dev, m4,
- libncurses5-dev, quilt, autotools-dev, unixodbc-dev, bison, flex, ed,
+ libncurses5-dev, autotools-dev, unixodbc-dev, bison, flex, ed,
  libwxgtk2.8-dev, dctrl-tools, xsltproc,
  libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev,
  libsctp-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !solaris-i386],

Modified: erlang/trunk/debian/rules
===================================================================
--- erlang/trunk/debian/rules	2013-05-05 10:17:16 UTC (rev 1498)
+++ erlang/trunk/debian/rules	2013-05-06 04:32:56 UTC (rev 1499)
@@ -4,7 +4,6 @@
 DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-export QUILT_PATCHES := debian/patches
 
 ROOT_DIR=$(shell pwd)
 MAN_DIR = $(ROOT_DIR)/debian/erlang-docs/usr/lib/erlang/man
@@ -76,26 +75,9 @@
 TYPE=
 endif
 
-unpatch: patch-stamp
+clean:
 	dh_testdir
-	quilt pop -a || test $$? = 2
-	rm -rf .pc
-	rm -f patch-stamp
-
-patch: patch-stamp
-patch-stamp:
-	dh_testdir
-	quilt push -a || test $$? = 2
-	touch patch-stamp
-
-clean: clean-patched unpatch
-	dh_testdir
 	dh_testroot
-	dh_clean -Xtest.erl.orig
-
-clean-patched: patch-stamp
-	dh_testdir
-	dh_testroot
 	#
 	[ ! -f Makefile ] || ${MAKE} -j clean
 	rm -f lib/dialyzer/SKIP
@@ -128,11 +110,13 @@
 	#
 	rm -f debian/AUTHORS
 	#
-	# Don't remove patch-stamp
-	rm -f [!p]*-stamp
+	# Remove touched stamp files
+	rm -f *-stamp
+	#
+	dh_clean -Xtest.erl.orig
 
 automake: automake-stamp
-automake-stamp: patch-stamp
+automake-stamp:
 	dh_testdir
 	#
 	# Return error if there are known nonfree docs in upstream tarball
@@ -529,7 +513,7 @@
 	tar -zcf $$CURDIR/erlang_$(DEB_REL).orig.tar.gz otp_src_$(RELDIR) && \
 	rm -rf $$TMPDIR
 
-.PHONY: patch unpatch clean-patched clean automake install build build-arch build-indep
+.PHONY: clean automake install build build-arch build-indep
 .PHONY: binary binary-arch binary-indep get-orig-source
 .PHONY: configure-stnd build-stnd install-stnd docs manpages
 .PHONY: configure-hipe build-hipe install-hipe

Added: erlang/trunk/debian/source/format
===================================================================
--- erlang/trunk/debian/source/format	                        (rev 0)
+++ erlang/trunk/debian/source/format	2013-05-06 04:32:56 UTC (rev 1499)
@@ -0,0 +1 @@
+3.0 (quilt)