[Pkg-electronics-commits] [gerbv] 04/17: Apply changes from debian/2.5.0-1 to debian/2.6.0-1 again.

[Dr. Tobias Quathamer]

This is an automated email from the git hooks/post-receive script.

toddy pushed a commit to branch master
in repository gerbv.

commit e301fa4c2a9b6b0f6d62d76227867cbbc15e88c5
Author: Dr. Tobias Quathamer <toddy at debian.org>
Date:   Mon Dec 26 12:22:48 2016 +0100

    Apply changes from debian/2.5.0-1 to debian/2.6.0-1 again.
    
    Those changes have accidentally been overwritten by Gudjon I. Gudjonsson.
---
 debian/compat   |  2 +-
 debian/control  | 12 +++++++---
 debian/docs     |  2 ++
 debian/examples |  1 +
 debian/rules    | 72 ++++++++-------------------------------------------------
 5 files changed, 23 insertions(+), 66 deletions(-)

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 4287e55..987da7a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,10 +2,16 @@ Source: gerbv
 Section: electronics
 Priority: optional
 Maintainer: Debian Electronics Team <pkg-electronics-devel at lists.alioth.debian.org>
-Uploaders: Hamish Moffatt <hamish at debian.org>, Ramakrishnan Muthukrishnan <rkrishnan at debian.org>, Gudjon I. Gudjonsson <gudjon at gudjon.org>
+Uploaders: Hamish Moffatt <hamish at debian.org>,
+           Ramakrishnan Muthukrishnan <rkrishnan at debian.org>,
+           Gudjon I. Gudjonsson <gudjon at gudjon.org>
 Standards-Version: 3.9.3
-Build-Depends: debhelper (>= 8), libgtk2.0-dev, libglib2.0-dev, libpng-dev, libcairo2-dev, autotools-dev
-Homepage: http://gerbv.geda-project.org/
+Build-Depends: autotools-dev,
+               debhelper (>= 9),
+               libcairo2-dev,
+               libglib2.0-dev,
+               libgtk2.0-dev,
+               libpng-dev
 Vcs-Git: git://git.debian.org/pkg-electronics/gerbv.git
 Vcs-Browser: http://git.debian.org/?p=pkg-electronics/gerbv.git
 
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 0000000..f2fec23
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1,2 @@
+AUTHORS
+doc/*.txt
diff --git a/debian/examples b/debian/examples
new file mode 100644
index 0000000..0bbe99e
--- /dev/null
+++ b/debian/examples
@@ -0,0 +1 @@
+example/*
diff --git a/debian/rules b/debian/rules
index aae6737..2811462 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,69 +1,17 @@
 #!/usr/bin/make -f
 
-export LDFLAGS=-ldl
+%:
+	dh $@ --with autotools_dev
 
-config.status: configure
-	dh_testdir
+override_dh_auto_configure:
+	dh_auto_configure -- --enable-exportpng --disable-update-desktop-database LDFLAGS="$(LDFLAGS) -ldl"
 
-	# Add here commands to configure the package.
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
-	./configure --prefix=/usr --enable-exportpng  --disable-update-desktop-database
+override_dh_install:
+	dh_install
+	find $(CWD)/debian/gerbv -name '*.la' -delete
 
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-build-stamp: config.status
-	dh_testdir
+override_dh_installexamples:
+	dh_installexamples -XMakefile
 
-	$(MAKE) 
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-
-	 [ ! -f Makefile ] || $(MAKE) distclean
-
-	rm -f build-stamp config.log
-	rm -f config.guess config.status config.sub
-
-	dh_clean
-
-binary-indep:   build
-	dh_testroot
-	dh_testdir
-	# There are no architecture-independent files to be uploaded
-	# generated by this package.  If there were any they would be
-	# made here.
-
-binary-arch:    build
-	dh_testroot
-	dh_testdir
-	dh_clean
-
-	dh_installdirs
-	$(MAKE) install DESTDIR=`pwd`/debian/gerbv
-	rm `find $(DESTDIR) -name '*.la'`
-	dh_icons
-	dh_installdocs AUTHORS README TODO doc/*.txt
-	dh_installexamples -XMakefile example/*
-	dh_installchangelogs ChangeLog
-	dh_installmenu
-	dh_strip
-	dh_lintian
+override_dh_compress:
 	dh_compress -X.pcb -X.grb -X.gdo -X.gbx -X.pdf -X.gap -X.apt -X.off -X.exc -X.drd -X.sst
-	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary:		binary-indep binary-arch
-.PHONY: binary binary-arch binary-indep clean checkroot

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-electronics/gerbv.git