[Pkg-voip-commits] r2494 - opal/branches/sarge/debian
opal/trunk/debian pwlib/branches/sarge/debian pwlib/trunk/debian
Kilian Krause
kilian at costa.debian.org
Sat Oct 7 14:35:06 UTC 2006
Author: kilian
Date: 2006-10-07 14:35:05 +0000 (Sat, 07 Oct 2006)
New Revision: 2494
Modified:
opal/branches/sarge/debian/changelog
opal/branches/sarge/debian/rules
opal/trunk/debian/changelog
opal/trunk/debian/rules
pwlib/branches/sarge/debian/changelog
pwlib/branches/sarge/debian/control
pwlib/branches/sarge/debian/copyright
pwlib/branches/sarge/debian/rules
pwlib/trunk/debian/changelog
pwlib/trunk/debian/control
pwlib/trunk/debian/rules
Log:
bump to new upstream version. The pwlib tarball needs to be DFSG-free'd
upstream still or we need to re-add the repacking. Will be decided tonight
hopefully.
Modified: opal/branches/sarge/debian/changelog
===================================================================
--- opal/branches/sarge/debian/changelog 2006-10-06 21:51:22 UTC (rev 2493)
+++ opal/branches/sarge/debian/changelog 2006-10-07 14:35:05 UTC (rev 2494)
@@ -1,9 +1,10 @@
-opal (2.2.2.dfsg-2) UNRELEASED; urgency=low
+opal (2.2.3.dfsg-1) UNRELEASED; urgency=low
* NOT RELEASED YET
* Rename configure target to config.status.
+ * New upstream release.
- -- Kilian Krause <kilian at debian.org> Thu, 15 Jun 2006 14:37:25 +0200
+ -- Kilian Krause <kilian at debian.org> Sat, 7 Oct 2006 15:16:35 +0200
opal (2.2.2.dfsg-1) unstable; urgency=low
Modified: opal/branches/sarge/debian/rules
===================================================================
--- opal/branches/sarge/debian/rules 2006-10-06 21:51:22 UTC (rev 2493)
+++ opal/branches/sarge/debian/rules 2006-10-07 14:35:05 UTC (rev 2494)
@@ -6,6 +6,7 @@
export LIBOPALCOMPAT=2.2.0
export LIBOPALCOMPAT2=2.2.1
export LIBOPALCOMPAT3=2.1.3
+export LIBOPALCOMPAT4=2.2.2
PACKAGE=libopal-$(LIBOPALCOMPAT)
@@ -35,7 +36,7 @@
FILENAME := opal_$(UPVERSION).dfsg.orig.tar.gz
UPFILENAME := opal_$(UPVERSION).orig.tar.gz
-URL := http://www.voxgratia.org/releases/opal-v$(URLVERSION)-src-tar.gz
+URL := http://www.voxgratia.org/releases/opal-v$(URLVERSION)-src.tar.gz
build: build-arch build-indep
@@ -139,10 +140,14 @@
ln -s libopal.so.$(SHLIBSVER) \
debian/$(PACKAGE)/usr/lib/libopal.so.$(LIBOPALCOMPAT3)
endif
+ifneq ($(SHLIBSVER),$(LIBOPALCOMPAT4))
+ ln -s libopal.so.$(SHLIBSVER) \
+ debian/$(PACKAGE)/usr/lib/libopal.so.$(LIBOPALCOMPAT4)
+endif
$(MAKE) $(MAKE_BUILD_PARAM) INSTALL_DIR=$(CURDIR)/debian/simpleopal/usr -C samples/simple install
# clean simple to install it as a sample in the docs
$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
- -rmdir samples/simple/obj*
+ -$(RM) -rf samples/simple/obj_*
# libopal-dev package
dh_movefiles --sourcedir=debian/$(PACKAGE) -plibopal-dev `cd debian/$(PACKAGE); ls -1 usr/lib/*.so` usr/include
@@ -217,11 +222,12 @@
@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
@@echo Downloading $(UPFILENAME) from $(URL) ...
@@wget -N -nv -T10 -t3 -O ../tarballs/$(UPFILENAME) $(URL)
- @@echo Repacking as DFSG-free...
+ @@echo Repacking as DFSG-free (removing iLBC)...
@@mkdir -p ../tarballs/opal-$(UPVERSION).tmp/
@@cd ../tarballs/opal-$(UPVERSION).tmp ; \
tar xfz ../$(UPFILENAME)
@@rm -rf ../tarballs/opal-$(UPVERSION).tmp/opal*/src/codec/iLBC
+ @@echo Writing archive ../tarballs/$(FILENAME) ...
@@cd ../tarballs/opal-$(UPVERSION).tmp ; \
tar cfz ../$(FILENAME) *
@@echo Cleaning up...
Modified: opal/trunk/debian/changelog
===================================================================
--- opal/trunk/debian/changelog 2006-10-06 21:51:22 UTC (rev 2493)
+++ opal/trunk/debian/changelog 2006-10-07 14:35:05 UTC (rev 2494)
@@ -1,9 +1,10 @@
-opal (2.2.2.dfsg-2) UNRELEASED; urgency=low
+opal (2.2.3.dfsg-1) UNRELEASED; urgency=low
* NOT RELEASED YET
* Rename configure target to config.status.
+ * New upstream release.
- -- Kilian Krause <kilian at debian.org> Thu, 15 Jun 2006 14:37:25 +0200
+ -- Kilian Krause <kilian at debian.org> Sat, 7 Oct 2006 15:16:35 +0200
opal (2.2.2.dfsg-1) unstable; urgency=low
Modified: opal/trunk/debian/rules
===================================================================
--- opal/trunk/debian/rules 2006-10-06 21:51:22 UTC (rev 2493)
+++ opal/trunk/debian/rules 2006-10-07 14:35:05 UTC (rev 2494)
@@ -6,6 +6,7 @@
export LIBOPALCOMPAT=2.2.0
export LIBOPALCOMPAT2=2.2.1
export LIBOPALCOMPAT3=2.1.3
+export LIBOPALCOMPAT4=2.2.2
PACKAGE=libopal-$(LIBOPALCOMPAT)
@@ -35,7 +36,7 @@
FILENAME := opal_$(UPVERSION).dfsg.orig.tar.gz
UPFILENAME := opal_$(UPVERSION).orig.tar.gz
-URL := http://www.voxgratia.org/releases/opal-v$(URLVERSION)-src-tar.gz
+URL := http://www.voxgratia.org/releases/opal-v$(URLVERSION)-src.tar.gz
build: build-arch build-indep
@@ -139,10 +140,14 @@
ln -s libopal.so.$(SHLIBSVER) \
debian/$(PACKAGE)/usr/lib/libopal.so.$(LIBOPALCOMPAT3)
endif
+ifneq ($(SHLIBSVER),$(LIBOPALCOMPAT4))
+ ln -s libopal.so.$(SHLIBSVER) \
+ debian/$(PACKAGE)/usr/lib/libopal.so.$(LIBOPALCOMPAT4)
+endif
$(MAKE) $(MAKE_BUILD_PARAM) INSTALL_DIR=$(CURDIR)/debian/simpleopal/usr -C samples/simple install
# clean simple to install it as a sample in the docs
$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
- -rmdir samples/simple/obj*
+ -$(RM) -rf samples/simple/obj_*
# libopal-dev package
dh_movefiles --sourcedir=debian/$(PACKAGE) -plibopal-dev `cd debian/$(PACKAGE); ls -1 usr/lib/*.so` usr/include
@@ -217,11 +222,12 @@
@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
@@echo Downloading $(UPFILENAME) from $(URL) ...
@@wget -N -nv -T10 -t3 -O ../tarballs/$(UPFILENAME) $(URL)
- @@echo Repacking as DFSG-free...
+ @@echo Repacking as DFSG-free (removing iLBC)...
@@mkdir -p ../tarballs/opal-$(UPVERSION).tmp/
@@cd ../tarballs/opal-$(UPVERSION).tmp ; \
tar xfz ../$(UPFILENAME)
@@rm -rf ../tarballs/opal-$(UPVERSION).tmp/opal*/src/codec/iLBC
+ @@echo Writing archive ../tarballs/$(FILENAME) ...
@@cd ../tarballs/opal-$(UPVERSION).tmp ; \
tar cfz ../$(FILENAME) *
@@echo Cleaning up...
Modified: pwlib/branches/sarge/debian/changelog
===================================================================
--- pwlib/branches/sarge/debian/changelog 2006-10-06 21:51:22 UTC (rev 2493)
+++ pwlib/branches/sarge/debian/changelog 2006-10-07 14:35:05 UTC (rev 2494)
@@ -1,9 +1,19 @@
-pwlib (1.10.1.dfsg-2) UNRELEASED; urgency=low
+pwlib (1.10.2-1) UNRELEASED; urgency=low
* NOT RELEASED YET
+ * New upstream release. No more dfsg-repack should be needed, RFC files
+ deleted upstream.
+
+ [ Kilian Krause ]
* Rename configure target to config.status
+ * Updated Homepage to www.voxgratia.org in package descriptions
+ (Closes: #383173)
+ * Document that libpt-dbg is only debug symbols. Eventually this should
+ become a switch in the debian/rules to make debug-compile one simple
+ rebuild for the user or even automagically be added to more powerful
+ platforms. (Closes: #345511)
- -- Kilian Krause <kilian at debian.org> Thu, 15 Jun 2006 14:38:26 +0200
+ -- Kilian Krause <kilian at debian.org> Sat, 7 Oct 2006 14:30:18 +0200
pwlib (1.10.1.dfsg-1) unstable; urgency=low
Modified: pwlib/branches/sarge/debian/control
===================================================================
--- pwlib/branches/sarge/debian/control 2006-10-06 21:51:22 UTC (rev 2493)
+++ pwlib/branches/sarge/debian/control 2006-10-07 14:35:05 UTC (rev 2494)
@@ -21,7 +21,7 @@
Unix X-Window systems.
.
For more information on PWLib visit the development homepage
- http://www.openh323.org/
+ http://www.voxgratia.org/
Package: libpt-dev
Section: libdevel
@@ -34,7 +34,7 @@
Microsoft Windows and Unix X-Window systems.
.
For more information on PWLib visit the development homepage
- http://www.openh323.org/
+ http://www.voxgratia.org/
Package: libpt-dbg
Section: libdevel
@@ -42,13 +42,15 @@
Architecture: any
Depends: libpt-1.10.0 (= ${Source-Version})
Description: Portable Windows Library development debug files
- This package contains the shared and static debug version of the library
+ This package contains the shared and static debug symbols of the library
PWLib, which is a moderately large class library that has its genesis
many years ago as a method to produce applications to run on both
- Microsoft Windows and Unix X-Window systems.
+ Microsoft Windows and Unix X-Window systems. This is not the debug compiled
+ version of PWLib which would yield much more detailled information as a
+ compromise of benefit and compile power consumption.
.
For more information on PWLib visit the development homepage
- http://www.openh323.org/
+ http://www.voxgratia.org/
Package: libpt-doc
Section: doc
@@ -61,7 +63,7 @@
Microsoft Windows and Unix X-Window systems.
.
For more information on PWLib visit the development homepage
- http://www.openh323.org/
+ http://www.voxgratia.org/
Package: libpt-plugins-v4l
Section: libs
Modified: pwlib/branches/sarge/debian/copyright
===================================================================
--- pwlib/branches/sarge/debian/copyright 2006-10-06 21:51:22 UTC (rev 2493)
+++ pwlib/branches/sarge/debian/copyright 2006-10-07 14:35:05 UTC (rev 2494)
@@ -17,6 +17,8 @@
http://sourceforge.net/projects/openh323
+The files samples/xmpptest/draft-ietf* have been removed to make this
+package comply with the Debian Free Software Guidelines (DFSG)
Copyright:
Modified: pwlib/branches/sarge/debian/rules
===================================================================
--- pwlib/branches/sarge/debian/rules 2006-10-06 21:51:22 UTC (rev 2493)
+++ pwlib/branches/sarge/debian/rules 2006-10-07 14:35:05 UTC (rev 2494)
@@ -5,6 +5,7 @@
# Change this on API breakage
export LIBPTCOMPAT=1.9.3
export LIBPTCOMPAT2=1.10.0
+export LIBPTCOMPAT3=1.10.1
#PACKAGE=libpt-$(LIBPTCOMPAT)
PACKAGE=libpt-1.10.0
@@ -48,7 +49,7 @@
FILENAME := pwlib_$(UPVERSION).dfsg.orig.tar.gz
UPFILENAME := pwlib_$(UPVERSION).orig.tar.gz
-URL := http://www.voxgratia.org/releases/pwlib-v$(URLVERSION)-src-tar.gz
+URL := http://www.voxgratia.org/releases/pwlib-v$(URLVERSION)-src.tar.gz
include /usr/share/dpatch/dpatch.make
@@ -138,6 +139,10 @@
ln -s libpt.so.$(SHLIBSVER) \
debian/$(PACKAGE)/usr/lib/libpt.so.$(LIBPTCOMPAT2)
endif
+ifneq ($(SHLIBSVER),$(LIBPTCOMPAT3))
+ ln -s libpt.so.$(SHLIBSVER) \
+ debian/$(PACKAGE)/usr/lib/libpt.so.$(LIBPTCOMPAT3)
+endif
# libpt-dev
dh_movefiles -plibpt-dev --sourcedir=debian/$(PACKAGE) usr/lib/libpt.so
@@ -269,17 +274,29 @@
get-orig-source:
@@dh_testdir
@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
- @@echo Downloading $(UPFILENAME) from $(URL) ...
+ifneq (,$(findstring dfsg,$(DEBVERSION)))
+ @@echo Downloading $(UPFILENAME) from $(URL) for repacking ...
@@wget -N -nv -T10 -t3 -O ../tarballs/$(UPFILENAME) $(URL)
@@echo Repacking as DFSG-free...
@@mkdir -p ../tarballs/pwlib-$(UPVERSION).tmp/
@@cd ../tarballs/pwlib-$(UPVERSION).tmp ; \
tar xfz ../$(UPFILENAME)
@@rm -f ../tarballs/pwlib-$(UPVERSION).tmp/pwlib*/samples/xmpptest/draft-ietf-*
+ @@echo Writing archive ../tarballs/$(FILENAME)
@@cd ../tarballs/pwlib-$(UPVERSION).tmp ; \
tar cfz ../$(FILENAME) *
@@echo Cleaning up...
@@$(RM) -rf ../tarballs/pwlib-$(UPVERSION).tmp/
+else
+ @@echo Downloading $(UPFILENAME) from $(URL) ...
+ @@wget -N -nv -T10 -t3 -O ../tarballs/$(UPFILENAME) $(URL)
+ @@if ( tar tfvz ../tarballs/$(UPFILENAME)|grep -q draft-ietf- );then \
+ echo Upstream release not DFSG-clean, removing.; \
+ $(RM) ../tarballs/$(UPFILENAME);false; \
+ else \
+ echo Ready for packaging.;\
+ fi
+endif
binary: binary-arch binary-indep
.PHONY: build clean clean-patched binary-indep binary-arch binary install install-indep install-arch
Modified: pwlib/trunk/debian/changelog
===================================================================
--- pwlib/trunk/debian/changelog 2006-10-06 21:51:22 UTC (rev 2493)
+++ pwlib/trunk/debian/changelog 2006-10-07 14:35:05 UTC (rev 2494)
@@ -1,11 +1,19 @@
-pwlib (1.10.1.dfsg-2) UNRELEASED; urgency=low
+pwlib (1.10.2-1) UNRELEASED; urgency=low
* NOT RELEASED YET
+ * New upstream release. No more dfsg-repack should be needed, RFC files
+ deleted upstream.
[ Kilian Krause ]
* Rename configure target to config.status
+ * Updated Homepage to www.voxgratia.org in package descriptions
+ (Closes: #383173)
+ * Document that libpt-dbg is only debug symbols. Eventually this should
+ become a switch in the debian/rules to make debug-compile one simple
+ rebuild for the user or even automagically be added to more powerful
+ platforms. (Closes: #345511)
- -- Kilian Krause <kilian at debian.org> Thu, 6 Jul 2006 20:12:35 +0100
+ -- Kilian Krause <kilian at debian.org> Sat, 7 Oct 2006 14:30:18 +0200
pwlib (1.10.1.dfsg-1) unstable; urgency=low
Modified: pwlib/trunk/debian/control
===================================================================
--- pwlib/trunk/debian/control 2006-10-06 21:51:22 UTC (rev 2493)
+++ pwlib/trunk/debian/control 2006-10-07 14:35:05 UTC (rev 2494)
@@ -21,7 +21,7 @@
Unix X-Window systems.
.
For more information on PWLib visit the development homepage
- http://www.openh323.org/
+ http://www.voxgratia.org/
Package: libpt-dev
Section: libdevel
@@ -34,7 +34,7 @@
Microsoft Windows and Unix X-Window systems.
.
For more information on PWLib visit the development homepage
- http://www.openh323.org/
+ http://www.voxgratia.org/
Package: libpt-dbg
Section: libdevel
@@ -42,13 +42,15 @@
Architecture: any
Depends: libpt-1.10.0 (= ${Source-Version})
Description: Portable Windows Library development debug files
- This package contains the shared and static debug version of the library
+ This package contains the shared and static debug symbols of the library
PWLib, which is a moderately large class library that has its genesis
many years ago as a method to produce applications to run on both
- Microsoft Windows and Unix X-Window systems.
+ Microsoft Windows and Unix X-Window systems. This is not the debug compiled
+ version of PWLib which would yield much more detailled information as a
+ compromise of benefit and compile power consumption.
.
For more information on PWLib visit the development homepage
- http://www.openh323.org/
+ http://www.voxgratia.org/
Package: libpt-doc
Section: doc
@@ -61,7 +63,7 @@
Microsoft Windows and Unix X-Window systems.
.
For more information on PWLib visit the development homepage
- http://www.openh323.org/
+ http://www.voxgratia.org/
Package: libpt-plugins-v4l
Section: libs
Modified: pwlib/trunk/debian/rules
===================================================================
--- pwlib/trunk/debian/rules 2006-10-06 21:51:22 UTC (rev 2493)
+++ pwlib/trunk/debian/rules 2006-10-07 14:35:05 UTC (rev 2494)
@@ -5,6 +5,7 @@
# Change this on API breakage
export LIBPTCOMPAT=1.9.3
export LIBPTCOMPAT2=1.10.0
+export LIBPTCOMPAT3=1.10.1
#PACKAGE=libpt-$(LIBPTCOMPAT)
PACKAGE=libpt-1.10.0
@@ -48,7 +49,7 @@
FILENAME := pwlib_$(UPVERSION).dfsg.orig.tar.gz
UPFILENAME := pwlib_$(UPVERSION).orig.tar.gz
-URL := http://www.voxgratia.org/releases/pwlib-v$(URLVERSION)-src-tar.gz
+URL := http://www.voxgratia.org/releases/pwlib-v$(URLVERSION)-src.tar.gz
include /usr/share/dpatch/dpatch.make
@@ -138,6 +139,10 @@
ln -s libpt.so.$(SHLIBSVER) \
debian/$(PACKAGE)/usr/lib/libpt.so.$(LIBPTCOMPAT2)
endif
+ifneq ($(SHLIBSVER),$(LIBPTCOMPAT3))
+ ln -s libpt.so.$(SHLIBSVER) \
+ debian/$(PACKAGE)/usr/lib/libpt.so.$(LIBPTCOMPAT3)
+endif
# libpt-dev
dh_movefiles -plibpt-dev --sourcedir=debian/$(PACKAGE) usr/lib/libpt.so
@@ -269,17 +274,29 @@
get-orig-source:
@@dh_testdir
@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
- @@echo Downloading $(UPFILENAME) from $(URL) ...
+ifneq (,$(findstring dfsg,$(DEBVERSION)))
+ @@echo Downloading $(UPFILENAME) from $(URL) for repacking ...
@@wget -N -nv -T10 -t3 -O ../tarballs/$(UPFILENAME) $(URL)
@@echo Repacking as DFSG-free...
@@mkdir -p ../tarballs/pwlib-$(UPVERSION).tmp/
@@cd ../tarballs/pwlib-$(UPVERSION).tmp ; \
tar xfz ../$(UPFILENAME)
@@rm -f ../tarballs/pwlib-$(UPVERSION).tmp/pwlib*/samples/xmpptest/draft-ietf-*
+ @@echo Writing archive ../tarballs/$(FILENAME)
@@cd ../tarballs/pwlib-$(UPVERSION).tmp ; \
tar cfz ../$(FILENAME) *
@@echo Cleaning up...
@@$(RM) -rf ../tarballs/pwlib-$(UPVERSION).tmp/
+else
+ @@echo Downloading $(UPFILENAME) from $(URL) ...
+ @@wget -N -nv -T10 -t3 -O ../tarballs/$(UPFILENAME) $(URL)
+ @@if ( tar tfvz ../tarballs/$(UPFILENAME)|grep -q draft-ietf- );then \
+ echo Upstream release not DFSG-clean, removing.; \
+ $(RM) ../tarballs/$(UPFILENAME);false; \
+ else \
+ echo Ready for packaging.;\
+ fi
+endif
binary: binary-arch binary-indep
.PHONY: build clean clean-patched binary-indep binary-arch binary install install-indep install-arch
More information about the Pkg-voip-commits
mailing list