[SCM] Debian packaging of texinfo) branch, master, updated. upstream/4.13a.dfsg.1-11-g610c3c4
The following commit has been merged in the master branch:
commit c358f11cbedfc39470847098ca99c73d3e1b5063
Author: Norbert Preining <preining@debian.org>
Date: Fri Aug 31 09:59:42 2012 +0900
swtich to quilt format
diff --git a/debian/changelog b/debian/changelog
index 49a6227..e602d0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ texinfo (4.13a.dfsg.1-11) UNRELEASED; urgency=low
on a tab character. (LP #394808)
(taken from the Ubuntu packages, thanks!)
* switch to git for packaging, adapt control Vcs fields
+ * switch to source format quilt 3.0, adjust dh compat level, remove
+ quilt from dependencies, adjust rules file
- -- Norbert Preining <preining@debian.org> Fri, 31 Aug 2012 09:53:39 +0900
+ -- Norbert Preining <preining@debian.org> Fri, 31 Aug 2012 09:58:00 +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 c6f7ead..1c7f8e8 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-Git: git://anonscm.debian.org/debian-tex/texinfo.git
Vcs-Browser: http://anonscm.debian.org/git/debian-tex/texinfo.git
diff --git a/debian/rules b/debian/rules
index 0529a29..8cdcf50 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,12 +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
ifneq "$(findstring noopt,$(DEB_BUILD_OPTIONS))" ""
CFLAGS += -O0
@@ -28,7 +22,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,12 +38,12 @@ build-stamp: $(QUILT_STAMPFN)
$(MAKE)
touch $@
-clean: unpatch
+clean:
dh_testdir
dh_testroot
[ ! -f Makefile ] || $(MAKE) distclean
# remove binary gmo files
- rm -f po/*.gmo
+ #rm -f po/*.gmo
dh_clean install-stamp build-stamp intl/libintl.h config.log
install: install-stamp
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: