[hamradio-commits] [qsstv] 04/06: New version Quilt updated
Dave Hibberd
hibby-guest at moszumanska.debian.org
Tue May 24 21:44:53 UTC 2016
This is an automated email from the git hooks/post-receive script.
hibby-guest pushed a commit to branch master
in repository qsstv.
commit d1b0feaf283314d9b0083f8ea112f694ad01a702
Author: Hibby <d at vehibberd.com>
Date: Tue May 24 21:05:44 2016 +0100
New version
Quilt updated
---
debian/changelog | 6 ++
debian/patches/01-set-install-prefix.patch | 13 -----
debian/patches/02-fix-html-doc-path.patch | 13 -----
debian/patches/03-spelling-fixes.patch | 24 --------
debian/patches/series | 3 -
debian/rules | 94 +-----------------------------
6 files changed, 8 insertions(+), 145 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 60b363b..1b5e6e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qsstv (9.1.5-1) UNRELEASED; urgency=medium
+
+ * Non Maintainer Upload
+
+ -- Dave Hibberd <d at vehibberd.com> Tue, 24 May 2016 21:05:10 +0100
+
qsstv (8.2.12-1) unstable; urgency=medium
* New Upstream version.
diff --git a/debian/patches/01-set-install-prefix.patch b/debian/patches/01-set-install-prefix.patch
deleted file mode 100644
index ac4c28a..0000000
--- a/debian/patches/01-set-install-prefix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Set PREFIX so that the qsstv Makefile installs to
-INSTALL_ROOT/debian/qsstv/usr instead of the default /usr/local/.
---- a/qsstv/qsstv.pro
-+++ b/qsstv/qsstv.pro
-@@ -11,7 +11,7 @@
- TARGET = qsstv
- TEMPLATE = app
-
--
-+PREFIX = debian/qsstv/usr
-
- QMAKE_CXXFLAGS_DEBUG += -g3 -O0
- INCLUDEPATH += src widgets ../qwt
diff --git a/debian/patches/02-fix-html-doc-path.patch b/debian/patches/02-fix-html-doc-path.patch
deleted file mode 100644
index 103d829..0000000
--- a/debian/patches/02-fix-html-doc-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Fix dox.path so that the HTML documentation is installed to ./html in
-/usr/share/doc/qsstv
---- a/qsstv/qsstv.pro
-+++ b/qsstv/qsstv.pro
-@@ -430,7 +430,7 @@
- PRE_TARGETDEPS += dox
- message(dox will be generated)
- }
--dox.path=/usr/share/doc/$$TARGET
-+dox.path=/usr/share/doc/$$TARGET/html
- dox.files= $$PWD/manual/*
- QMAKE_EXTRA_TARGETS += dox
-
diff --git a/debian/patches/03-spelling-fixes.patch b/debian/patches/03-spelling-fixes.patch
deleted file mode 100644
index 49f8c4f..0000000
--- a/debian/patches/03-spelling-fixes.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Fix minor spelling errors
-
---- a/qsstv/videocapt/videocapture.cpp
-+++ b/qsstv/videocapt/videocapture.cpp
-@@ -779,7 +779,7 @@
- if(captureStop() == 0)
- {
- streaming = false;
-- addToLog(" * Succesful Stopped",LOGCAM);
-+ addToLog(" * Successful Stopped",LOGCAM);
- }
- return true;
- }
---- a/qsstv/widgets/waterfallform.ui
-+++ b/qsstv/widgets/waterfallform.ui
-@@ -24,7 +24,7 @@
- <item>
- <widget class="QLabel" name="label">
- <property name="text">
-- <string>Maximum 10 charaters per line</string>
-+ <string>Maximum 10 characters per line</string>
- </property>
- </widget>
- </item>
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 3457b0e..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-01-set-install-prefix.patch
-02-fix-html-doc-path.patch
-03-spelling-fixes.patch
diff --git a/debian/rules b/debian/rules
index 74a9b3c..b8b1ea0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,96 +1,6 @@
#!/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.
-include /usr/share/quilt/quilt.make
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-
-# Glue rule for quilt
%:
- dh --with quilt $@
-
-config.status:
- dh_testdir
-
- # Add here commands to configure the package.
- dh_quilt_patch
- qmake
-
-build: build-stamp
-
-build-stamp: config.status
- dh_testdir
-
- # Add here commands to compile the package.
- $(MAKE)
-
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- # Add here commands to clean up after the build process.
- [ ! -f Makefile ] || $(MAKE) distclean
- rm -rf tmp
-
- #dh_quilt_unpatch
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
-
- # Add here commands to install the package into debian/qsstv.
- INSTALL_ROOT=$(CURDIR)/debian/qsstv $(MAKE) install
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_installexamples debian/templates/*.templ
- dh_install debian/qsstv.xpm usr/share/pixmaps
- dh_install debian/qsstv.desktop usr/share/applications
- dh_installmenu
- dh_installman debian/qsstv.1
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+ dh $@
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/qsstv.git
More information about the pkg-hamradio-commits
mailing list