浏览代码

-merged debian stuff from stable

Andrei Pelinescu-Onciul 22 年之前
父节点
当前提交
64a7bdc4d1
共有 4 个文件被更改,包括 22 次插入10 次删除
  1. 6 0
      debian/changelog
  2. 2 2
      debian/control
  3. 3 2
      debian/copyright
  4. 11 6
      debian/rules

+ 6 - 0
debian/changelog

@@ -1,3 +1,9 @@
+ser (0.8.11) unstable; urgency=low
+
+  * new upstream release
+
+ -- Andrei Pelinescu-Onciul <[email protected]>  Wed, 27 Aug 2003 14:53:24 +0200
+
 ser (0.8.11-pre34) unstable; urgency=low
 
   * minor bugfixes

+ 2 - 2
debian/control

@@ -2,7 +2,7 @@ Source: ser
 Section: net
 Priority: optional
 Maintainer: Andrei Pelinescu-Onciul <[email protected]>
-Build-Depends: debhelper (>= 4), libmysqlclient-dev, libexpat1-dev, zlib1g-dev, libradius1-dev
+Build-Depends: debhelper (>= 4), libmysqlclient-dev, libexpat1-dev, libradius1-dev
 Standards-Version: 3.5.2
 
 Package: ser
@@ -40,7 +40,7 @@ Description: contains the jabber module (sip-jabber message translation)
 Package: ser-radius-modules
 Architecture: any
 Depends: ${shlibs:Depends}, ser (= ${Source-Version})
-Description: contains the jabber module (sip-jabber message translation)
+Description: contains the ser radius modules 
  This has been split out of the main ser package, so that ser will not
  depend upon libradius1. This modules will enable you to authenticate, 
  do group membership checking or check the messages uris using radius.

+ 3 - 2
debian/copyright

@@ -6,8 +6,9 @@ It was downloaded from http://iptel.org/ser.
 Upstream Authors: Andrei Pelinescu-Onciul
 <[email protected]>, Bogdan Iancu
 <[email protected]>, Daniel-Constantin Mierla, Jan Janak
-<[email protected]>, Jiri Kuthan <[email protected]>, Nils Ohlmeier, Ricardo
-Baratto, Stelios Sidiroglou-Douskos  (see AUTHORS file for details)
+<[email protected]>, Jiri Kuthan <[email protected]>, Juha Heinanen, Maxim
+Sobolev, Miklos Tirpak, Nils Ohlmeier, Ramona-Elena Modroiu, Raphael Coeffic,
+Ricardo Baratto, Stelios Sidiroglou-Douskos  (see AUTHORS file for details)
 
 This software is copyright (c) 2002-2003 by Fhg Fokus
 

+ 11 - 6
debian/rules

@@ -10,6 +10,8 @@
 #              some ser make options (andrei)
 #  2003-06-27  changed to DH_COMPAT 4 (debian/compat) + other filenames
 #              & small fixes (andrei)
+#  2003-08-29  replaced modules-install with modules-install-all, to 
+#               install also the modules doc (andrei)
 
 
 # Uncomment this to turn on verbose mode.
@@ -95,23 +97,26 @@ install: build
 		cfg-prefix=$(CURDIR)/debian/ser \
 		cfg-target=/etc/ser/
 	# install only the mysql module
-	$(MAKE) install-modules modules="$(MYSQL_MOD_PATH)"  \
+	$(MAKE) install-modules-all modules="$(MYSQL_MOD_PATH)"  \
 		basedir=$(CURDIR)/debian/ser-mysql-module \
 		prefix=/usr \
 		cfg-prefix=$(CURDIR)/debian/ser-mysql-module \
-		cfg-target=/etc/ser/
+		cfg-target=/etc/ser/ \
+		doc-dir=share/doc/ser-mysql-module
 	#install only the jabber module
-	$(MAKE) install-modules modules="$(JABBER_MOD_PATH)"  \
+	$(MAKE) install-modules-all modules="$(JABBER_MOD_PATH)"  \
 		basedir=$(CURDIR)/debian/ser-jabber-module \
 		prefix=/usr \
 		cfg-prefix=$(CURDIR)/debian/ser-jabber-module \
-		cfg-target=/etc/ser/
+		cfg-target=/etc/ser/ \
+		doc-dir=share/doc/ser-jabber-module
 	#install only the radius modules
-	$(MAKE) install-modules modules="$(RADIUS_MOD_PATH)"  \
+	$(MAKE) install-modules-all modules="$(RADIUS_MOD_PATH)"  \
 		basedir=$(CURDIR)/debian/ser-radius-modules \
 		prefix=/usr \
 		cfg-prefix=$(CURDIR)/debian/ser-radius-modules \
-		cfg-target=/etc/ser/
+		cfg-target=/etc/ser/ \
+		doc-dir=share/doc/ser-radius-modules
 	#dh_movefiles