diff --git a/configure.in b/configure.in index e8529ab..c89a81b 100644 --- a/configure.in +++ b/configure.in @@ -45,7 +45,7 @@ AC_CONFIG_FILES([makefile ${PACKAGENAME}.spec src/version.cxx src/makefile test/makefile doc/doxyfile doc/makefile src/mrw/mrw.hxx doc/examples/makefile - src/${PACKAGENAME}.pc debian/changelog]) + src/${PACKAGENAME}.pc debian/changelog debian/control]) # copy M4 to shell AC_SUBST(MAJOR) @@ -68,6 +68,9 @@ AX_DEFINE_DIR([DATADIR], [datadir]) #AC_SUBST(DATADIR) # macros +sed 's/.*/ &/g' ${0%/*}/README; echo " ." > ${0%/*}/README.debian +READMEDEB=README.debian +AC_SUBST_FILE(READMEDEB) README=README AC_SUBST_FILE(README) CHANGE_LOG=ChangeLog diff --git a/debian/control b/debian/control.in similarity index 95% rename from debian/control rename to debian/control.in index c1a2967..f332e6b 100644 --- a/debian/control +++ b/debian/control.in @@ -1,5 +1,4 @@ Source: mrw-c++ -Section: unknown Priority: extra Maintainer: Marc Wäckerlin (SwissSign AG) Build-Depends: debhelper (>= 7), autotools-dev @@ -12,11 +11,11 @@ Section: libdevel Architecture: any Depends: mrw-c++ (= ${binary:Version}) Description: mrw-c++ - . +@READMEDEB@ Package: mrw-c++ Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: mrw-c++ - . +@READMEDEB@ diff --git a/debian/mrw-c++-dev.dirs b/debian/mrw-c++-dev.dirs index 04e68f9..995e528 100644 --- a/debian/mrw-c++-dev.dirs +++ b/debian/mrw-c++-dev.dirs @@ -1,3 +1,3 @@ -#usr/lib -#usr/include -#usr/share +usr/lib +usr/include +usr/share diff --git a/debian/mrw-c++-dev.install b/debian/mrw-c++-dev.install index f27f27f..800068b 100644 --- a/debian/mrw-c++-dev.install +++ b/debian/mrw-c++-dev.install @@ -1,7 +1,7 @@ usr/share/doc/mrw-c++ -#usr/include/* -#usr/lib/lib*.a -#usr/lib/lib*.so -#usr/lib/*.la -#usr/lib/pkgconfig -#usr/share/pkgconfig +usr/include/* +usr/lib/lib*.a +usr/lib/lib*.so +usr/lib/*.la +usr/lib/pkgconfig +usr/share/pkgconfig diff --git a/debian/mrw-c++.dirs b/debian/mrw-c++.dirs index cd138e0..5d67032 100644 --- a/debian/mrw-c++.dirs +++ b/debian/mrw-c++.dirs @@ -1,3 +1,3 @@ -#usr/lib +usr/lib #usr/bin -#usr/share +usr/share diff --git a/debian/mrw-c++.install b/debian/mrw-c++.install index b64de4e..4b636c4 100644 --- a/debian/mrw-c++.install +++ b/debian/mrw-c++.install @@ -1,8 +1,8 @@ -usr/bin/mrw-c++ +#usr/bin/mrw-c++ usr/share/doc/mrw-c++/AUTHORS usr/share/doc/mrw-c++/NEWS usr/share/doc/mrw-c++/README usr/share/doc/mrw-c++/COPYING usr/share/doc/mrw-c++/INSTALL usr/share/doc/mrw-c++/ChangeLog -#usr/lib/lib*.so.* +usr/lib/lib*.so.* diff --git a/debian/rules b/debian/rules index 619c792..dc63e52 100755 --- a/debian/rules +++ b/debian/rules @@ -84,7 +84,7 @@ binary-arch: install dh_compress dh_fixperms # dh_perl -# dh_makeshlibs + dh_makeshlibs dh_installdeb dh_shlibdeps dh_gencontrol diff --git a/log4cxx-0.9.7-1.i386.rpm b/log4cxx-0.9.7-1.i386.rpm deleted file mode 100644 index 6c4700b..0000000 Binary files a/log4cxx-0.9.7-1.i386.rpm and /dev/null differ diff --git a/log4cxx-0.9.7-2.i386.rpm b/log4cxx-0.9.7-2.i386.rpm deleted file mode 100644 index 0911b1a..0000000 Binary files a/log4cxx-0.9.7-2.i386.rpm and /dev/null differ diff --git a/log4cxx-0.9.7-3.i386.rpm b/log4cxx-0.9.7-3.i386.rpm deleted file mode 100644 index d330971..0000000 Binary files a/log4cxx-0.9.7-3.i386.rpm and /dev/null differ diff --git a/makefile.am b/makefile.am index e232876..574a12e 100644 --- a/makefile.am +++ b/makefile.am @@ -44,7 +44,7 @@ rpm: dist deps = ${top_srcdir}/COPYING ${top_srcdir}/README ${top_srcdir}/INSTALL ${top_srcdir}/NEWS ${top_srcdir}/ChangeLog clean-local: - - rm doxygen.err lib@PACKAGENAME@.doxytag + - rm README.debian - rm @PACKAGENAME@-dev_@MAJOR@.@MINOR@.@LEAST@-*.deb \ @PACKAGENAME@_@MAJOR@.@MINOR@.@LEAST@-*.changes \ @PACKAGENAME@_@MAJOR@.@MINOR@.@LEAST@-1.tar.gz \ diff --git a/mrw-c++.dsc.in b/mrw-c++.dsc.in deleted file mode 100644 index ee2be7d..0000000 --- a/mrw-c++.dsc.in +++ /dev/null @@ -1,12 +0,0 @@ -## $Id$ - -Format: 1.0 -Source: @PACKAGENAME@ -Version: @MAJOR@.@MINOR@.@LEAST@-@DEBBUILD@ -Binary: @PACKAGENAME@ -Maintainer: Marc Roman Wäckerlin -Architecture: any -Build-Depends: debhelper (>= 4.1.16), boost-devel, log4cxx-devel, ghostscript-library, gcc-c++, doxygen, graphviz, texlive-latex-base, texlive-latex-extra, texlive-latex-recommended -Files: - 0 0 @PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.orig.tar.gz - 0 0 @PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@-@DEBBUILD@.diff.tar.gz