[med-svn] r8482 - in trunk/packages/libg2/trunk/debian: . patches

Andreas Tille tille at alioth.debian.org
Tue Nov 8 20:09:30 UTC 2011 

Author: tille
Date: 2011-11-08 20:09:30 +0000 (Tue, 08 Nov 2011)
New Revision: 8482

Modified:
   trunk/packages/libg2/trunk/debian/changelog
   trunk/packages/libg2/trunk/debian/compat
   trunk/packages/libg2/trunk/debian/control
   trunk/packages/libg2/trunk/debian/patches/do_not_remove_files_from_orig_source.diff
   trunk/packages/libg2/trunk/debian/patches/series
   trunk/packages/libg2/trunk/debian/rules
Log:
Several changes which finally intend to get a more simple packaging to be prepared for future policy changes;
!!! Package does NOT build (yet - old version did not as well any more)


Modified: trunk/packages/libg2/trunk/debian/changelog
===================================================================
--- trunk/packages/libg2/trunk/debian/changelog	2011-11-08 19:53:16 UTC (rev 8481)
+++ trunk/packages/libg2/trunk/debian/changelog	2011-11-08 20:09:30 UTC (rev 8482)
@@ -1,3 +1,19 @@
+g2 (0.72-3) UNRELEASED; urgency=low
+
+TODO
+  * Fix FTBFS
+  --> try to reduce complexity of debian/rules but not finished yet
+
+  * debian/control:
+    - Standards-Version: 3.9.2 (no changes needed)
+    - Fixed Vcs fields
+  * Debhelper 8 (control+compat)
+  * debian/patches/series: drop patch stabelise_makefile.diff because
+    it seems to originate from improper use of autotools-dev which is
+    void now after using dh.
+
+ -- Andreas Tille <tille at debian.org>  Fri, 04 Nov 2011 22:30:26 +0100
+
 g2 (0.72-2) unstable; urgency=low
 
   * Took over package in Debian Med team maintenance

Modified: trunk/packages/libg2/trunk/debian/compat
===================================================================
--- trunk/packages/libg2/trunk/debian/compat	2011-11-08 19:53:16 UTC (rev 8481)
+++ trunk/packages/libg2/trunk/debian/compat	2011-11-08 20:09:30 UTC (rev 8482)
@@ -1 +1 @@
-7
+8

Modified: trunk/packages/libg2/trunk/debian/control
===================================================================
--- trunk/packages/libg2/trunk/debian/control	2011-11-08 19:53:16 UTC (rev 8481)
+++ trunk/packages/libg2/trunk/debian/control	2011-11-08 20:09:30 UTC (rev 8482)
@@ -3,12 +3,12 @@
 Maintainer:  Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 DM-Upload-Allowed: yes
 Uploaders: Andreas Tille <tille at debian.org>
-Build-Depends: debhelper (>= 7), quilt, autotools-dev, autoconf, libtool, libx11-dev, chrpath,
+Build-Depends: debhelper (>= 8), quilt, autotools-dev, autoconf, libtool, libx11-dev, chrpath,
  libgd2-noxpm-dev | libgd2-xpm-dev | libgd2-dev | libgd-dev (>> 1.6.1), xutils-dev
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Section: libs
-Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/libg2/trunk
-Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/libg2/trunk/?rev=0&sc=0
+Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/libg2/trunk
+Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/libg2/trunk/
 Homepage: http://g2.sourceforge.net/
 
 Package: libg2-dev

Modified: trunk/packages/libg2/trunk/debian/patches/do_not_remove_files_from_orig_source.diff
===================================================================
--- trunk/packages/libg2/trunk/debian/patches/do_not_remove_files_from_orig_source.diff	2011-11-08 19:53:16 UTC (rev 8481)
+++ trunk/packages/libg2/trunk/debian/patches/do_not_remove_files_from_orig_source.diff	2011-11-08 20:09:30 UTC (rev 8482)
@@ -27,3 +27,14 @@
  
  demo:	libg2.a
  	(cd ./demo ; make)
+--- g2-0.72.orig/Makefile
++++ g2-0.72/Makefile
+@@ -134,7 +134,7 @@
+ 	-rm -f ./libg2.so.0.$(G2_VERSION)
+ 	-rm -f libg2.$(G2_VERSION).a
+ 	-rm -f a.out
+-	-rm -fr doc/html/ doc/latex/ doc/g2_refman.ps doc/g2_refman.pdf
++	-rm -fr doc/latex/ doc/g2_refman.ps doc/g2_refman.pdf
+ 
+ demo:	libg2.a
+ 	(cd ./demo ; make)

Modified: trunk/packages/libg2/trunk/debian/patches/series
===================================================================
--- trunk/packages/libg2/trunk/debian/patches/series	2011-11-08 19:53:16 UTC (rev 8481)
+++ trunk/packages/libg2/trunk/debian/patches/series	2011-11-08 20:09:30 UTC (rev 8482)
@@ -4,4 +4,3 @@
 do_not_remove_files_from_orig_source.diff
 fix_pod2man_errors.diff
 fix_linker_libs.diff
-stabelise_makefile.diff

Modified: trunk/packages/libg2/trunk/debian/rules
===================================================================
--- trunk/packages/libg2/trunk/debian/rules	2011-11-08 19:53:16 UTC (rev 8481)
+++ trunk/packages/libg2/trunk/debian/rules	2011-11-08 20:09:30 UTC (rev 8482)
@@ -1,25 +1,23 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 # debian/rules for libg2
-# Author: Eric Cain
+# Author: Andreas Tille <tille at debian.org>
 
 # 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)
+%:
+	dh $@ --with autotools-dev
 
+override_dh_auto_build:
+	dh_auto_build
+	(cd ./g2_perl && perl Makefile.PL INSTALLDIRS=vendor LIBS="-L$(CURDIR)/g2_perl/.. -lg2")
+	$(MAKE) -C ./g2_perl
 
-CFLAGS = -Wall -g
+# Compile with -fPIC on all platforms
+#override_dh_auto_configure:
+#        dh_auto_configure -- CFLAGS="$(dpkg-buildflags --get CFLAGS) -fPIC" FFLAGS="$(dpkg-buildflags --get FFLAGS) -fPIC"
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
 # Use the latest version number in the CHANGES file 
 version=`head -n 1 CHANGES | \
  awk '{if (match($$0,/^[0-9]+\.[0-9]+[A-Za-z]/)) print substr($$0,RSTART,RLENGTH)}'`
@@ -28,24 +26,7 @@
 major=`head -n 1 CHANGES | \
  awk '{if (match($$0,/^[0-9]+/)) print substr($$0,RSTART,RLENGTH)}'`
 
-
-config.status:
-	dh_testdir
-
-	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
-
-	dh_autotools-dev_updateconfig
-	# do also save configure which is changed here to be able to restore it afterwards in the clean target
-	cp -a configure configure.dh-orig
-	libtoolize -f -c
-	autoconf
-	CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
-
-
-build: build-stamp
-build-stamp:  config.status
-	dh_testdir
-	# compile the package.
+override_dh_auto_build:
 	$(MAKE) depend
 	$(MAKE) libg2.a RVERSION=$(rversion) MVERSION=$(major)
 	# clean up and build the shared lib
@@ -54,79 +35,10 @@
 	(cd ./g2_perl && perl Makefile.PL INSTALLDIRS=vendor LIBS="-L$(CURIDR)/g2_perl/.. -lg2")
 	$(MAKE) -C ./g2_perl
 
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-
-	# clean up after the build process.
-	[ ! -f Makefile ] || $(MAKE) RVERSION=$(rversion) MVERSION=$(major) clean
-
-	if [ -f Makefile.bak ] ;      then mv Makefile.bak Makefile ; fi
-	if [ -f configure.dh-orig ] ; then mv configure.dh-orig configure ; fi
-	dh_autotools-dev_restoreconfig
-	dh_clean
-	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
-	rm -f ltmain.sh
-	rm -rf .pc
-
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-
-	# install the package into debian/tmp
+override_dh_auto_install:
 	$(MAKE) RVERSION=$(rversion) MVERSION=$(major) install prefix=$(CURDIR)/debian/libg2-dev
 	$(MAKE) -C ./g2_perl install DESTDIR=$(CURDIR)/debian/libg2$(major)-perl
-
-	mkdir -p debian/tmp/usr/lib
-
-	mv debian/libg2-dev/usr/lib/libg2.so.$(rversion) debian/tmp/usr/lib/libg2.so.$(rversion)
-	mv debian/libg2-dev/usr/lib/libg2.so.$(major) debian/tmp/usr/lib/libg2.so.$(major)
-	ln -s libg2.so.$(rversion) debian/tmp/usr/lib/libg2.so
-
-
-# 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
-	
-	# build libg2${major} package by moving files from tmp
-	dh_movefiles -plibg2$(major) \
-	usr/lib/libg2.so.$(major)         \
-	usr/lib/libg2.so.$(rversion)
-	
-	dh_movefiles -plibg2-dev \
-	usr/lib/libg2.so
-	
-	install -m 755 -d debian/libg2$(major)-perl/usr/share/perl5/
-	
-	mv debian/libg2$(major)-perl/usr/lib/perl5/*.pm debian/libg2$(major)-perl/usr/share/perl5/
-
-	chrpath --delete $(CURDIR)/debian/libg20-perl/usr/lib/perl5/auto/G2/G2.so	
-
-	dh_installchangelogs CHANGES
-	dh_installdocs
-	dh_installexamples
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_perl
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+	#mkdir -p debian/tmp/usr/lib
+	#mv debian/libg2-dev/usr/lib/libg2.so.$(rversion) debian/tmp/usr/lib/libg2.so.$(rversion)
+	#mv debian/libg2-dev/usr/lib/libg2.so.$(major) debian/tmp/usr/lib/libg2.so.$(major)
+	#ln -s libg2.so.$(rversion) debian/tmp/usr/lib/libg2.so

More information about the debian-med-commit mailing list