Author: tille Date: 2010-03-29 12:03:19 +0000 (Mon, 29 Mar 2010) New Revision: 4696
Added: trunk/packages/freediams/trunk/debian/source/ trunk/packages/freediams/trunk/debian/source/format Modified: trunk/packages/freediams/trunk/debian/changelog trunk/packages/freediams/trunk/debian/control trunk/packages/freediams/trunk/debian/patches/20_no_rpath.patch trunk/packages/freediams/trunk/debian/rules Log: Try to solve rpath issue but failed for the moment, source format 3.0 (quilt), fix file permissions after install target Modified: trunk/packages/freediams/trunk/debian/changelog =================================================================== --- trunk/packages/freediams/trunk/debian/changelog 2010-03-29 11:05:33 UTC (rev 4695) +++ trunk/packages/freediams/trunk/debian/changelog 2010-03-29 12:03:19 UTC (rev 4696) @@ -11,8 +11,10 @@ * Group maintenance * Added Build-Depends libxext-dev * Split into freediams, freediams-data, freediams-doc + * debian/source/format: 3.0 (quilt) + * debian/patches: unset RPATH option - -- Andreas Tille <[email protected]> Fri, 26 Feb 2010 21:37:39 +0100 + -- Andreas Tille <[email protected]> Mon, 29 Mar 2010 13:20:29 +0200 freediams (0.2.0) UNRELEASED; urgency=low Modified: trunk/packages/freediams/trunk/debian/control =================================================================== --- trunk/packages/freediams/trunk/debian/control 2010-03-29 11:05:33 UTC (rev 4695) +++ trunk/packages/freediams/trunk/debian/control 2010-03-29 12:03:19 UTC (rev 4696) @@ -5,7 +5,7 @@ Uploaders: Eric Maeker <[email protected]>, Andreas Tille <[email protected]> DM-Upload-Allowed: yes -Build-Depends: debhelper (>= 7.1), libqt4-dev (>= 4.4.3), doxygen (>= 1.5.8), libxext-dev +Build-Depends: debhelper (>= 7.1), libqt4-dev (>= 4.4.3), doxygen (>= 1.5.8), libxext-dev, quilt Standards-Version: 3.8.4 Homepage: http://www.freemedforms.com/ Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/freediams/?rev=0&sc=0 Modified: trunk/packages/freediams/trunk/debian/patches/20_no_rpath.patch =================================================================== --- trunk/packages/freediams/trunk/debian/patches/20_no_rpath.patch 2010-03-29 11:05:33 UTC (rev 4695) +++ trunk/packages/freediams/trunk/debian/patches/20_no_rpath.patch 2010-03-29 12:03:19 UTC (rev 4696) @@ -1,21 +1,11 @@ ---- freediams-0.1.0.orig/libs/rpath.pri -+++ freediams-0.1.0/libs/rpath.pri -@@ -23,7 +23,7 @@ - } +--- freediams-0.3.0.orig/buildspecs/config_linux.pri ++++ freediams-0.3.0/buildspecs/config_linux.pri +@@ -22,8 +22,6 @@ + RPATH_LIBS_BIN = plugins/ + } - PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":") -- QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${PLUGIN_RPATH}\' -+ QMAKE_LFLAGS += -Wl,-z,origin - QMAKE_RPATHDIR = - } - ---- freediams-0.1.0.orig/plugins/fmf_plugins.pri -+++ freediams-0.1.0/plugins/fmf_plugins.pri -@@ -30,6 +30,6 @@ - # QMAKE_RPATHDIR += \$\$ORIGIN/../.. - # QMAKE_RPATHDIR += \$\$ORIGIN/$${RPATH_LIBS_BIN}/ - IDE_PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":") -- QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${IDE_PLUGIN_RPATH}\' -+ QMAKE_LFLAGS += -Wl,-z,origin - QMAKE_RPATHDIR = - } +- RPATH_LIBS_BIN = plugins/ +- + CONFIG( debug, debug|release ) { + CONFIG += console + } Modified: trunk/packages/freediams/trunk/debian/rules =================================================================== --- trunk/packages/freediams/trunk/debian/rules 2010-03-29 11:05:33 UTC (rev 4695) +++ trunk/packages/freediams/trunk/debian/rules 2010-03-29 12:03:19 UTC (rev 4696) @@ -1,7 +1,7 @@ #!/usr/bin/make -f %: - dh $@ + dh $@ --with quilt override_dh_auto_configure: qmake-qt4 -r -config release "CONFIG+=LINUX_INTEGRATED" "INSTALL_ROOT_PATH=$(CURDIR)/debian/tmp/usr/" freediams.pro @@ -15,6 +15,9 @@ override_dh_auto_install: make install + # fix permission of some images, Eric, please try to apply this just in your upstream tarball + find $(CURDIR)/debian/tmp -name "*.png" -executable -exec chmod 644 \{\} \; + find $(CURDIR)/debian/tmp -name "*.qm" -executable -exec chmod 644 \{\} \; override_dh_install: dh_install --autodest Added: trunk/packages/freediams/trunk/debian/source/format =================================================================== --- trunk/packages/freediams/trunk/debian/source/format (rev 0) +++ trunk/packages/freediams/trunk/debian/source/format 2010-03-29 12:03:19 UTC (rev 4696) @@ -0,0 +1 @@ +3.0 (quilt) _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit
