[med-svn] r14223 - trunk/packages/xmedcon/trunk/debian

Wed Jul 24 15:07:53 UTC 2013

Author: tille
Date: 2013-07-24 15:07:53 +0000 (Wed, 24 Jul 2013)
New Revision: 14223

Modified:
   trunk/packages/xmedcon/trunk/debian/changelog
   trunk/packages/xmedcon/trunk/debian/control
   trunk/packages/xmedcon/trunk/debian/libmdc2-dev.install
   trunk/packages/xmedcon/trunk/debian/libmdc2.install
   trunk/packages/xmedcon/trunk/debian/rules
   trunk/packages/xmedcon/trunk/debian/xmedcon.dirs
Log:
First very naive shot at new upstream version - see FIXME in changelog


Modified: trunk/packages/xmedcon/trunk/debian/changelog
===================================================================

--- trunk/packages/xmedcon/trunk/debian/changelog	2013-07-24 08:52:30 UTC (rev 14222)
+++ trunk/packages/xmedcon/trunk/debian/changelog	2013-07-24 15:07:53 UTC (rev 14223)
@@ -1,6 +1,12 @@
-xmedcon (0.10.7-2) UNRELEASED; urgency=low
+xmedcon (0.13.0-1) UNRELEASED; urgency=low
 
-  * Team upload.
+  * FIXME:
+     - currently just make sure that package builds somehow with dh
+     - needs checking the result
+     - needs patching to use Debian packaged libs
+     - needs testing
+  * New upstream version
+    Closes: #704438
   * debian/control:
      - Add Vcs fields
      - Add Homepage field

Modified: trunk/packages/xmedcon/trunk/debian/control
===================================================================
--- trunk/packages/xmedcon/trunk/debian/control	2013-07-24 08:52:30 UTC (rev 14222)
+++ trunk/packages/xmedcon/trunk/debian/control	2013-07-24 15:07:53 UTC (rev 14223)
@@ -8,7 +8,9 @@
                libgtk2.0-dev,
                zlib1g-dev,
                libpng-dev,
-               libnifti-dev
+               libnifti-dev,
+               autotools-dev,
+               dh-autoreconf
 Standards-Version: 3.9.4
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/xmedcon/trunk/
 Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/xmedcon/trunk/

Modified: trunk/packages/xmedcon/trunk/debian/libmdc2-dev.install
===================================================================
--- trunk/packages/xmedcon/trunk/debian/libmdc2-dev.install	2013-07-24 08:52:30 UTC (rev 14222)
+++ trunk/packages/xmedcon/trunk/debian/libmdc2-dev.install	2013-07-24 15:07:53 UTC (rev 14223)
@@ -1,6 +1,6 @@
-debian/tmp/usr/lib/*.a
-debian/tmp/usr/lib/*.la
-debian/tmp/usr/lib/*.so
+debian/tmp/usr/lib/*/*.a
+debian/tmp/usr/lib/*/*.la
+debian/tmp/usr/lib/*/*.so
 debian/tmp/usr/include
 debian/tmp/usr/share/man/man1/xmedcon-config.1
 debian/tmp/usr/share/man/man3

Modified: trunk/packages/xmedcon/trunk/debian/libmdc2.install
===================================================================
--- trunk/packages/xmedcon/trunk/debian/libmdc2.install	2013-07-24 08:52:30 UTC (rev 14222)
+++ trunk/packages/xmedcon/trunk/debian/libmdc2.install	2013-07-24 15:07:53 UTC (rev 14223)
@@ -1 +1 @@
-debian/tmp/usr/lib/libmdc.so.*
+debian/tmp/usr/lib/*/libmdc.so.*

Modified: trunk/packages/xmedcon/trunk/debian/rules
===================================================================
--- trunk/packages/xmedcon/trunk/debian/rules	2013-07-24 08:52:30 UTC (rev 14222)
+++ trunk/packages/xmedcon/trunk/debian/rules	2013-07-24 15:07:53 UTC (rev 14223)
@@ -1,109 +1,15 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+# -*- makefile -*-
+# debian/rules file for xmedcon
+# Andreas Tille <tille at debian.org>
+# GPL
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+	dh $@ --with autoreconf
 
-# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
-# stolen from gsm-lib debian source
-mdc_version=`ls source/.libs/libmdc*.so.* | \
- awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-mdc_major=`ls source/.libs/libmdc*.so.* | \
- awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
-
-# 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)
-
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -g
-endif
-
-ifneq (,$(filter $(DEB_HOST_GNU_TYPE),mips-linux-gnu mipsel-linux-gnu))
-	# Work-around for bug #519006
-	CFLAGS += -g0
-endif
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	# Add here commands to configure the package.
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=\$${prefix}/../etc --enable-nifti --with-nifti-prefix=/usr
-
-	touch configure-stamp
-
-build: build-stamp
-
-build-stamp: configure-stamp 
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE)
-	#/usr/bin/docbook-to-man debian/xmedcon.sgml > xmedcon.1
-
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	# Add here commands to clean up after the build process.
-	[ ! -f Makefile ] || $(MAKE) distclean
-	-test -r /usr/share/misc/config.sub && \
-	  cp -f /usr/share/misc/config.sub config.sub
-	-test -r /usr/share/misc/config.guess && \
-	  cp -f /usr/share/misc/config.guess config.guess
-
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	# Add here commands to install the package into debian/xmedcon.
-	$(MAKE) install prefix=$(CURDIR)/debian/tmp/usr
-	cp -a debian/xmedcon.xpm \
-	 $(CURDIR)/debian/xmedcon/usr/share/pixmaps/
+override_dh_auto_install:
+	dh_auto_install
+	cp -a debian/xmedcon.xpm $(CURDIR)/debian/xmedcon/usr/share/pixmaps/
 	-test -r $(CURDIR)/debian/tmp/etc/xmedcon.png && \
-	 cp -f $(CURDIR)/debian/tmp/etc/xmedcon.png \
-	 $(CURDIR)/debian/xmedcon/usr/share/icons/hicolor/48x48/apps/
-  
-# 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
-	# divide packages
-	dh_install
-
-	dh_installdocs
-	#not installed by upstream any more I'll remove the line next version if this hold
-	#dh_installexamples -pxmedcon debian/tmp/etc/xmedconrc.linux
-	dh_installmenu -pxmedcon
-	dh_installmime -pxmedcon
-	dh_installman
-	dh_installchangelogs
-	dh_icons
-	#dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs -V
-	dh_installdeb
-	## For debhelper 4.1.*
-	## dh_shlibdeps  -L libmdc -l debian/libmdc2/usr/lib
-	dh_shlibdeps -l debian/libmdc2/usr/lib
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+		cp -f $(CURDIR)/debian/tmp/etc/xmedcon.png \
+		$(CURDIR)/debian/xmedcon/usr/share/icons/hicolor/48x48/apps/

Modified: trunk/packages/xmedcon/trunk/debian/xmedcon.dirs
===================================================================
--- trunk/packages/xmedcon/trunk/debian/xmedcon.dirs	2013-07-24 08:52:30 UTC (rev 14222)
+++ trunk/packages/xmedcon/trunk/debian/xmedcon.dirs	2013-07-24 15:07:53 UTC (rev 14223)
@@ -1 +1,2 @@
 usr/share/pixmaps
+usr/share/icons/hicolor/48x48/apps


