Author: tille
Date: 2012-01-09 21:07:34 +0000 (Mon, 09 Jan 2012)
New Revision: 9227
Added:
trunk/packages/amide/trunk/debian/install
Removed:
trunk/packages/amide/trunk/debian/README.source
trunk/packages/amide/trunk/debian/autogen.sh
trunk/packages/amide/trunk/debian/deletable.files
Modified:
trunk/packages/amide/trunk/debian/changelog
trunk/packages/amide/trunk/debian/control
trunk/packages/amide/trunk/debian/rules
Log:
New upstream version, simplified packaging
Deleted: trunk/packages/amide/trunk/debian/README.source
===================================================================
--- trunk/packages/amide/trunk/debian/README.source 2012-01-09 20:53:49 UTC
(rev 9226)
+++ trunk/packages/amide/trunk/debian/README.source 2012-01-09 21:07:34 UTC
(rev 9227)
@@ -1,3 +0,0 @@
-Please read
-/usr/share/doc/quilt/README.source
-for more information.
Deleted: trunk/packages/amide/trunk/debian/autogen.sh
===================================================================
--- trunk/packages/amide/trunk/debian/autogen.sh 2012-01-09 20:53:49 UTC
(rev 9226)
+++ trunk/packages/amide/trunk/debian/autogen.sh 2012-01-09 21:07:34 UTC
(rev 9227)
@@ -1,72 +0,0 @@
-#!/bin/sh
-#
-#
-#
-# Requires: automake 1.9, autoconf 2.57+
-# Conflicts: autoconf 2.13
-set -e
-
-# Refresh GNU autotools toolchain.
-echo Cleaning autotools files...
-find -type d -name autom4te.cache -print0 | xargs -0 rm -rf \;
-find -type f \( -name missing -o -name install-sh -o -name mkinstalldirs \
- -o -name depcomp -o -name ltmain.sh -o -name configure \
- -o -name config.sub -o -name config.guess \
- -o -name Makefile.in \) -print0 | xargs -0 rm -f
-
-echo Running autoreconf...
-#autoreconf --force --install
-
-
- # Add here commands to configure the package.
- intltoolize --copy --force --automake
- aclocal -I m4
- libtoolize -f -c
- automake -f -a -c
- autoconf -f
- # rm -rf autom4te.cache
-
-
-# For the Debian package build
-test -d debian && {
- # link these in Debian builds
- rm -f config.sub config.guess
- ln -s /usr/share/misc/config.sub .
- ln -s /usr/share/misc/config.guess .
-
- # refresh list of executable scripts, to avoid possible breakage if
- # upstream tarball does not include the file or if it is mispackaged
- # for whatever reason.
- [ "$1" == "updateexec" ] && {
- echo Generating list of executable files...
- rm -f debian/executable.files
- find -type f -perm +111 ! -name '.*' -fprint
debian/executable.files
- }
-
- # Remove any files in upstream tarball that we don't have in the Debian
- # package (because diff cannot remove files)
- version=`dpkg-parsechangelog | awk '/Version:/ { print $2 }' | sed -e
's/-[^-]\+$//'`
- source=`dpkg-parsechangelog | awk '/Source:/ { print $2 }' | tr -d ' '`
- if test -r ../${source}_${version}.orig.tar.gz ; then
- echo Generating list of files that should be removed...
- rm -f debian/deletable.files
- touch debian/deletable.files
- [ -e debian/tmp ] && rm -rf debian/tmp
- mkdir debian/tmp
- ( cd debian/tmp ; tar -zxf
../../../${source}_${version}.orig.tar.gz )
- find debian/tmp/ -type f ! -name '.*' -print0 | xargs -0 -ri
echo '{}' | \
- while read -r i ; do
- if test -e "${i}" ; then
- filename=$(echo "${i}" | sed -e
's#.*debian/tmp/[^/]\+/##')
- test -e "${filename}" || echo "${filename}"
>>debian/deletable.files
- fi
- done
- rm -fr debian/tmp
- else
- echo Emptying list of files that should be deleted...
- rm -f debian/deletable.files
- touch debian/deletable.files
- fi
-}
-
-exit 0
Modified: trunk/packages/amide/trunk/debian/changelog
===================================================================
--- trunk/packages/amide/trunk/debian/changelog 2012-01-09 20:53:49 UTC (rev
9226)
+++ trunk/packages/amide/trunk/debian/changelog 2012-01-09 21:07:34 UTC (rev
9227)
@@ -1,3 +1,23 @@
+amide (1.0.1-1) unstable; urgency=low
+
+ * debian/README.source: removed because it is redundant
+ * debian/control:
+ - Fixed Vcs-Svn
+ - Removed quilt from Build-Depends
+ * debian/install: Make use of dh_install
+ * debian/rules:
+ - Remove unknown option --enable-rpm-install from configure
+ arguments
+ - rewritten to make use of
+ dh --with autotools_dev
+ * debian/deletable.files: Removed. There is no need to hack
+ around broken upstream tarballs. Upstream contains some *.bak
+ files which are cleaned up in upstream clean target
+ * debian/autogen.sh:
+ Not needed when properly using autotools-dev
+
+ -- Andreas Tille <[email protected]> Mon, 09 Jan 2012 13:28:04 +0100
+
amide (1.0.0-1) unstable; urgency=low
* New upstream release
Modified: trunk/packages/amide/trunk/debian/control
===================================================================
--- trunk/packages/amide/trunk/debian/control 2012-01-09 20:53:49 UTC (rev
9226)
+++ trunk/packages/amide/trunk/debian/control 2012-01-09 21:07:34 UTC (rev
9227)
@@ -5,13 +5,13 @@
Uploaders: Dominique Belhachemi <[email protected]>, Andreas Tille
<[email protected]>
DM-Upload-Allowed: yes
Build-Depends: gnome-doc-utils, gtk-doc-tools, libtool, automake, intltool,
- quilt, debhelper (>= 8), autotools-dev, scrollkeeper, libxml-parser-perl, m4,
+ debhelper (>= 8), autotools-dev, scrollkeeper, libxml-parser-perl, m4,
pkg-config, libgtk2.0-dev, libxml2-dev, libgnomecanvas2-dev,
libgnomeui-dev, libgsl0-dev, libmdc2-dev, libdcmtk2-dev, libvolpack1-dev,
libavcodec-dev, libavformat-dev
Standards-Version: 3.9.2
Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/amide/trunk/
-Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/amide/trunk/
+Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/amide/trunk/
Homepage: http://amide.sourceforge.net/
Package: amide
Deleted: trunk/packages/amide/trunk/debian/deletable.files
===================================================================
--- trunk/packages/amide/trunk/debian/deletable.files 2012-01-09 20:53:49 UTC
(rev 9226)
+++ trunk/packages/amide/trunk/debian/deletable.files 2012-01-09 21:07:34 UTC
(rev 9227)
@@ -1,77 +0,0 @@
-mkinstalldirs
-pixmaps/compartmental_models.fig.bak
-pixmaps/icons.fig.bak
-doc/reference/tmpl/amitk_progress_dialog.sgml.bak
-doc/reference/tmpl/amitk_roi_ISOCONTOUR_2D.sgml.bak
-doc/reference/tmpl/amitk_object_dialog.sgml.bak
-doc/reference/tmpl/amitk_canvas_object.sgml.bak
-doc/reference/tmpl/amitk_raw_data_FLOAT.sgml.bak
-doc/reference/tmpl/amitk_tree_view.sgml.bak
-doc/reference/tmpl/amitk_common.sgml.bak
-doc/reference/tmpl/amitk_space.sgml.bak
-doc/reference/tmpl/amitk_color_table_menu.sgml.bak
-doc/reference/tmpl/amitk_raw_data_variable_type.sgml.bak
-doc/reference/tmpl/amitk_data_set_SBYTE_1D_SCALING.sgml.bak
-doc/reference/tmpl/tb_math.sgml.bak
-doc/reference/tmpl/amitk_data_set_UINT_1D_SCALING.sgml.bak
-doc/reference/tmpl/amide.sgml.bak
-doc/reference/tmpl/amitk_roi_FREEHAND_3D.sgml.bak
-doc/reference/tmpl/amitk_data_set_USHORT_1D_SCALING.sgml.bak
-doc/reference/tmpl/amitk_data_set_variable_type.sgml.bak
-doc/reference/tmpl/amitk_roi_BOX.sgml.bak
-doc/reference/tmpl/amitk_color_table.sgml.bak
-doc/reference/tmpl/amitk_data_set_UINT_2D_SCALING.sgml.bak
-doc/reference/tmpl/amitk_line_profile.sgml.bak
-doc/reference/tmpl/amitk_data_set_USHORT_0D_SCALING.sgml.bak
-doc/reference/tmpl/amitk_data_set_DOUBLE_1D_SCALING.sgml.bak
-doc/reference/tmpl/amitk_data_set_DOUBLE_2D_SCALING.sgml.bak
-doc/reference/tmpl/amitk_roi.sgml.bak
-doc/reference/tmpl/amitk_roi_ELLIPSOID.sgml.bak
-doc/reference/tmpl/tb_export_data_set.sgml.bak
-doc/reference/tmpl/amitk_data_set_SSHORT_1D_SCALING.sgml.bak
-doc/reference/tmpl/amitk_roi_CYLINDER.sgml.bak
-doc/reference/tmpl/amitk_data_set_FLOAT_0D_SCALING.sgml.bak
-doc/reference/tmpl/amitk_raw_data_UINT.sgml.bak
-doc/reference/tmpl/amitk_data_set_UBYTE_0D_SCALING.sgml.bak
-doc/reference/tmpl/amitk_raw_data_SSHORT.sgml.bak
-doc/reference/tmpl/amitk_raw_data_DOUBLE.sgml.bak
-doc/reference/tmpl/amitk_data_set_SINT_0D_SCALING.sgml.bak
-doc/reference/tmpl/amitk_window_edit.sgml.bak
-doc/reference/tmpl/amitk_fiducial_mark.sgml.bak
-doc/reference/tmpl/amitk_study.sgml.bak
-doc/reference/tmpl/amitk_raw_data.sgml.bak
-doc/reference/tmpl/amitk_data_set_SSHORT_2D_SCALING.sgml.bak
-doc/reference/tmpl/amitk_data_set_SBYTE_0D_SCALING.sgml.bak
-doc/reference/tmpl/amitk_point.sgml.bak
-doc/reference/tmpl/amitk-unused.sgml.bak
-doc/reference/tmpl/amitk_raw_data_UBYTE.sgml.bak
-doc/reference/tmpl/amitk_raw_data_SBYTE.sgml.bak
-doc/reference/tmpl/stamp-amitk_type_builtins.sgml.bak
-doc/reference/tmpl/amitk_threshold.sgml.bak
-doc/reference/tmpl/amitk_roi_ISOCONTOUR_3D.sgml.bak
-doc/reference/tmpl/amitk_roi_FREEHAND_2D.sgml.bak
-doc/reference/tmpl/amitk_volume.sgml.bak
-doc/reference/tmpl/amitk_preferences.sgml.bak
-doc/reference/tmpl/amitk_data_set_SSHORT_0D_SCALING.sgml.bak
-doc/reference/tmpl/amitk_space_edit.sgml.bak
-doc/reference/tmpl/amitk_data_set_SINT_1D_SCALING.sgml.bak
-doc/reference/tmpl/amitk_raw_data_USHORT.sgml.bak
-doc/reference/tmpl/amitk_data_set_SINT_2D_SCALING.sgml.bak
-doc/reference/tmpl/amitk_data_set_UBYTE_1D_SCALING.sgml.bak
-doc/reference/tmpl/amitk_data_set_UBYTE_2D_SCALING.sgml.bak
-doc/reference/tmpl/amitk_data_set_DOUBLE_0D_SCALING.sgml.bak
-doc/reference/tmpl/amitk_data_set_FLOAT_2D_SCALING.sgml.bak
-doc/reference/tmpl/amitk_object.sgml.bak
-doc/reference/tmpl/amitk_data_set_SBYTE_2D_SCALING.sgml.bak
-doc/reference/tmpl/amitk_type_builtins.sgml.bak
-doc/reference/tmpl/amitk_data_set.sgml.bak
-doc/reference/tmpl/amitk_roi_variable_type.sgml.bak
-doc/reference/tmpl/amitk_marshal.sgml.bak
-doc/reference/tmpl/amide_gnome.sgml.bak
-doc/reference/tmpl/amitk_data_set_UINT_0D_SCALING.sgml.bak
-doc/reference/tmpl/amitk_filter.sgml.bak
-doc/reference/tmpl/amitk_canvas.sgml.bak
-doc/reference/tmpl/amitk_raw_data_SINT.sgml.bak
-doc/reference/tmpl/amitk_data_set_FLOAT_1D_SCALING.sgml.bak
-doc/reference/tmpl/amitk_type.sgml.bak
-doc/reference/tmpl/amitk_data_set_USHORT_2D_SCALING.sgml.bak
Added: trunk/packages/amide/trunk/debian/install
===================================================================
--- trunk/packages/amide/trunk/debian/install (rev 0)
+++ trunk/packages/amide/trunk/debian/install 2012-01-09 21:07:34 UTC (rev
9227)
@@ -0,0 +1 @@
+debian/amide_logo_small.xpm usr/share/pixmaps/
Modified: trunk/packages/amide/trunk/debian/rules
===================================================================
--- trunk/packages/amide/trunk/debian/rules 2012-01-09 20:53:49 UTC (rev
9226)
+++ trunk/packages/amide/trunk/debian/rules 2012-01-09 21:07:34 UTC (rev
9227)
@@ -1,59 +1,19 @@
#!/usr/bin/make -f
-PACKAGE=amide
+%:
+ dh $@ --with autotools_dev
-# quilt
-DEB_SOURCE_PACKAGE:=$(PACKAGE)
-include /usr/share/quilt/quilt.make
-
-
-# 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)
-
-
-# FOR AUTOCONF 2.52 AND NEWER ONLY
-CONFFLAGS =
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
- CONFFLAGS += --build $(DEB_HOST_GNU_TYPE)
-else
- CONFFLAGS += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-endif
-
-CFLAGS:= -Wall -pipe
-CXXFLAGS:= -Wall -pipe
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
- CXXFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-
-get-orig-source:
- uscan --verbose --force-download
-
-configure: configure-stamp
-configure-stamp: $(QUILT_STAMPFN)
- dh_testdir
-
- chmod +x debian/autogen.sh
- debian/autogen.sh
-
- ln -sf /usr/share/misc/config.sub .
- ln -sf /usr/share/misc/config.guess .
- rm -f config.cache
-
- ./configure CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
- $(CONFFLAGS) \
+override_dh_auto_configure:
+ ## autoreconf --force --install ## this fails because there is no way
to specify search path of m4 files for aclocal
+ intltoolize --copy --force --automake
+ aclocal -I m4 # specify where to seek for m4 files
+ libtoolize -f -c
+ automake -f -a -c
+ autoconf -f
+ dh_auto_configure -- \
--disable-amide-debug \
--config-cache \
--disable-dependency-tracking \
- --enable-rpm-install \
--prefix=/usr \
--localstatedir=/var/lib/amide \
--mandir=\$${prefix}/share/man \
@@ -61,83 +21,13 @@
--localstatedir=/var/lib/amide \
LDFLAGS="-Wl,-z,defs"
- touch $@
+override_dh_auto_install:
+ dh_auto_install
+ #rm -rf debian/amide/var
+override_dh_auto_test:
+ echo "Do not run autotest"
-build: build-arch
+get-orig-source:
+ uscan --verbose --force-download
-build-arch: build-arch-stamp
-
-build-arch-stamp: configure
- dh_testdir
-
- $(MAKE)
-
- touch $@
-
-
-clean: clean-patched unpatch
-
-clean-patched:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
-
- [ ! -f Makefile ] || $(MAKE) clean
- [ ! -f Makefile ] || $(MAKE) distclean
-
-
- find \( -name config.sub -o -name config.guess \) -print0 | xargs -0 -r
rm -f \;
- find -name Makefile.in | xargs rm -f
- - rm configure ltmain.sh aclocal.m4 m4/intltool.m4 m4/libtool.m4
po/Makefile.in.in
- - rm config.log intltool-merge.in intltool-extract.in intltool-update.in
-
- # Fix permissions
- if [ -r debian/executable.files ] ; then \
- find -type d -print0 | xargs -0 -r chmod 755 ;\
- find -type f ! -name 'rules' -print0 | xargs -0 -r chmod 644 ;\
- xargs -t -r chmod +x < debian/executable.files ;\
- fi
-
- # Final static cleanups
- if [ -r debian/deletable.files ] ; then \
- xargs -t -r rm -f < debian/deletable.files ;\
- fi
-
-
- dh_clean
-
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean
- dh_prep
- dh_installdirs
-
- $(MAKE) DESTDIR=$(CURDIR)/debian/amide install
- install -d debian/amide/usr/share/pixmaps
- cp debian/amide_logo_small.xpm
debian/amide/usr/share/pixmaps/amide_logo_small.xpm
- rm -rf debian/amide/var
-
-# Build architecture-dependent files here.
-binary-arch: install
- dh_testdir
- dh_testroot
- dh_installchangelogs ChangeLog
- dh_installdocs
- dh_installexamples
- dh_installman
- dh_link
- dh_installmenu
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
