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

[SCM] Debian packaging of texinfo) branch, master, updated. upstream/4.13a.dfsg.1-13-g25413a6



The following commit has been merged in the master branch:
commit 980f47d715720d1383720aeb4df600ff814bb906
Author: Norbert Preining <preining@logic.at>
Date:   Mon Nov 19 09:32:18 2012 +0900

    bump standards version, convert to quilt 3.0 format

diff --git a/debian/changelog b/debian/changelog
index 42fc901..755fed8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
-texinfo (4.13a.dfsg.1-11) UNRELEASED; urgency=low
+texinfo (4.13.90.dfsg.1-1~1) UNRELEASED; urgency=low
 
-  * debian/patches/int2size_t-fix-page-truncation: Cherrypick upstream
-    variable size fix which manifested as info pages being truncated
-    on a tab character. (LP #394808)
-    (taken from the Ubuntu packages, thanks!)
+  * new upstream release
+    - fixes truncation at TAB chars (LP #394808)
+  * clean up patches
+  * convert to 3.0/quilt format
+  * bump compat level to 7
 
- -- Norbert Preining <preining@debian.org>  Tue, 05 Jun 2012 22:30:20 +0900
+ -- Norbert Preining <preining@debian.org>  Mon, 19 Nov 2012 09:31:16 +0900
 
 texinfo (4.13a.dfsg.1-10) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 392e9d3..274466b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: doc
 Priority: standard
 Maintainer: Debian TeX maintainers <debian-tex-maint@lists.debian.org>
 Uploaders: Norbert Preining <preining@debian.org>, Frank Küster <frank@debian.org>
-Build-Depends: debhelper (>= 5), quilt, libncurses5-dev | libncurses-dev, gettext
+Build-Depends: debhelper (>= 7.0.50~), libncurses5-dev | libncurses-dev, gettext
 Standards-Version: 3.9.3
 Vcs-Svn: svn://svn.debian.org/svn/debian-tex/texinfo/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/debian-tex/texinfo/trunk/
diff --git a/debian/rules b/debian/rules
index 0529a29..a6502cd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,10 +3,6 @@
 #export DH_VERBOSE=1
 export DH_OPTIONS
 
-# needed for quilt:
-export QUILT_PATCHES=./debian/patches
-include /usr/share/quilt/quilt.make
-
 SAVEDGMO=po/nl.gmo po/ro.gmo po/tr.gmo po/de.gmo
 
 CFLAGS := -g -Wall
@@ -28,7 +24,7 @@ build: build-arch build-indep
 build-arch: build-stamp
 build-indep: build-stamp
 
-build-stamp: $(QUILT_STAMPFN)
+build-stamp:
 	# some man scripts have been touch by the patches, so the builder
 	# will try to rebuild the man page from texi2dvi but that
 	# spits out only a warning that no tex system is installed
@@ -44,7 +40,7 @@ build-stamp: $(QUILT_STAMPFN)
 	$(MAKE)
 	touch $@
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	[ ! -f Makefile ] || $(MAKE) distclean
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)


Reply to: