[Pkg-voip-commits] r7981 - in /dahdi-tools/trunk/debian: changelog patches/asciidoc_fix patches/series rules

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Thu Jan 21 12:48:58 2010
New Revision: 7981

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7981
Log:
New upstream release: 2.2.1

* Patch asciidoc_fix dropped: merged upstream
* No longer needed to remove twinstar.8 - there's now a proper man page.

Removed:
    dahdi-tools/trunk/debian/patches/asciidoc_fix
Modified:
    dahdi-tools/trunk/debian/changelog
    dahdi-tools/trunk/debian/patches/series
    dahdi-tools/trunk/debian/rules

Modified: dahdi-tools/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/changelog?rev=7981&op=diff
==============================================================================
--- dahdi-tools/trunk/debian/changelog (original)
+++ dahdi-tools/trunk/debian/changelog Thu Jan 21 12:48:58 2010
@@ -1,19 +1,17 @@
-dahdi-tools (1:2.2.1~rc2-1) UNRELEASED; urgency=low
+dahdi-tools (1:2.2.1-1) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
 
   [ Tzafrir Cohen ]
-  * New upstream release (Closes: #536257).
+  * New upstream release (Closes: #536257, #564381).
   * Patch 'bashism' dropped: merged upstream. 
   * Patch xpp_no_extra_at dropped: merged upstream. 
   * Add an example genconf_parameters.
   * Compat level 7.
   * Bump standars version to 3.8.3.0 (no change needed)
-  * Temporarily removing the empty twinstar "man page".
   * Udev rules are now in dahdi-linux.
-  * Patch asciidoc_fix: fix README for asciidoc 8.5[.2?] (Closes: #564381).
-
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Sat, 09 Jan 2010 14:45:27 +0200
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Thu, 21 Jan 2010 14:41:36 +0200
 
 dahdi-tools (1:2.2.0-1) unstable; urgency=low
 

Modified: dahdi-tools/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/patches/series?rev=7981&op=diff
==============================================================================
--- dahdi-tools/trunk/debian/patches/series (original)
+++ dahdi-tools/trunk/debian/patches/series Thu Jan 21 12:48:58 2010
@@ -3,4 +3,3 @@
 zaptel_perl
 echocan_oslec
 hardware_rescan
-asciidoc_fix

Modified: dahdi-tools/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/rules?rev=7981&op=diff
==============================================================================
--- dahdi-tools/trunk/debian/rules (original)
+++ dahdi-tools/trunk/debian/rules Thu Jan 21 12:48:58 2010
@@ -70,9 +70,6 @@
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 	# Until upstream kill this stupid thing:
 	rm -f $(CURDIR)/debian/tmp/usr/sbin/dahdi_speed
-	# Remove this now-empty "man page".
-	# Re-add it when that program grows perldoc.
-	rm -rf $(CURDIR)/debian/tmp/usr/share/man/man8/twinstar.8*
 	# Revert upstream r5533:
 	rm -f $(CURDIR)/debian/tmp/usr/lib/libtonezone.so.1*