[texworks] 58/73: switch to debhelper compat level 9
This is an automated email from the git hooks/post-receive script.
preining pushed a commit to branch master
in repository texworks.
commit 6aebb4b92d6e2d1e4c785b6be7c0b9c6f6a75aa8
Author: Andreas Beckmann <anbe@debian.org>
Date: Sat Aug 8 16:40:47 2015 +0200
switch to debhelper compat level 9
---
debian/README.source | 9 ----
debian/changelog | 2 +
debian/compat | 2 +-
debian/control | 11 ++++-
debian/copyright | 2 +-
debian/dirs | 4 --
debian/rules | 81 ++++----------------------------
debian/texworks-help-en.dirs | 1 -
debian/texworks-help-en.install | 2 +-
debian/texworks-scripting-lua.dirs | 1 -
debian/texworks-scripting-lua.install | 2 +-
debian/texworks-scripting-python.dirs | 1 -
debian/texworks-scripting-python.install | 2 +-
debian/{docs => texworks.docs} | 0
debian/texworks.install | 6 ++-
15 files changed, 29 insertions(+), 97 deletions(-)
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 96e3eda..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,9 +0,0 @@
-texworks for Debian
--------------------
-
-<this file describes information about the source package, see Debian policy
-manual section 4.14. You WILL either need to modify or delete this file>
-
-
-
-
diff --git a/debian/changelog b/debian/changelog
index cfac8ec..5404f83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ texworks (0.5~svn1363-6) UNRELEASED; urgency=medium
* Set Maintainer to Debian QA Group. (See: #773940)
* Use source format 3.0 (quilt).
* Link against QtXml to fix FTBFS with Qt 4.8.7. (Closes: #789842)
+ * Switch to debhelper compat level 9.
+ * Minimize d/rules using debhelper override targets.
-- Andreas Beckmann <anbe@debian.org> Sat, 08 Aug 2015 16:07:01 +0200
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 00d9d44..21667ec 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,16 @@ Source: texworks
Section: editors
Priority: extra
Maintainer: Debian QA Group <packages@qa.debian.org>
-Build-Depends: debhelper (>= 7), pkg-config, cmake (>= 2.8.6), libhunspell-dev, libqt4-dev, libpoppler-qt4-dev, liblua5.2-dev, python-dev, zlib1g-dev, libsynctex-dev
+Build-Depends: debhelper (>= 9),
+ pkg-config,
+ cmake (>= 2.8.6),
+ libhunspell-dev,
+ libqt4-dev,
+ libpoppler-qt4-dev,
+ liblua5.2-dev,
+ python-dev,
+ zlib1g-dev,
+ libsynctex-dev,
Standards-Version: 3.9.5
Homepage: http://www.tug.org/texworks/
diff --git a/debian/copyright b/debian/copyright
index 4bbfcd0..73fa668 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -54,7 +54,7 @@ License of the SyncTeX:
License of the Beamer templates:
% In principle, this file can be redistributed and/or modified under
- % the terms of the GNU Public License, version 2.
+ % the terms of the GNU General Public License, version 2.
%
% However, this file is supposed to be a template to be modified
% for your own needs. For this reason, if you use this file as a
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index d5204d9..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/bin
-usr/share/pixmaps
-usr/share/applications
-usr/share/texworks-help
diff --git a/debian/rules b/debian/rules
index 9e5d271..88404dd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,4 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# 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.
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
@@ -20,86 +14,27 @@ NJOBS := -j $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
endif
-.PHONY: build-arch build-indep build clean binary-indep binary-arch binary install configure
+%:
+ dh $@
-
-binary: binary-indep binary-arch
-build: build-indep build-arch
-
-# Configure the build
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- # Configure
+override_dh_auto_configure:
mkdir build && cd build && cmake .. -DTW_BUILD_ID='Debian' -DCMAKE_INSTALL_PREFIX='/usr' -DWITH_PYTHON=ON -DTeXworks_HELP_DIR='/usr/share/texworks-help' && cd ..
- touch $@
-
-# Build architecture-independent files
-build-indep :
-
-build-arch: build-stamp
-# Build architecture-dependent files
-build-stamp: configure-stamp
- dh_testdir
+override_dh_auto_build:
cd build && $(MAKE) $(NJOBS) VERBOSE=1
- touch $@
-
-clean:
- dh_testdir
- dh_testroot
- rm -rf build build-stamp configure-stamp
- dh_clean
# Build architecture-independent packages
-binary-indep:
- dh_testdir
- dh_testroot
- dh_prep
-
- dh_installchangelogs
- dh_installdirs
- dh_installdocs
-
+#...
# DON'T PACKAGE THE MANUAL IN EXPERIMENTAL BUILDS
# Install the manual
# mkdir --parents $(CURDIR)/debian/tmp/usr/share/doc/texworks-help/
# cp -r manual $(CURDIR)/debian/tmp/usr/share/doc/texworks-help/TeXworks-manual
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-
-
-# Build architecture-independent packages
-binary-arch: install
- dh_testdir
- dh_testroot
-
+override_dh_auto_install:
cd build && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
mv $(CURDIR)/debian/tmp/usr/usr/share/texworks-help $(CURDIR)/debian/tmp/usr/share/texworks-help
rm -rf $(CURDIR)/debian/tmp/usr/usr
rm $(CURDIR)/debian/tmp/usr/share/doc/texworks/COPYING
- dh_installchangelogs
- dh_installdocs
- dh_install
- rm -r $(CURDIR)/debian/texworks/usr/share/texworks-help
- dh_installman
- dh_icons
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-
+override_dh_installchangelogs:
+ dh_installchangelogs NEWS
diff --git a/debian/texworks-help-en.dirs b/debian/texworks-help-en.dirs
deleted file mode 100644
index cb0bb78..0000000
--- a/debian/texworks-help-en.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/texworks-help
diff --git a/debian/texworks-help-en.install b/debian/texworks-help-en.install
index b090235..cb0bb78 100644
--- a/debian/texworks-help-en.install
+++ b/debian/texworks-help-en.install
@@ -1 +1 @@
-debian/tmp/usr/share/texworks-help
+usr/share/texworks-help
diff --git a/debian/texworks-scripting-lua.dirs b/debian/texworks-scripting-lua.dirs
deleted file mode 100644
index c74b9bd..0000000
--- a/debian/texworks-scripting-lua.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/texworks
diff --git a/debian/texworks-scripting-lua.install b/debian/texworks-scripting-lua.install
index 2960477..bc2191d 100644
--- a/debian/texworks-scripting-lua.install
+++ b/debian/texworks-scripting-lua.install
@@ -1 +1 @@
-debian/tmp/usr/lib/texworks/libTWLuaPlugin.so
+usr/lib/texworks/libTWLuaPlugin.so
diff --git a/debian/texworks-scripting-python.dirs b/debian/texworks-scripting-python.dirs
deleted file mode 100644
index c74b9bd..0000000
--- a/debian/texworks-scripting-python.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/texworks
diff --git a/debian/texworks-scripting-python.install b/debian/texworks-scripting-python.install
index eee9071..194f71c 100644
--- a/debian/texworks-scripting-python.install
+++ b/debian/texworks-scripting-python.install
@@ -1 +1 @@
-debian/tmp/usr/lib/texworks/libTWPythonPlugin.so
+usr/lib/texworks/libTWPythonPlugin.so
diff --git a/debian/docs b/debian/texworks.docs
similarity index 100%
rename from debian/docs
rename to debian/texworks.docs
diff --git a/debian/texworks.install b/debian/texworks.install
index a4ffe7f..573b31d 100644
--- a/debian/texworks.install
+++ b/debian/texworks.install
@@ -1,2 +1,4 @@
-debian/tmp/usr/bin*
-debian/tmp/usr/share*
+usr/bin/texworks
+usr/share/applications/texworks.desktop
+usr/share/man/
+usr/share/pixmaps/TeXworks.png
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/texworks.git
Reply to: