[med-svn] r15141 - trunk/packages/ctn/trunk/debian
Andreas Tille
tille at alioth.debian.org
Thu Nov 7 16:51:09 UTC 2013
Author: tille
Date: 2013-11-07 16:51:09 +0000 (Thu, 07 Nov 2013)
New Revision: 15141
Added:
trunk/packages/ctn/trunk/debian/ctn-dev.install
trunk/packages/ctn/trunk/debian/ctn.examples
trunk/packages/ctn/trunk/debian/ctn.install
trunk/packages/ctn/trunk/debian/ctn.manpages
Modified:
trunk/packages/ctn/trunk/debian/changelog
trunk/packages/ctn/trunk/debian/control
trunk/packages/ctn/trunk/debian/debian.mysql.options.env
trunk/packages/ctn/trunk/debian/rules
Log:
rewritten to use dh and make things more transparent by using debian/*.{install,examples} files; package builds now properly, hardening needs to be done
Modified: trunk/packages/ctn/trunk/debian/changelog
===================================================================
--- trunk/packages/ctn/trunk/debian/changelog 2013-11-07 14:14:28 UTC (rev 15140)
+++ trunk/packages/ctn/trunk/debian/changelog 2013-11-07 16:51:09 UTC (rev 15141)
@@ -20,6 +20,8 @@
- Priority: optional
- s/lesstif2-dev/libmotif-dev/ in Build-Depends
Closes: #714750, #714758
+ * debian/rules: rewritten to use dh and make things more transparent
+ by using debian/*.{install,examples} files
-- Andreas Tille <tille at debian.org> Thu, 07 Nov 2013 14:44:28 +0100
Modified: trunk/packages/ctn/trunk/debian/control
===================================================================
--- trunk/packages/ctn/trunk/debian/control 2013-11-07 14:14:28 UTC (rev 15140)
+++ trunk/packages/ctn/trunk/debian/control 2013-11-07 16:51:09 UTC (rev 15141)
@@ -13,8 +13,7 @@
libx11-dev,
libxt-dev,
x11proto-core-dev,
- csh | c-shell,
- quilt
+ csh | c-shell
Standards-Version: 3.9.4
Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/ctn/trunk/
Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/ctn/trunk/
@@ -22,7 +21,6 @@
Package: ctn
Architecture: any
-Section: graphics
Depends: ${shlibs:Depends},
${misc:Depends}
Suggests: ctn-doc
Added: trunk/packages/ctn/trunk/debian/ctn-dev.install
===================================================================
--- trunk/packages/ctn/trunk/debian/ctn-dev.install (rev 0)
+++ trunk/packages/ctn/trunk/debian/ctn-dev.install 2013-11-07 16:51:09 UTC (rev 15141)
@@ -0,0 +1,2 @@
+include/* usr/include/ctn
+lib/*/* usr/lib/ctn
Added: trunk/packages/ctn/trunk/debian/ctn.examples
===================================================================
--- trunk/packages/ctn/trunk/debian/ctn.examples (rev 0)
+++ trunk/packages/ctn/trunk/debian/ctn.examples 2013-11-07 16:51:09 UTC (rev 15141)
@@ -0,0 +1,2 @@
+apps/scripts/[abd-z]*
+apps/scripts/cr*
Added: trunk/packages/ctn/trunk/debian/ctn.install
===================================================================
--- trunk/packages/ctn/trunk/debian/ctn.install (rev 0)
+++ trunk/packages/ctn/trunk/debian/ctn.install 2013-11-07 16:51:09 UTC (rev 15141)
@@ -0,0 +1,5 @@
+bin usr
+runtime/ctn_cfg.txt etc/ctn/runtime
+runtime/fontmap etc/ctn/runtime
+runtime/queuemap etc/ctn/runtime
+cfg_scripts/mysql/* usr/share/ctn/mysql
Added: trunk/packages/ctn/trunk/debian/ctn.manpages
===================================================================
--- trunk/packages/ctn/trunk/debian/ctn.manpages (rev 0)
+++ trunk/packages/ctn/trunk/debian/ctn.manpages 2013-11-07 16:51:09 UTC (rev 15141)
@@ -0,0 +1 @@
+debian/man/*
Modified: trunk/packages/ctn/trunk/debian/debian.mysql.options.env
===================================================================
--- trunk/packages/ctn/trunk/debian/debian.mysql.options.env 2013-11-07 14:14:28 UTC (rev 15140)
+++ trunk/packages/ctn/trunk/debian/debian.mysql.options.env 2013-11-07 16:51:09 UTC (rev 15141)
@@ -1,6 +1,6 @@
export CWD=`pwd`
-mkdir -p $CWD/debian/build-tmp
-export CTN_TARGET=$CWD/debian/build-tmp
+mkdir -p $CWD/debian/tmp
+export CTN_TARGET=$CWD/debian/tmp
export DICOM_ROOT=$CWD
export DICOM_BIN=$CTN_TARGET/bin
export DICOM_LIB=$DICOM_ROOT/lib/ctn-mysql
Modified: trunk/packages/ctn/trunk/debian/rules
===================================================================
--- trunk/packages/ctn/trunk/debian/rules 2013-11-07 14:14:28 UTC (rev 15140)
+++ trunk/packages/ctn/trunk/debian/rules 2013-11-07 16:51:09 UTC (rev 15141)
@@ -1,30 +1,34 @@
#!/usr/bin/make -f
-include /usr/share/quilt/quilt.make
+build := debian/tmp
+pkg-ctn := ctn
+pkg-ctn-dev := ctn-dev
-build := debian/build-tmp
-pkg-ctn := debian/ctn
-pkg-ctn-dev := debian/ctn-dev
-
INSTALL := install
INSTALLFLAGS := -g root -o root -m 0644
INSTALLEXECFLAGS:= -g root -o root
INSTALLDIRFLAGS := -d -g root -o root -m 0755
-DOCDIR := $(pkg-ctn)/usr/share/doc/ctn
+DOCDIR := $(CURDIR)/debian/$(pkg-ctn)/usr/share/doc/$(pkg-ctn)
+%:
+ dh $@
-
-build: patch build-stamp
-
# we must provide *SIZE inside dicom.h or otherwise applications which
# would use ctn might be doomed to get improper U32 types etc
# that file will be included in dicom.h - hard patched
+debian/savefiles:
+ mkdir -p debian/savefiles
+ mkdir -p debian/savefiles/apps/dcm_modify_object
+ cp -a apps/dcm_modify_object/gram.h debian/savefiles/apps/dcm_modify_object
+
+debian/test-sizes: debian/savefiles
+ cc debian/test-sizes.c -o debian/test-sizes
+
debian/intsizes.h: debian/test-sizes
sh debian/intsizes_h.sh
-build-stamp: debian/test-sizes debian/intsizes.h
- dh_testdir
+override_dh_auto_build: debian/intsizes.h
debian/test-sizes >| debian/ctnmake.debian.mysql.options.full
cat debian/ctnmake.debian.mysql.options >> debian/ctnmake.debian.mysql.options.full
mv debian/intsizes.h facilities/dicom/
@@ -33,71 +37,43 @@
mkdir $(CURDIR)/lib
mkdir $(CURDIR)/include
- # Add here commands to compile the package.
(. debian/debian.mysql.options.env; make install)
- touch build-stamp
+ ls -la debian/tmp
-clean: unpatch
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- # Add here commands to clean up after the build process.
- [ ! -f Makefile ] || $(MAKE) clean
+override_dh_auto_clean:
+ dh_auto_clean
+ # restore changed files
+ if [ -d debian/savefiles ] ; then \
+ mv debian/savefiles/apps/dcm_modify_object/gram.h apps/dcm_modify_object ; \
+ rm -rf debian/savefiles/apps ; \
+ fi
+ rm -rf debian/savefiles
rm -f debian/ctn*.postinst.* debian/ctn*.prerm.* debian/intsizes.h
rm -f debian/ctnmake.debian.mysql.options.full debian/test-sizes
rm -f facilities/dicom/intsizes.h
- rm -rf ${build}
rm -f libsrc/*.c libsrc/*.h
rm -f `find . -name \*.o -or -name \*.a`
- rm -f include/*
- rm -rf lib/ctn-mysql
- dh_clean
+ rm -rf include
+ rm -rf lib
-scripts := $(build)/bin/add-accession-numbers $(build)/bin/create_common $(build)/bin/create_icons $(build)/bin/create_icons.94 $(build)/bin/createdirectory $(build)/bin/fillImageDBScript $(build)/bin/his_layout $(build)/bin/icon_script $(build)/bin/img_layout $(build)/bin/pacs_layout $(build)/bin/print_layout $(build)/bin/start_clients $(build)/bin/start_clients $(build)/bin/start_img_server $(build)/bin/start_his_client $(build)/bin/start_img_displays $(build)/bin/start_pacs_client $(build)/bin/stop_img_displays $(build)/bin/start_his_server $(build)/bin/start_pacs_server $(build)/bin/start_print_client $(build)/bin/start_img_client
+override_dh_prep:
+ # ctn build process does build+install in one rush
+ # dear dh_prep, please leave my debian/tmp
+ mv $(CURDIR)/debian/tmp $(CURDIR)/debian/do_not_delete_this_tmp_dir
+ dh_prep
+ mv $(CURDIR)/debian/do_not_delete_this_tmp_dir $(CURDIR)/debian/tmp
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
+override_dh_auto_install:
+ echo 'Do not try to call `make install` since it requires setting variable DICOM_MAKE'
- # install ctn-dev
- $(INSTALL) $(INSTALLFLAGS) include/* $(pkg-ctn-dev)/usr/include/ctn
- $(INSTALL) $(INSTALLFLAGS) lib/*/* $(pkg-ctn-dev)/usr/lib/ctn
+override_dh_install:
+ dh_install
- # install ctn
- $(INSTALL) $(INSTALLEXECFLAGS) $(filter-out $(scripts),$(wildcard $(build)/bin/*)) $(pkg-ctn)/usr/bin
- $(INSTALL) $(INSTALLFLAGS) runtime/ctn_cfg.txt runtime/fontmap runtime/queuemap $(pkg-ctn)/etc/ctn/runtime
- $(INSTALL) $(INSTALLFLAGS) cfg_scripts/mysql/* $(pkg-ctn)/usr/share/ctn/mysql
- chmod +x `echo $(pkg-ctn)/usr/share/ctn/mysql/*`
- chmod -x `echo $(pkg-ctn)/usr/share/ctn/mysql/*.script`
-
-# Build architecture-independent files here.
-binary-indep: build install
-
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installdocs --all
- dh_installexamples -p ctn $(scripts)
- dh_installman -p ctn debian/man/*
- dh_installchangelogs
- dh_link
- dh_strip -A
- dh_compress
+override_dh_fixperms:
dh_fixperms
- dh_installdeb
- dh_shlibdeps -A
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+ chmod +x `echo $(CURDIR)/debian/$(pkg-ctn)/usr/share/ctn/mysql/*`
+ chmod -x `echo $(CURDIR)/debian/$(pkg-ctn)/usr/share/ctn/mysql/*.script`
-binary: binary-indep binary-arch
-.PHONY: clean binary-indep binary-arch binary install
-
# Remark: The following uscan command requires devscripts > 2.12.4 which is not
# yet released at the time of this package release. The code can be obtained
# via
More information about the debian-med-commit
mailing list