From f312f03e478ae1496f8edd73377c3582480c4137 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Wed, 29 Jul 2015 14:35:34 +0000 Subject: [PATCH] new debian build --- ChangeLog | 120 +++++++++++++++++++++++++++++++++++++ debian/changelog.in | 2 +- debian/control.in | 25 ++++---- debian/copyright | 26 -------- debian/dirs | 0 debian/mrw-c++-dev.dirs | 3 - debian/mrw-c++-dev.install | 5 +- debian/mrw-c++.dirs | 3 - debian/mrw-c++.doc-base.EX | 20 ------- debian/mrw-c++.install | 7 --- debian/rules | 17 +++--- debian/shlibs.local.ex | 1 - debian/watch.ex | 23 ------- 13 files changed, 141 insertions(+), 111 deletions(-) delete mode 100644 debian/copyright delete mode 100644 debian/dirs delete mode 100644 debian/mrw-c++-dev.dirs delete mode 100644 debian/mrw-c++.dirs delete mode 100644 debian/mrw-c++.doc-base.EX mode change 100755 => 100644 debian/rules delete mode 100644 debian/shlibs.local.ex delete mode 100644 debian/watch.ex diff --git a/ChangeLog b/ChangeLog index cdfef13..faf649e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,123 @@ +2015-07-29 12:27 marc + + * ax_init_standard_project.m4, bootstrap.sh, mrw-c++.spec.in: build + fixes for rpm + +2015-07-29 12:19 marc + + * mrw-c++.spec.in: build fixes for rpm + +2015-07-29 12:18 marc + + * ax_init_standard_project.m4, bootstrap.sh: build fixes for rpm + +2015-07-29 11:43 marc + + * mrw-c++.spec.in: build fixes for rpm - centos 5/6 don't know + m4_esyscmd_s + +2015-07-29 11:41 marc + + * ax_init_standard_project.m4: build fixes for rpm - centos 5/6 + don't know m4_esyscmd_s + +2015-07-29 11:22 marc + + * ax_init_standard_project.m4, mrw-c++.spec.in: build fixes for rpm + - centos 5/6 don't know m4_esyscmd_s + +2015-07-29 10:56 marc + + * ax_init_standard_project.m4, bootstrap.sh, mrw-c++.spec.in: build + fixes for rpm + +2015-07-29 10:51 marc + + * mrw-c++.spec.in: build fixes for rpm + +2015-07-29 10:46 marc + + * mrw-c++.spec.in: build fixes for rpm + +2015-07-29 08:24 marc + + * mrw-c++.spec.in: build fixes for rpm + +2015-07-29 06:57 marc + + * mrw-c++.spec.in: build fixes for rpm + +2015-07-29 06:53 marc + + * mrw-c++.spec.in: build fixes for rpm + +2015-07-29 06:42 marc + + * mrw-c++.spec.in: build fixes for rpm + +2015-07-28 14:46 marc + + * mrw-c++.spec.in: build fixes for rpm + +2015-07-28 14:35 marc + + * mrw-c++.spec.in: build fixes for rpm + +2015-07-28 14:31 marc + + * mrw-c++.spec.in: build fixes for rpm + +2015-07-28 14:28 marc + + * mrw-c++.spec.in: build fixes for rpm + +2015-07-28 14:22 marc + + * README, mrw-c++.spec.in: build fixes for rpm + +2015-07-28 14:18 marc + + * ax_init_standard_project.m4, bootstrap.sh, makefile.am, + mrw-c++.spec.in: build fixes for rpm + +2015-07-28 13:34 marc + + * mrw-c++.spec.in: dependencies fixed + +2015-07-28 12:15 marc + + * ax_check_qt.m4, ax_init_standard_project.m4, bootstrap.sh, + configure.ac, doc/doxyfile.in, examples/makefile.am, + mac-create-app-bundle.sh, makefile.am, mrw-c++.spec.in, + src/makefile.am, src/mrw/mrw.hxx, src/mrw/mrw.hxx.in, + src/version.cxx, src/version.hxx: adapt to new build system + +2015-07-12 16:36 marc + + * debian/control.in: debian build requires libdemangle, no + libiberty on debian, ubuntu only + +2015-07-12 16:30 marc + + * debian/control.in: debian build requires libdemangle + +2015-06-23 12:34 marc + + * src/mrw/auto.hxx: undo previous changes to compile for precise, + lucid, squeeze + +2015-06-23 12:25 marc + + * src/mrw/auto.hxx: undo previous changes to compile for precise, + lucid, squeeze + +2015-06-23 12:07 marc + + * ChangeLog, ax_check_qt.m4, ax_init_standard_project.m4, + bootstrap.sh, src/mrw/auto.hxx, src/mrw/checkcxx11.hxx: minor + changes - don't know wha it does not compile for precise, lucid, + squeeze + 2015-05-25 08:03 marc * ChangeLog, doc/makefile.am, src/mrw/auto.hxx, test/auto_test.cxx, diff --git a/debian/changelog.in b/debian/changelog.in index e80bdcd..7b10448 100644 --- a/debian/changelog.in +++ b/debian/changelog.in @@ -1,5 +1,5 @@ @PACKAGE@ (@PACKAGE_VERSION@~@DISTRO@.@BUILD_NUMBER@) @DISTRO@; urgency=low - * see https://dev.marc.waeckerlin.org/projects/mrw-c++ for changes + * Please see ChangeLog of @PACKAGE@ -- @AUTHOR@ @BUILD_DATE@ diff --git a/debian/control.in b/debian/control.in index 68ac0d5..0a61ae5 100644 --- a/debian/control.in +++ b/debian/control.in @@ -1,21 +1,18 @@ -Source: mrw-c++ +Source: @PACKAGE_NAME@ Priority: extra -Maintainer: Marc Wäckerlin (http://marc.waeckerlin.org) -Build-Depends: @DIST_BUILDDEPENDS@ debhelper (>= 7), pkg-config, autotools-dev, doxygen, graphviz, lsb-release, libiberty-dev | binutils-dev, libboost-thread-dev, zlib1g-dev -Standards-Version: 3.8.1 -Section: libs -Homepage: https://dev.marc.waeckerlin.org/projects/mrw-c++ - -Package: mrw-c++-dev -Section: libdevel -Architecture: any -Depends: mrw-c++ (= ${binary:Version}) -Description: @DESCRIPTION@ (development package with headers and documentation) -@README_DEB@ +Maintainer: @AUTHOR@ +Build-Depends: debhelper, subversion, pkg-config, autotools-dev, lsb-release , doxygen, graphviz, mscgen, libcppunit-dev -Package: mrw-c++ +Package: @PACKAGE_NAME@ Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: @DESCRIPTION@ @README_DEB@ + +Package: @PACKAGE_NAME@-dev +Section: libdevel +Architecture: any +Depends: @PACKAGE_NAME@ (= ${binary:Version}) +Description: @DESCRIPTION@ - Development Package +@README_DEB@ diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index 061e409..0000000 --- a/debian/copyright +++ /dev/null @@ -1,26 +0,0 @@ -This package was debianized by Marc Wäckerlin (http://marc.waeckerlin.org) on -Wed, 07 Apr 2010 10:23:02 +0200. - -It was downloaded from https://dev.marc.waeckerlin.org/projects/mrw-c++++ - -Upstream Author(s): - - Marc Wäckerlin (http://marc.waeckerlin.org) - -Copyright: - - Marc Wäckerlin (http://marc.waeckerlin.org) - -License: - - LGPL version 3 - -The Debian packaging is: - - Copyright (C) 2010 Marc Wäckerlin (http://marc.waeckerlin.org) - -and is licensed under the GPL version 3, -see `/usr/share/common-licenses/GPL-3'. - -# Please also look if there are files or directories which have a -# different copyright/license attached and list them here. diff --git a/debian/dirs b/debian/dirs deleted file mode 100644 index e69de29..0000000 diff --git a/debian/mrw-c++-dev.dirs b/debian/mrw-c++-dev.dirs deleted file mode 100644 index 995e528..0000000 --- a/debian/mrw-c++-dev.dirs +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib -usr/include -usr/share diff --git a/debian/mrw-c++-dev.install b/debian/mrw-c++-dev.install index 47cb23b..f37e5f1 100644 --- a/debian/mrw-c++-dev.install +++ b/debian/mrw-c++-dev.install @@ -1,7 +1,6 @@ -usr/share/doc/mrw-c++/html/* usr/include/* usr/lib/lib*.a usr/lib/lib*.so +usr/lib/pkgconfig/* usr/lib/*.la -usr/lib/pkgconfig -usr/share/pkgconfig +usr/share/doc/mrw-c++/html diff --git a/debian/mrw-c++.dirs b/debian/mrw-c++.dirs deleted file mode 100644 index 5d67032..0000000 --- a/debian/mrw-c++.dirs +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib -#usr/bin -usr/share diff --git a/debian/mrw-c++.doc-base.EX b/debian/mrw-c++.doc-base.EX deleted file mode 100644 index 721f3f5..0000000 --- a/debian/mrw-c++.doc-base.EX +++ /dev/null @@ -1,20 +0,0 @@ -Document: mrw-c++ -Title: Debian mrw-c++ Manual -Author: -Abstract: This manual describes what mrw-c++ is - and how it can be used to - manage online manuals on Debian systems. -Section: unknown - -Format: debiandoc-sgml -Files: /usr/share/doc/proxyface/proxyface.sgml.gz - -Format: postscript -Files: /usr/share/doc/proxyface/proxyface.ps.gz - -Format: text -Files: /usr/share/doc/proxyface/proxyface.text.gz - -Format: HTML -Index: /usr/share/doc/proxyface/html/index.html -Files: /usr/share/doc/proxyface/html/*.html diff --git a/debian/mrw-c++.install b/debian/mrw-c++.install index 4b636c4..d0dbfd1 100644 --- a/debian/mrw-c++.install +++ b/debian/mrw-c++.install @@ -1,8 +1 @@ -#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.* diff --git a/debian/rules b/debian/rules old mode 100755 new mode 100644 index 9045bec..5082592 --- a/debian/rules +++ b/debian/rules @@ -1,13 +1,10 @@ -!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +## @id $Id$ +# +# This file has been added by bootstrap.sh on Wed, 29 July 2015 16:11:27 +0200 +# Feel free to change it or even remove and rebuild it, up to your needs +# +## 1 2 3 4 5 6 7 8 +## 45678901234567890123456789012345678901234567890123456789012345678901234567890 %: dh $@ diff --git a/debian/shlibs.local.ex b/debian/shlibs.local.ex deleted file mode 100644 index 2566e8d..0000000 --- a/debian/shlibs.local.ex +++ /dev/null @@ -1 +0,0 @@ -libproxyface 1.0.34 proxyface (>> 1.0.34-0), proxyface (<< 1.0.34-99) diff --git a/debian/watch.ex b/debian/watch.ex deleted file mode 100644 index 9e3713b..0000000 --- a/debian/watch.ex +++ /dev/null @@ -1,23 +0,0 @@ -# Example watch control file for uscan -# Rename this file to "watch" and then you can run the "uscan" command -# to check for upstream updates and more. -# See uscan(1) for format - -# Compulsory line, this is a version 3 file -version=3 - -# Uncomment to examine a Webpage -# -#http://www.example.com/downloads.php proxyface-(.*)\.tar\.gz - -# Uncomment to examine a Webserver directory -#http://www.example.com/pub/proxyface-(.*)\.tar\.gz - -# Uncommment to examine a FTP server -#ftp://ftp.example.com/pub/proxyface-(.*)\.tar\.gz debian uupdate - -# Uncomment to find new files on sourceforge, for devscripts >= 2.9 -# http://sf.net/proxyface/proxyface-(.*)\.tar\.gz - -# Uncomment to find new files on GooglePages -# http://example.googlepages.com/foo.html proxyface-(.*)\.tar\.gz