[Pkg-voip-commits] r6196 - in /opal/branches/experimental/debian: changelog control rules

msp at alioth.debian.org msp at alioth.debian.org
Thu Sep 11 12:34:41 UTC 2008 

Author: msp
Date: Thu Sep 11 12:34:40 2008
New Revision: 6196

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6196
Log:
* Switch to svn export
* svn REV checkout is controlled from debian/changelog version
* Update Description: to explict state this svn snapshot
* Ver 3.3.0 was tagged at REV=20681 thus this is 3.3.0+svnXXXX

Modified:
    opal/branches/experimental/debian/changelog
    opal/branches/experimental/debian/control
    opal/branches/experimental/debian/rules

Modified: opal/branches/experimental/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/opal/branches/experimental/debian/changelog?rev=6196&op=diff
==============================================================================
--- opal/branches/experimental/debian/changelog (original)
+++ opal/branches/experimental/debian/changelog Thu Sep 11 12:34:40 2008
@@ -1,10 +1,21 @@
-opal (0.svn20080816.dfsg-1) experimental; urgency=low
+opal (3.3.0+svn20930.dfsg-1.1) experimental; urgency=low
+
+  * Switch to svn export
+  * svn REV checkout is controlled from debian/changelog version
+  * Update Description: to explict state this svn snapshot
+
+ -- Mark Purcell <msp at debian.org>  Thu, 11 Sep 2008 22:33:41 +1000
+
+opal (3.3.0+svn20930.dfsg-1) experimental; urgency=low
 
   * First upload to debian.
 
+  [ Mark Purcell ]
+  * Ver 3.3.0 was tagged at REV=20681 thus this is 3.3.0+svnXXXX
+
  -- Eugen Dedu <Eugen.Dedu at pu-pm.univ-fcomte.fr>  Sun, 16 Aug 2008 00:00:00 +0200
 
-opal-snapshot (20080418-1) voip; urgency=low
+opal-snapshot (0-20080418-1) voip; urgency=low
 
   * Built from SVN snapshots.  No package support, please refer to
     irc.gimp.net channel #ekiga for support.  Do not complain about
@@ -12,7 +23,7 @@
 
  -- Eugen Dedu <Eugen.Dedu at pu-pm.univ-fcomte.fr>  Sun, 18 Apr 2008 00:00:00 +0200
 
-opal-snapshot (20071107-03-sid.2) voip-snapshots-debian-sid; urgency=high
+opal-snapshot (0-20071107-03-sid.2) voip-snapshots-debian-sid; urgency=high
 
   * This is the CVS version! Do not complain about these debs at Debian BTS!
 

Modified: opal/branches/experimental/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/opal/branches/experimental/debian/control?rev=6196&op=diff
==============================================================================
--- opal/branches/experimental/debian/control (original)
+++ opal/branches/experimental/debian/control Thu Sep 11 12:34:40 2008
@@ -2,21 +2,21 @@
 Section: libs
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
-Uploaders: Eugen Dedu <Eugen.Dedu at pu-pm.univ-fcomte.fr>
-Build-Depends: debhelper (>= 4.0.2), libpt-2.3-dev, dpatch, doxygen, autotools-dev, libspeex-dev, libspeexdsp-dev, pkg-config,  libtheora-dev
+Uploaders: Mark Purcell <msp at debian.org>, Eugen Dedu <Eugen.Dedu at pu-pm.univ-fcomte.fr>
+Build-Depends: debhelper (>= 4.0.2), libpt2.3-beta1-dev, dpatch, doxygen, autotools-dev, libspeex-dev, libspeexdsp-dev, pkg-config,  libtheora-dev
 Build-Conflicts: libopal-snapshot-dev, libopal-dev, libopal-2.2, libopal-2.2.0, libopal-2.2-ptrace, libopal-2.2-develop
 Standards-Version: 3.8.0.0
 Homepage: http://www.opalvoip.org/
 Vcs-Svn: svn://svn.debian.org/pkg-voip/opal/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/opal/?op=log
 
-Package: libopal-3.3
+Package: libopal-3.3 
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
 Conflicts: libopal-2.2-ptrace, libopal-2.2-develop, libopal-2.2.0, libopal-snapshot
 Replaces: libopal-snapshot
