[Demudi-commits] r1036 - in libgig/trunk/debian: . patches

Wed Jan 24 11:34:20 CET 2007

Author: free-guest
Date: 2007-01-24 11:34:03 +0100 (Wed, 24 Jan 2007)
New Revision: 1036

Added:
   libgig/trunk/debian/patches/
   libgig/trunk/debian/patches/00_cvs-makefile.dpatch
   libgig/trunk/debian/patches/00list
   libgig/trunk/debian/patches/10_cvs-snapshot.dpatch
Modified:
   libgig/trunk/debian/changelog
   libgig/trunk/debian/control
   libgig/trunk/debian/rules
Log:
* Added makefile rule to package cvs snapshots

Modified: libgig/trunk/debian/changelog
===================================================================

--- libgig/trunk/debian/changelog	2007-01-22 12:35:21 UTC (rev 1035)
+++ libgig/trunk/debian/changelog	2007-01-24 10:34:03 UTC (rev 1036)
@@ -10,6 +10,7 @@
   [ Free Ekanayaka ]
   * Move libgig3c2 to libgig6 to reflect the so name change
   * Added myself to Uploaders
+  * Added makefile rule to package cvs snapshots
 
  -- Free Ekanayaka <freee at debian.org>  Sat, 13 Jan 2007 00:49:40 +0100
 

Modified: libgig/trunk/debian/control
===================================================================
--- libgig/trunk/debian/control	2007-01-22 12:35:21 UTC (rev 1035)
+++ libgig/trunk/debian/control	2007-01-24 10:34:03 UTC (rev 1036)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Matt Flax <flatmax at pgb.unsw.edu.au>
 Uploaders: Paul Brossier <piem at debian.org>, Free Ekanayaka <freee at debian.org>
-Build-Depends: debhelper (>= 4.0.0), pkg-config, libsndfile1-dev, doxygen
+Build-Depends: debhelper (>= 4.0.0), dpatch, pkg-config, libsndfile1-dev, doxygen, libtool, automake1.9
 Standards-Version: 3.7.2
 
 Package: libgig-dev

Added: libgig/trunk/debian/patches/00_cvs-makefile.dpatch
===================================================================
--- libgig/trunk/debian/patches/00_cvs-makefile.dpatch	2007-01-22 12:35:21 UTC (rev 1035)
+++ libgig/trunk/debian/patches/00_cvs-makefile.dpatch	2007-01-24 10:34:03 UTC (rev 1036)
@@ -0,0 +1,47 @@
+#! /bin/sh -e
+## 10cvs-snapshot.dpatch by Free Ekanayaka <freee at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi  
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+ at DPATCH@
+--- libgig-3.1.0.orig/Makefile.cvs	1970-01-01 01:00:00.000000000 +0100
++++ libgig/Makefile.cvs	2005-06-15 22:39:40.000000000 +0200
+@@ -0,0 +1,19 @@
++all:	configure
++
++configure:	configure.in Makefile.am \
++		src/Makefile.am man/Makefile.am doc/Makefile.am
++	@aclocal
++	@libtoolize --force --copy
++	@autoheader
++	@automake --add-missing --copy
++	@autoconf
++
++clean:
++	@if [ -f Makefile ]; then make distclean; fi || true
++	@rm -rvf *.cache *.log *.status *.m4
++	@rm -rvf src/Makefile.in src/config.h.in src/config.h src/stamp-h.*
++	@rm -rvf man/Makefile.in doc/Makefile.in doc/html debian/Makefile.in
++	@rm -rvf Makefile.in config.*
++	@rm -rvf missing install-sh mkinstalldirs depcomp ltmain.sh
++	@rm -rvf configure stamp-h.*
++	@rm -rvf Doxyfile

Added: libgig/trunk/debian/patches/00list
===================================================================
--- libgig/trunk/debian/patches/00list	2007-01-22 12:35:21 UTC (rev 1035)
+++ libgig/trunk/debian/patches/00list	2007-01-24 10:34:03 UTC (rev 1036)
@@ -0,0 +1 @@
+00_cvs-makefile
\ No newline at end of file

Added: libgig/trunk/debian/patches/10_cvs-snapshot.dpatch
===================================================================
--- libgig/trunk/debian/patches/10_cvs-snapshot.dpatch	2007-01-22 12:35:21 UTC (rev 1035)
+++ libgig/trunk/debian/patches/10_cvs-snapshot.dpatch	2007-01-24 10:34:03 UTC (rev 1036)
@@ -0,0 +1,29 @@
+#! /bin/sh -e
+## 10cvs-snapshot.dpatch by Free Ekanayaka <freee at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi  
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+ at DPATCH@
+Index: libgig/debian/changelog
+diff -u libgig/debian/changelog:1.11 libgig/debian/changelog:1.12
+Index: libgig/debian/rules
+diff -u libgig/debian/rules:1.5 libgig/debian/rules:1.6

Modified: libgig/trunk/debian/rules
===================================================================
--- libgig/trunk/debian/rules	2007-01-22 12:35:21 UTC (rev 1035)
+++ libgig/trunk/debian/rules	2007-01-24 10:34:03 UTC (rev 1036)
@@ -6,6 +6,12 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+DEBIAN_VERSION=$(shell dpkg-parsechangelog |grep ^Version: | cut -f 2 -d " ")
+UPSTREAM_VERSION=$(shell echo $(DEBIAN_VERSION) | sed -e 's/\(.*\)-.*/\1/g')
+DEBIAN_REVISION=$(shell echo $(DEBIAN_VERSION) | sed -e 's/.*-\([^\+]*\).*/\1/g')
+
+include /usr/share/dpatch/dpatch.make
+
 # This is the debhelper compatibility version to use.
 export DH_COMPAT=4
 
@@ -23,10 +29,14 @@
 	INSTALL_PROGRAM += -s
 endif
 
-config.status: configure
+config.status: patch-stamp
 	dh_testdir
 	# Add here commands to configure the package.
+ifneq (,$(findstring +cvs,$(DEBIAN_VERSION)))
+	$(MAKE) -f Makefile.cvs clean
+	$(MAKE) -f Makefile.cvs
 	chmod a+x configure
+endif
 	CXXFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
 
 
@@ -45,7 +55,7 @@
 
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	# Add here commands to clean up after the build process.
@@ -95,10 +105,19 @@
 #	dh_perl
 #	dh_python
 	dh_makeshlibs
+	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
 
+update-cvs-snapshot:
+
+	cat debian/patches/10_cvs-snapshot.dpatch | head -25 > debian/patches/10_cvs-snapshot.dpatch
+	cvs -z3 -d :pserver:anonymous at cvs.linuxsampler.org:/var/cvs/linuxsampler \
+		rdiff -u -r release$(shell echo $(UPSTREAM_VERSION) | tr "." "_") -D today libgig|\
+		filterdiff -x "debian/*" -p1  >> debian/patches/10_cvs-snapshot.dpatch
+	dch -v $(UPSTREAM_VERSION)-$(DEBIAN_REVISION)+cvs`date +%y%m%d` -m "New cvs snapshot"
+
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install


