[Pkg-electronics-commits] [SCM] Packaging for Gerbv branch, master, updated. debian/2.4.0-1-7-g4fcff2c

[Gudjon I. Gudjonsson]

The following commit has been merged in the master branch:
commit 4fcff2cad55d0f92cdb26ec4bae460a7cbee7842
Author: Gudjon I. Gudjonsson <gudjon at gudjon.org>
Date:   Sat Jun 18 10:12:37 2011 +0200

    Gerbv version 2.5 is ready for upload.
    	modified:   debian/changelog
    	modified:   debian/control
    	deleted:    debian/patches/03_fix_ftbfs_binutils-gold.diff
    	modified:   debian/patches/series
    	modified:   debian/rules

diff --git a/debian/changelog b/debian/changelog
index 44c3a12..1078929 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,21 @@
-gerbv (2.5.0-1) unstable; urgency=low
+gerbv (2.5-1) unstable; urgency=low
 
   * New upstream release
-  * Bump standards version to 3.9.1
+  * Bump standards version to 3.9.2
   * Add git and homepage fields to control file
   * Switch to dpkg-source 3.0 (quilt) format
   * Rewrote both patches in quilt format
-  * Add patch 03_fix_ftbfs_binutils-gold.diff (Closes: #554484)
+  * Change debhelper dependency to 8
 
- -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Tue, 01 Feb 2011 09:48:32 +0100
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Sat, 18 Jun 2011 10:07:14 +0200
+
+gerbv (2.4.0-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Set LDFLAGS to -ldl (Closes: #554484).
+  * Don't ship .la files (Closes: #621154).
+
+ -- Luk Claes <luk at debian.org>  Sat, 11 Jun 2011 12:17:52 +0200
 
 gerbv (2.4.0-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 00bcf29..e608f4b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: electronics
 Priority: optional
 Maintainer: Debian Electronics Team <pkg-electronics-devel at lists.alioth.debian.org>
 Uploaders: Hamish Moffatt <hamish at debian.org>, Wesley J. Landaker <wjl at icecavern.net>, Ramakrishnan Muthukrishnan <rkrishnan at debian.org>, Gudjon I. Gudjonsson <gudjon at gudjon.org>
-Standards-Version: 3.9.1
-Build-Depends: debhelper (>= 7), libgtk2.0-dev, libglib2.0-dev, libpng12-dev, libcairo2-dev, autotools-dev
+Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 8), libgtk2.0-dev, libglib2.0-dev, libpng12-dev, libcairo2-dev, autotools-dev
 Homepage: http://gerbv.gpleda.org/
 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/patches/03_fix_ftbfs_binutils-gold.diff b/debian/patches/03_fix_ftbfs_binutils-gold.diff
deleted file mode 100644
index a68dbc9..0000000
--- a/debian/patches/03_fix_ftbfs_binutils-gold.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-Fixes build with binutils-gold. Patch is based on 
-Mahyuddin Susanto <udienz at gmail.com> Ubuntu patch
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -89,7 +89,7 @@
- 		interface.h render.c render.h \
- 		icons.h
- 
--gerbv_LDADD = libgerbv.la
-+gerbv_LDADD = libgerbv.la -ldl
- gerbv_DEPENDENCIES = libgerbv.la
- 
- # If we are building on win32, then compile in some icons for the
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -284,7 +284,7 @@
- 		interface.h render.c render.h \
- 		icons.h
- 
--gerbv_LDADD = libgerbv.la $(am__append_1)
-+gerbv_LDADD = libgerbv.la $(am__append_1) -ldl
- gerbv_DEPENDENCIES = libgerbv.la $(am__append_2)
- TXT2CL = sed -e 's;%;%%;g' -e 's;\\;\\\\;g' -e 's;";\\";g' -e 's;^;";g' -e 's;$$;",;g'
- CLEANFILES = authors.c bugs.c
diff --git a/debian/patches/series b/debian/patches/series
index c36cfec..7a9bfed 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 01_desktop_file.diff
 02_fix_manpage.diff
-03_fix_ftbfs_binutils-gold.diff
diff --git a/debian/rules b/debian/rules
index a24541e..9f08fa5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,10 @@
 #!/usr/bin/make -f
 
-config.status: configure
+include /usr/share/dpatch/dpatch.make
+
+export LDFLAGS=-ldl
+
+config.status: patch configure
 	dh_testdir
 
 	# Add here commands to configure the package.
@@ -19,7 +23,7 @@ build-stamp: config.status
 	$(MAKE) 
 	touch $@
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 
@@ -44,7 +48,7 @@ binary-arch:    build
 
 	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/*

-- 
Packaging for Gerbv