-Description: Open Phone Abstraction Library - successor of OpenH323
+Description: Open Phone Abstraction Library - successor of OpenH323 - svn snapshot
  This package contains the shared version of the OPAL library.
  .
  The OPAL project aims to create a full featured, interoperable, Open Source
@@ -30,7 +30,7 @@
 Conflicts: openmpi-dev, libopal-snapshot-dev
 Depends: libopal-3.3 (= ${binary:Version}), libpt-2.3-dev
 Replaces: libopal-snapshot-dev
-Description: OPAL library header files
+Description: OPAL library header files - svn snapshot
  This package contains the headers and a static version of the
  OPAL library.
  .
@@ -43,7 +43,7 @@
 Section: comm
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: Simple example from the OPAL project
+Description: Simple example from the OPAL project - svn snapshot
  This package contains a small H323 and SIP client given as an example. You
  can find its code on the doc package.
  .
@@ -59,7 +59,7 @@
 Replaces: libopal-snapshot-dbg
 Conflicts: libopal-snapshot-dbg
 Architecture: any
-Description: OPAL library debug symbols
+Description: OPAL library debug symbols - svn snapshot
  This package contains the shared and static debug symbols of the
  OPAL library.
  .
@@ -72,7 +72,7 @@
 Section: doc
 Priority: extra
 Architecture: all
-Description: OPAL library documentation files
+Description: OPAL library documentation files - svn snapshot
  This package contains the documentation and samples to program with
  the OPAL library.
  .

Modified: opal/branches/experimental/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/opal/branches/experimental/debian/rules?rev=6196&op=diff
==============================================================================
--- opal/branches/experimental/debian/rules (original)
+++ opal/branches/experimental/debian/rules Thu Sep 11 12:34:40 2008
@@ -1,5 +1,12 @@
 #!/usr/bin/make -f
 
+
+DEBVERSION := $(shell head -n 1 debian/changelog \
+                    | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
+UPVERSION := $(shell echo $(DEBVERSION) | sed -r -e 's/^.*://' -e 's/-[0-9.]*(\+b[0-9])?$$//' -e 's/.dfsg[0-9]*$$//')
+
+REV := $(shell echo $(UPVERSION) | sed -r -e 's/^.*svn//')
+#REV=20797
 
 # Change this on API breakage
 export LIBOPALCOMPAT=3.3
@@ -237,8 +244,9 @@
 print-version:
 	@@echo "Debian version:          $(DEBVERSION)"
 	@@echo "Upstream version:        $(UPVERSION)"
-
-REV=20797
+	@@echo "svn REV:                 $(REV)"
+
+
 get-orig-source:
 	@@dh_testdir
 	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
@@ -255,13 +263,13 @@
 	@@#$(RM) -rf ../tarballs/opal-$(UPVERSION).tmp/ ../tarballs/$(UPFILENAME)
 	@@#and this is for SVN
 	@@echo 'Checking out for repacking (might take 15 min) ...'
-	@@svn co https://opalvoip.svn.sourceforge.net/svnroot/opalvoip/opal/trunk@$(REV) ../tarballs/opal-$(REV).tmp
+	@@svn export https://opalvoip.svn.sourceforge.net/svnroot/opalvoip/opal/trunk@$(REV) ../tarballs/opal-$(REV).tmp
 	@@echo 'Getting the changelog (might take 15 min) ...'
 	@@cd ../tarballs/opal-$(REV).tmp; svn2cl -o changelog
 	@@echo Removing iLBC non-free code...
 	@@cd ../tarballs/opal-$(REV).tmp; rm -rf plugins/audio/iLBC
 	@@echo Creating the tarball ...
-	@@cd ../tarballs/opal-$(REV).tmp; find . -name .svn -exec rm -rf {} \; ; tar zcf ../opal.orig.tar.gz *
+	@@cd ../tarballs/opal-$(REV)tmp; tar zcf ../opal_$(UPVERSION).orig.tar.gz *
 	@@rm -rf ../tarballs/opal-$(REV).tmp
 	@@echo Ready for packaging.

More information about the Pkg-voip-commits mailing list