[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian packaging of texinfo-doc-nonfree) branch, master, updated. upstream/4.13a-8-ge89742f



The following commit has been merged in the master branch:
commit e89742fc1a29d47eeb9dee12e4f6a325686e577b
Author: Norbert Preining <preining@debian.org>
Date:   Tue Nov 27 13:31:34 2012 +0900

    lintian happiness

diff --git a/debian/changelog b/debian/changelog
index cdb52cd..9e7db17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 texinfo-doc-nonfree (4.13.91-1) experimental; urgency=low
 
   * new upstream pre-release
+  * bump standards version to 3.9.3
+  * convert to 3.0 (quilt)
 
- -- Norbert Preining <preining@debian.org>  Tue, 27 Nov 2012 13:21:09 +0900
+ -- Norbert Preining <preining@debian.org>  Tue, 27 Nov 2012 13:33:55 +0900
 
 texinfo-doc-nonfree (4.13a-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 4b122ca..9a151ed 100644
--- a/debian/control
+++ b/debian/control
@@ -5,11 +5,12 @@ Maintainer: Debian TeX maintainers <debian-tex-maint@lists.debian.org>
 Uploaders: Norbert Preining <preining@debian.org>
 Build-Depends: debhelper (>= 5)
 Build-Depends-Indep: texinfo (>= 4.11)
-Standards-Version: 3.8.0
+Standards-Version: 3.9.3
 
 Package: texinfo-doc-nonfree
 Architecture: all
 Recommends: info
+Depends: ${misc:Depends}
 Conflicts: texinfo (<= 4.8-8), info (<= 4.8-8)
 Replaces: texinfo (<= 4.8-8), info (<= 4.8-8)
 Description: texinfo and info documentation that is non-free
diff --git a/debian/rules b/debian/rules
index bb06eec..78c74ca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,12 +5,17 @@ export DH_OPTIONS
 
 pkg := $(CURDIR)/debian/texinfo-doc-nonfree
 
-build:
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
+
+build-stamp:
 	dh_testdir
 	makeinfo texinfo.txi
 	makeinfo info.texi
 	makeinfo info-stnd.texi
 	makeinfo --html texinfo.txi
+	touch $@
 
 clean:
 	dh_testdir
@@ -18,9 +23,12 @@ clean:
 	rm -f info.info 
 	rm -f info-stnd.info
 	rm -rf texinfo.html
-	dh_clean
+	dh_clean build-stamp install-stamp
+
+install: install-stamp
 
-install:
+install-stamp: DH_OPTIONS=
+install-stamp: build-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
@@ -29,6 +37,7 @@ install:
 	# install the html documentation
 	mkdir -p $(pkg)/usr/share/doc/texinfo/
 	cp -a texinfo.html $(pkg)/usr/share/doc/texinfo/html
+	touch install-stamp
 
 binary-indep: install
 	dh_testdir
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

-- 
Debian packaging of texinfo-doc-nonfree)


Reply to: