[Pkg-voip-commits] r4446 - in /pwlib/trunk/debian: backports/dapper backports/sarge changelog compat control rules

kilian at alioth.debian.org kilian at alioth.debian.org
Sun Sep 9 15:27:22 UTC 2007 

Author: kilian
Date: Sun Sep  9 15:27:22 2007
New Revision: 4446

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=4446
Log:
* Don't set DH_COMPAT, use debian/compat
* Remove last ignore make clean error. 

Added:
    pwlib/trunk/debian/compat
Modified:
    pwlib/trunk/debian/backports/dapper
    pwlib/trunk/debian/backports/sarge
    pwlib/trunk/debian/changelog
    pwlib/trunk/debian/control
    pwlib/trunk/debian/rules

Modified: pwlib/trunk/debian/backports/dapper
URL: http://svn.debian.org/wsvn/pkg-voip/pwlib/trunk/debian/backports/dapper?rev=4446&op=diff
==============================================================================
--- pwlib/trunk/debian/backports/dapper (original)
+++ pwlib/trunk/debian/backports/dapper Sun Sep  9 15:27:22 2007
@@ -5,7 +5,7 @@
 # Target dist: Ubuntu Dapper
 
 # Downgrade to debhelper 4 compat
-sed -i -e 's#^\(.*DH_COMPAT\)=.*$#\1=4#' debian/rules
+echo 4 >debian/compat
 sed -i -e  's#^\(Build-Depends:.*\)debhelper[^,$]*[\ ,$]\+\(.*\)$#\1debhelper (>= 4.2.32), \2#' debian/control
 
 # Undo binary:Version and source:Version

Modified: pwlib/trunk/debian/backports/sarge
URL: http://svn.debian.org/wsvn/pkg-voip/pwlib/trunk/debian/backports/sarge?rev=4446&op=diff
==============================================================================
--- pwlib/trunk/debian/backports/sarge (original)
+++ pwlib/trunk/debian/backports/sarge Sun Sep  9 15:27:22 2007
@@ -5,7 +5,7 @@
 # Target dist: Debian Sarge
 
 # Downgrade to debhelper 4 compat
-sed -i -e 's#^\(.*DH_COMPAT\)=.*$#\1=4#' debian/rules
+echo 4 >debian/compat
 sed -i -e  's#^\(Build-Depends:.*\)debhelper[^,$]*[\ ,$]\+\(.*\)$#\1debhelper (>= 4.2.32), \2#' debian/control
 
 # Use libdc1394-11-dev for DC1394

Modified: pwlib/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/pwlib/trunk/debian/changelog?rev=4446&op=diff
==============================================================================
--- pwlib/trunk/debian/changelog (original)
+++ pwlib/trunk/debian/changelog Sun Sep  9 15:27:22 2007
@@ -8,13 +8,15 @@
   * Remove get-orig-source until upstream provides the tarball on their
     website again.
   * Fixup debian/watch.
+  * Don't set DH_COMPAT, use debian/compat
+  * Remove last ignore make clean error. 
 
   [ Faidon Liambotis ]
   * Adapt shlibs to depend on the upstream's version number and not the Debian
     version number, since we don't extend the ABI. This also imitates
     debhelper's behavior.
 
- -- Kilian Krause <kilian at debian.org>  Fri, 24 Aug 2007 16:57:29 +0200
+ -- Kilian Krause <kilian at debian.org>  Sun,  9 Sep 2007 17:25:59 +0200
 
 pwlib (1.10.7~dfsg1-4) unstable; urgency=high
 

Added: pwlib/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-voip/pwlib/trunk/debian/compat?rev=4446&op=file
==============================================================================
--- pwlib/trunk/debian/compat (added)
+++ pwlib/trunk/debian/compat Sun Sep  9 15:27:22 2007
@@ -1,0 +1,1 @@
+5

Modified: pwlib/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/pwlib/trunk/debian/control?rev=4446&op=diff
==============================================================================
--- pwlib/trunk/debian/control (original)
+++ pwlib/trunk/debian/control Sun Sep  9 15:27:22 2007
@@ -7,8 +7,8 @@
 Build-Depends-Indep: doxygen
 Build-Conflicts: libpt-1.10.0, libpt-1.10.0-ptrace, libpt-1.10.0-develop, libpt-1.8.7, libpt-1.8.3, libpt-1.8.3c2, libpt-1.8.3c2a, libpt-dev
 Standards-Version: 3.6.2
-XS-Vcs-Svn: svn://svn.debian.org/pkg-voip/
-XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/
+XS-Vcs-Svn: svn://svn.debian.org/pkg-voip/pwlib/trunk
+XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/pwlib/?op=log
 
 Package: libpt-1.10.0
 Section: libs

Modified: pwlib/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/pwlib/trunk/debian/rules?rev=4446&op=diff
==============================================================================
--- pwlib/trunk/debian/rules (original)
+++ pwlib/trunk/debian/rules Sun Sep  9 15:27:22 2007
@@ -1,6 +1,4 @@
 #!/usr/bin/make -f
-
-export DH_COMPAT=5
 
 # Change this on API breakage
 export LIBPTCOMPAT=1.9.3
@@ -50,8 +48,7 @@
 DEBVERSION := $(shell head -n 1 debian/changelog \
 		    | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
 UPVERSION := $(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/~dfsg[0-9]*$$//')
-#URLVERSION := $(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/~dfsg$$//' -e 's/\./_/g')
-URLVERSION := $(UPVERSION)
+URLVERSION := $(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/~dfsg[0-9]*$$//' -e 's/\./_/g')
 
 FILENAME := pwlib_$(UPVERSION)~dfsg1.orig.tar.gz
 UPFILENAME := pwlib_$(UPVERSION).orig.tar.gz
@@ -111,7 +108,7 @@
 	
 	# then we ensure that the fresh build works with hello world.
 	# ...in static
-	-$(MAKE) PWLIBDIR=$(CURDIR) -C samples/hello_world/ clean
+	$(MAKE) PWLIBDIR=$(CURDIR) -C samples/hello_world/ clean
 	$(RM) -rf samples/hello_world/obj_*
 	$(MAKE) PWLIBDIR=$(CURDIR) CFLAGS="$(CFLAGS)" -C samples/hello_world/ DEBUG= P_SHAREDLIB=0 OBJDIR_SUFFIX=n PW_LIBDIR=$(CURDIR)/lib/notrace optnoshared
 	
@@ -353,7 +350,7 @@
 	dh_compress
 	dh_fixperms
 	# a new variable will be needed if an epoch is introduced to our versioning
-	dh_makeshlibs -V '$(PACKAGE) (>= $(UPVERSION)) | $(PACKAGE)-ptrace (>= $(UPVERSION)) | $(PACKAGE)-develop (>= $(UPVERSION))'
+	dh_makeshlibs -V '$(PACKAGE) (>= $(UPVERSION)~) | $(PACKAGE)-ptrace (>= $(UPVERSION)~) | $(PACKAGE)-develop (>= $(UPVERSION)~)'
 	dh_installdeb
 	dh_shlibdeps -L $(PACKAGE) -l debian/$(PACKAGE)/usr/lib
 	dh_gencontrol

More information about the Pkg-voip-commits mailing list