[Pkg-silc-commits] r32 - in /silc-toolkit/trunk/debian: changelog libsilc-1.1-1-dev.install rules
lunar at users.alioth.debian.org
lunar at users.alioth.debian.org
Sun May 27 14:05:58 UTC 2007
Author: lunar
Date: Sun May 27 14:05:57 2007
New Revision: 32
URL: http://svn.debian.org/wsvn/pkg-silc/?sc=1&rev=32
Log:
More cleanups, fixes and simplifications in debian/rules.
Documentation is now installed in /usr/share/doc/libsilc-1.1-1-dev instead of
/usr/share/doc/libsilc-dev.
Modified:
silc-toolkit/trunk/debian/changelog
silc-toolkit/trunk/debian/libsilc-1.1-1-dev.install
silc-toolkit/trunk/debian/rules
Modified: silc-toolkit/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/debian/changelog?rev=32&op=diff
==============================================================================
--- silc-toolkit/trunk/debian/changelog (original)
+++ silc-toolkit/trunk/debian/changelog Sun May 27 14:05:57 2007
@@ -9,8 +9,10 @@
* Do not ship the .la files anymore. Using pkg-config instead of .la avoid
troubles.
* Various cleanups and updates in debian/rules.
+ * Documentation is now shipped in /usr/share/doc/libsilc-1.1-1-dev instead
+ of /usr/share/doc/libsilc-dev.
- -- Jérémy Bobbio <lunar at debian.org> Sun, 27 May 2007 14:59:37 +0200
+ -- Jérémy Bobbio <lunar at debian.org> Sun, 27 May 2007 16:04:49 +0200
silc-toolkit (0.9.12-6) unstable; urgency=high
Modified: silc-toolkit/trunk/debian/libsilc-1.1-1-dev.install
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/debian/libsilc-1.1-1-dev.install?rev=32&op=diff
==============================================================================
--- silc-toolkit/trunk/debian/libsilc-1.1-1-dev.install (original)
+++ silc-toolkit/trunk/debian/libsilc-1.1-1-dev.install Sun May 27 14:05:57 2007
@@ -2,5 +2,5 @@
usr/lib/lib*.so
usr/lib/*.a
usr/lib/pkgconfig/*.pc
-usr/share/doc/libsilc-dev/toolkit
-usr/share/doc/libsilc-dev/tutorial
+usr/share/doc/libsilc-1.1-1-dev/toolkit
+usr/share/doc/libsilc-1.1-1-dev/tutorial
Modified: silc-toolkit/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/debian/rules?rev=32&op=diff
==============================================================================
--- silc-toolkit/trunk/debian/rules (original)
+++ silc-toolkit/trunk/debian/rules Sun May 27 14:05:57 2007
@@ -6,22 +6,10 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-#name ?= $(shell cat debian/NAME)
-#lib_package=libsilc-${name}
-#dev_package=libsilc-${name}-dev
-#doc_package=libsilc-${name}-dev #FIXME, just testing purpose
-
-lib_package=libsilc
-dev_package=libsilc-dev
-doc_package=libsilc-dev #FIXME, just testing purpose
-
-perl_lib=/usr/lib/perl5
-
# 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)
-
CFLAGS =-Wall -g
@@ -34,60 +22,40 @@
INSTALL_PROGRAM += -s
endif
-# shared library versions, option 1
-#version=2.0.5
-#major=2
-# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
-#version=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-#major=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
+NAME = libsilc-1.1-1
config.status: configure
- #sh debian/substitute.sh
-
dh_testdir
- # Add here commands to configure the package.
+ -rm -f config.guess config.sub
+ ln -sf /usr/share/misc/config.guess config.guess
+ ln -sf /usr/share/misc/config.sub config.sub
CFLAGS="$(CFLAGS)" ./configure \
- --without-irssi --without-silcd \
--host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
\
- --disable-threads \
--enable-debug \
--enable-shared \
--enable-static \
--enable-ipv6 \
- --with-perl-lib=${perl_lib} \
--libdir=\$${prefix}/lib \
- --with-simdir=\$${libdir}/silc/${name} \
- --includedir=\$${prefix}/include/silc/${name} \
- --with-docdir=\$${prefix}/share/doc/${doc_package} \
+ --with-simdir=\$${libdir}/silc \
+ --includedir=\$${prefix}/include/silc \
+ --with-docdir=\$${prefix}/share/doc/${NAME}-dev \
--without-libtoolfix
build: build-stamp
build-stamp: config.status
dh_testdir
-
- # Add here commands to compile the package.
$(MAKE)
-
touch build-stamp
clean:
dh_testdir
dh_testroot
rm -f build-stamp
- # Add here commands to clean up after the build process.
-$(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
dh_clean
install: build
@@ -95,13 +63,11 @@
dh_testroot
dh_clean -k
dh_installdirs
-
- # Add here commands to install the package into debian/tmp
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
# Build architecture-independent files here.
binary-indep: build install
-# We have nothing to do by default.
+ # We have nothing to do.
# Build architecture-dependent files here.
binary-arch: build install
@@ -111,22 +77,11 @@
dh_installdocs
dh_installexamples
dh_install --autodest --sourcedir=debian/tmp
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installinfo
dh_installman
dh_link
dh_strip
dh_compress
dh_fixperms
- dh_perl
-# dh_python
dh_makeshlibs
dh_installdeb
dh_shlibdeps
More information about the Pkg-silc-commits
mailing list