[SCM] templates for different package types branch, master, updated. bfe27ecaeebebaaff503176871d14b7a02d33e74

Miriam Ruiz miriam at debian.org
Tue Nov 23 01:57:22 UTC 2010


The following commit has been merged in the master branch:
commit bfe27ecaeebebaaff503176871d14b7a02d33e74
Author: Miriam Ruiz <miriam at debian.org>
Date:   Tue Nov 23 02:57:25 2010 +0100

    Removed call to sng
    Added quilt to build deps

diff --git a/model/autotools-lib/control b/model/autotools-lib/control
index 3fee341..f2970ba 100644
--- a/model/autotools-lib/control
+++ b/model/autotools-lib/control
@@ -2,7 +2,7 @@ Source: %PACKAGE%
 Section: unknown
 Priority: extra
 Maintainer: %DEBNAME% <%DEBEMAIL%>
-Build-Depends: debhelper (>= 7), dh-buildinfo, autotools-dev
+Build-Depends: debhelper (>= 7), dh-buildinfo, quilt, autotools-dev
 Standards-Version: 3.9.1
 Homepage: URL://HOMEPAGE
 
diff --git a/model/autotools-lib/rules b/model/autotools-lib/rules
index 2205ba3..8ffa90b 100644
--- a/model/autotools-lib/rules
+++ b/model/autotools-lib/rules
@@ -26,7 +26,6 @@ config: config-stamp
 config-stamp: 
 	dh_testdir
 	[ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make patch
-	[ ! -d debian/pixmaps ] || { cd debian/pixmaps && for i in *.sng; do sng "$$i"; done; }
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub
 endif
@@ -55,7 +54,6 @@ clean: config
 	[ ! -f Makefile ] || $(MAKE) distclean
 	rm -f config.sub config.guess config.cache config.log
 	[ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make unpatch
-	[ ! -d debian/pixmaps ] || rm -vf debian/pixmaps/*.png
 	dh_clean
 
 install: build
diff --git a/model/autotools/control b/model/autotools/control
index ca1697a..52e450f 100644
--- a/model/autotools/control
+++ b/model/autotools/control
@@ -2,7 +2,7 @@ Source: %PACKAGE%
 Section: unknown
 Priority: extra
 Maintainer: %DEBNAME% <%DEBEMAIL%>
-Build-Depends: debhelper (>= 7), dh-buildinfo, autotools-dev
+Build-Depends: debhelper (>= 7), dh-buildinfo, quilt, autotools-dev
 Standards-Version: 3.9.1
 Homepage: URL://HOMEPAGE
 
diff --git a/model/autotools/rules b/model/autotools/rules
index 637a483..3c2a941 100644
--- a/model/autotools/rules
+++ b/model/autotools/rules
@@ -17,7 +17,6 @@ config: config-stamp
 config-stamp: 
 	dh_testdir
 	[ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make patch
-	[ ! -d debian/pixmaps ] || { cd debian/pixmaps && for i in *.sng; do sng "$$i"; done; }
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub
 endif
@@ -46,7 +45,6 @@ clean: config
 	[ ! -f Makefile ] || $(MAKE) distclean
 	rm -f config.sub config.guess config.cache config.log
 	[ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make unpatch
-	[ ! -d debian/pixmaps ] || rm -vf debian/pixmaps/*.png
 	dh_clean
 
 install: build
diff --git a/model/c-exe/control b/model/c-exe/control
index ceb6410..3a512de 100644
--- a/model/c-exe/control
+++ b/model/c-exe/control
@@ -2,7 +2,7 @@ Source: %PACKAGE%
 Section: unknown
 Priority: extra
 Maintainer: %DEBNAME% <%DEBEMAIL%>
-Build-Depends: debhelper (>= 7), dh-buildinfo, autotools-dev
+Build-Depends: debhelper (>= 7), dh-buildinfo, quilt, autotools-dev
 Standards-Version: 3.9.1
 Homepage: URL://HOMEPAGE
 
diff --git a/model/c-exe/rules b/model/c-exe/rules
index 8da2e2a..8656cd8 100755
--- a/model/c-exe/rules
+++ b/model/c-exe/rules
@@ -7,7 +7,6 @@ config: config-stamp
 config-stamp: 
 	dh_testdir
 	[ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make patch
-	[ ! -d debian/pixmaps ] || { cd debian/pixmaps && for i in *.sng; do sng "$$i"; done; }
 	touch $@
 
 build: build-stamp
@@ -24,7 +23,6 @@ clean: config
 	rm -f build-stamp config-stamp
 	$(MAKE) -f debian/Makefile clean
 	[ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make unpatch
-	[ ! -d debian/pixmaps ] || rm -vf debian/pixmaps/*.png
 	dh_clean
 
 install: build
diff --git a/model/c-lib/control b/model/c-lib/control
index 67eb4a8..f615155 100644
--- a/model/c-lib/control
+++ b/model/c-lib/control
@@ -2,7 +2,7 @@ Source: %PACKAGE%
 Section: unknown
 Priority: extra
 Maintainer: %DEBNAME% <%DEBEMAIL%>
-Build-Depends: debhelper (>= 7), dh-buildinfo, autotools-dev
+Build-Depends: debhelper (>= 7), dh-buildinfo, quilt, autotools-dev
 Standards-Version: 3.9.1
 Homepage: URL://HOMEPAGE
 
diff --git a/model/c-lib/rules b/model/c-lib/rules
index 802b5e8..a122b5e 100755
--- a/model/c-lib/rules
+++ b/model/c-lib/rules
@@ -7,7 +7,6 @@ config: config-stamp
 config-stamp: 
 	dh_testdir
 	[ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make patch
-	[ ! -d debian/pixmaps ] || { cd debian/pixmaps && for i in *.sng; do sng "$$i"; done; }
 	touch $@
 
 build: build-stamp
@@ -24,7 +23,6 @@ clean: config
 	rm -f build-stamp config-stamp
 	$(MAKE) -f debian/Makefile clean
 	[ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make unpatch
-	[ ! -d debian/pixmaps ] || rm -vf debian/pixmaps/*.png
 	dh_clean
 
 install: build
diff --git a/model/cmake-lib/control b/model/cmake-lib/control
index 66e5c72..c8d401e 100644
--- a/model/cmake-lib/control
+++ b/model/cmake-lib/control
@@ -2,7 +2,7 @@ Source: %PACKAGE%
 Section: unknown
 Priority: extra
 Maintainer: %DEBNAME% <%DEBEMAIL%>
-Build-Depends: debhelper (>= 7), cmake, dh-buildinfo
+Build-Depends: debhelper (>= 7), cmake, dh-buildinfo, quilt
 Standards-Version: 3.9.1
 Homepage: URL://HOMEPAGE
 
diff --git a/model/cmake-lib/rules b/model/cmake-lib/rules
index adf610b..e3e8797 100644
--- a/model/cmake-lib/rules
+++ b/model/cmake-lib/rules
@@ -9,7 +9,6 @@ config: config-stamp
 config-stamp: 
 	dh_testdir
 	[ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make patch
-	[ ! -d debian/pixmaps ] || { cd debian/pixmaps && for i in *.sng; do sng "$$i"; done; }
 	# Perform an out-of-tree build to keep a clean source tree
 	mkdir $(BUILD_TREE)
 	cd $(BUILD_TREE); cmake $(CURDIR)/ \
@@ -35,7 +34,6 @@ clean:
 	rm -f build-stamp config-stamp
 	rm -fr $(BUILD_TREE)
 	[ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make unpatch
-	[ ! -d debian/pixmaps ] || rm -vf debian/pixmaps/*.png
 	dh_clean
 
 install: build
diff --git a/model/cmake/control b/model/cmake/control
index 9723db2..0a38429 100644
--- a/model/cmake/control
+++ b/model/cmake/control
@@ -2,7 +2,7 @@ Source: %PACKAGE%
 Section: unknown
 Priority: extra
 Maintainer: %DEBNAME% <%DEBEMAIL%>
-Build-Depends: debhelper (>= 7), cmake, dh-buildinfo
+Build-Depends: debhelper (>= 7), cmake, dh-buildinfo, quilt
 Standards-Version: 3.9.1
 Homepage: URL://HOMEPAGE
 
diff --git a/model/cmake/rules b/model/cmake/rules
index b986c44..104780a 100644
--- a/model/cmake/rules
+++ b/model/cmake/rules
@@ -9,7 +9,6 @@ config: config-stamp
 config-stamp: 
 	dh_testdir
 	[ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make patch
-	[ ! -d debian/pixmaps ] || { cd debian/pixmaps && for i in *.sng; do sng "$$i"; done; }
 	# Perform an out-of-tree build to keep a clean source tree
 	mkdir $(BUILD_TREE)
 	cd $(BUILD_TREE); cmake $(CURDIR)/ \
@@ -35,7 +34,6 @@ clean:
 	rm -f build-stamp config-stamp
 	rm -fr $(BUILD_TREE)
 	[ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make unpatch
-	[ ! -d debian/pixmaps ] || rm -vf debian/pixmaps/*.png
 	dh_clean
 
 install: build
diff --git a/model/makefile/control b/model/makefile/control
index 1f4f23e..2f3231d 100644
--- a/model/makefile/control
+++ b/model/makefile/control
@@ -2,7 +2,7 @@ Source: %PACKAGE%
 Section: unknown
 Priority: extra
 Maintainer: %DEBNAME% <%DEBEMAIL%>
-Build-Depends: debhelper (>= 7), dh-buildinfo
+Build-Depends: debhelper (>= 7), dh-buildinfo, quilt
 Standards-Version: 3.9.1
 Homepage: URL://HOMEPAGE
 
diff --git a/model/makefile/rules b/model/makefile/rules
index 7142ead..86996c7 100644
--- a/model/makefile/rules
+++ b/model/makefile/rules
@@ -7,7 +7,6 @@ config: config-stamp
 config-stamp: 
 	dh_testdir
 	[ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make patch
-	[ ! -d debian/pixmaps ] || { cd debian/pixmaps && for i in *.sng; do sng "$$i"; done; }
 	touch $@
 
 build: build-stamp
@@ -24,7 +23,6 @@ clean:
 	rm -f build-stamp config-stamp
 	[ ! -f Makefile ] || $(MAKE) clean
 	[ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make unpatch
-	[ ! -d debian/pixmaps ] || rm -vf debian/pixmaps/*.png
 	dh_clean
 
 install: build
diff --git a/model/pymodule/control b/model/pymodule/control
index 0557fb8..c5f4537 100644
--- a/model/pymodule/control
+++ b/model/pymodule/control
@@ -2,7 +2,7 @@ Source: %PACKAGE%
 Section: unknown
 Priority: extra
 Maintainer: %DEBNAME% <%DEBEMAIL%>
-Build-Depends: debhelper (>= 7), dh-buildinfo, \
+Build-Depends: debhelper (>= 7), dh-buildinfo, quilt, \
  python-all-dev, python-support, python-setuptools
 Standards-Version: 3.9.1
 Homepage: URL://HOMEPAGE
diff --git a/model/pymodule/rules b/model/pymodule/rules
index 5e2f0a1..ce8ce34 100644
--- a/model/pymodule/rules
+++ b/model/pymodule/rules
@@ -8,7 +8,6 @@ config: config-stamp
 config-stamp: 
 	dh_testdir
 	[ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make patch
-	[ ! -d debian/pixmaps ] || { cd debian/pixmaps && for i in *.sng; do sng "$$i"; done; }
 	touch $@
 
 build: $(PYVERS:%=build-python%)
@@ -24,7 +23,6 @@ clean: unpatch
 	rm -f config-stamp build-python?.* install-python?.*
 	rm -rf build
 	[ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make unpatch
-	[ ! -d debian/pixmaps ] || rm -vf debian/pixmaps/*.png
 	dh_clean
 
 install: build $(PYVERS:%=install-python%)
diff --git a/model/python/control b/model/python/control
index f7238a3..db9abb7 100644
--- a/model/python/control
+++ b/model/python/control
@@ -2,7 +2,7 @@ Source: %PACKAGE%
 Section: unknown
 Priority: extra
 Maintainer: %DEBNAME% <%DEBEMAIL%>
-Build-Depends: debhelper (>= 7), dh-buildinfo
+Build-Depends: debhelper (>= 7), dh-buildinfo, quilt
 Standards-Version: 3.9.1
 Homepage: URL://HOMEPAGE
 
diff --git a/model/python/rules b/model/python/rules
index 3e6a2b6..7213f4b 100644
--- a/model/python/rules
+++ b/model/python/rules
@@ -7,7 +7,6 @@ config: config-stamp
 config-stamp: 
 	dh_testdir
 	[ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make patch
-	[ ! -d debian/pixmaps ] || { cd debian/pixmaps && for i in *.sng; do sng "$$i"; done; }
 	touch $@
 
 build: build-stamp
@@ -21,7 +20,6 @@ clean:
 	rm -f build-stamp config-stamp
 	[ ! -f Makefile ] || $(MAKE) clean
 	[ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make unpatch
-	[ ! -d debian/pixmaps ] || rm -vf debian/pixmaps/*.png
 	dh_clean
 
 install: build
diff --git a/model/scons/control b/model/scons/control
index 7dcffd4..855f048 100644
--- a/model/scons/control
+++ b/model/scons/control
@@ -2,7 +2,7 @@ Source: %PACKAGE%
 Section: unknown
 Priority: extra
 Maintainer: %DEBNAME% <%DEBEMAIL%>
-Build-Depends: debhelper (>= 7), scons, dh-buildinfo
+Build-Depends: debhelper (>= 7), scons, dh-buildinfo, quilt
 Standards-Version: 3.9.1
 Homepage: URL://HOMEPAGE
 
diff --git a/model/scons/rules b/model/scons/rules
index e611513..9b15a54 100644
--- a/model/scons/rules
+++ b/model/scons/rules
@@ -27,7 +27,6 @@ clean:
 	rm -f config.log options.cache
 	rm -rf .sconf_temp build
 	[ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make unpatch
-	[ ! -d debian/pixmaps ] || rm -vf debian/pixmaps/*.png
 	dh_clean
 
 install: build

-- 
templates for different package types



More information about the Pkg-games-commits mailing list