Author: baby-guest
Date: 2007-05-11 12:50:44 +0000 (Fri, 11 May 2007)
New Revision: 2650
Removed:
packages/trunk/ultrastar-ng/debian/ultrastar-ng.substvars
Modified:
packages/trunk/ultrastar-ng/debian/changelog
packages/trunk/ultrastar-ng/debian/rules
Log:
modified rules to use rule-flavour type of targets
Modified: packages/trunk/ultrastar-ng/debian/changelog
===================================================================
--- packages/trunk/ultrastar-ng/debian/changelog 2007-05-11 11:47:28 UTC
(rev 2649)
+++ packages/trunk/ultrastar-ng/debian/changelog 2007-05-11 12:50:44 UTC
(rev 2650)
@@ -1,5 +1,15 @@
-ultrastar-ng (0.1.3-1) UNRELEASED; urgency=low
+ultrastar-ng (0.1.3-2) UNRELEASED; urgency=low
+ * Build-Depends on libcairo2-dev (>= 1.2)
+ * Modified rules so that the icon and desktop files appear in both flavours
+ of the program.
+ * Added rule-flavour type of targets in debian/rules, so that it is
+ easier to maintain.
+
+ -- Miriam Ruiz <[EMAIL PROTECTED]> Fri, 11 May 2007 14:42:40 +0200
+
+ultrastar-ng (0.1.3-1) unstable; urgency=low
+
* Initial release (Closes: #411708)
-- Miriam Ruiz <[EMAIL PROTECTED]> Wed, 21 Feb 2007 22:17:24 +0000
Modified: packages/trunk/ultrastar-ng/debian/rules
===================================================================
--- packages/trunk/ultrastar-ng/debian/rules 2007-05-11 11:47:28 UTC (rev
2649)
+++ packages/trunk/ultrastar-ng/debian/rules 2007-05-11 12:50:44 UTC (rev
2650)
@@ -16,17 +16,21 @@
CFLAGS += -O2
endif
-config.status: configure
+config-common: config-common-stamp
+config-common-stamp: configure
dh_testdir
$(MAKE) -f /usr/share/quilt/quilt.make patch
-
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
endif
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess config.guess
endif
+ touch $@
+config-gstreamer-smpeg-librsvg: config-gstreamer-smpeg-librsvg-stamp
+config-gstreamer-smpeg-librsvg-stamp: config-common
+ dh_testdir
printf "\nConfiguring gstreamer-smpeg-librsvg version\n\n"
mkdir tmp-gst-smpeg-rsvg; cd tmp-gst-smpeg-rsvg; "$(CURDIR)/configure" \
--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
@@ -36,7 +40,19 @@
CFLAGS="$(CFLAGS) -I\"$(CURDIR)/include\"" CPPFLAGS="$(CFLAGS)
-I\"$(CURDIR)/include\"" \
LDFLAGS="-Wl,-z,defs"
printf "\n"
+ touch $@
+build-gstreamer-smpeg-librsvg: build-gstreamer-smpeg-librsvg-stamp
+build-gstreamer-smpeg-librsvg-stamp: config-gstreamer-smpeg-librsvg
+ dh_testdir
+ printf "\nBuilding gstreamer-smpeg-librsvg version\n\n"
+ cd tmp-gst-smpeg-rsvg; $(MAKE)
+ printf "\n"
+ touch $@
+
+config-xine-smpeg-librsvg: config-xine-smpeg-librsvg-stamp
+config-xine-smpeg-librsvg-stamp: config-common
+ dh_testdir
printf "\nConfiguring xine-smpeg-librsvg version\n\n"
mkdir tmp-xine-smpeg-rsvg; cd tmp-xine-smpeg-rsvg;
"$(CURDIR)/configure" \
--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
@@ -46,33 +62,36 @@
CFLAGS="$(CFLAGS) -I\"$(CURDIR)/include\"" CPPFLAGS="$(CFLAGS)
-I\"$(CURDIR)/include\"" \
LDFLAGS="-Wl,-z,defs"
printf "\n"
+ touch $@
-build: build-stamp
-
-build-stamp: config.status
+build-xine-smpeg-librsvg: build-xine-smpeg-librsvg-stamp
+build-xine-smpeg-librsvg-stamp: config-xine-smpeg-librsvg
dh_testdir
-
- printf "\nBuilding gstreamer-smpeg-librsvg version\n\n"
- cd tmp-gst-smpeg-rsvg; $(MAKE)
- printf "\n"
-
printf "\nBuilding xine-smpeg-librsvg version\n\n"
cd tmp-xine-smpeg-rsvg; $(MAKE)
printf "\n"
+ touch $@
+config.status: config-common config-gstreamer-smpeg-librsvg
config-xine-smpeg-librsvg
+
+build: build-stamp
+build-stamp: config.status build-gstreamer-smpeg-librsvg
build-xine-smpeg-librsvg
#docbook-to-man debian/ultrastar-ng.sgml > ultrastar-ng.1
touch $@
clean:
dh_testdir
dh_testroot
- rm -f build-stamp
+ rm -f
{config-common,config-gstreamer-smpeg-librsvg,config-xine-smpeg-librsvg}-stamp
+ rm -f
{build,build-gstreamer-smpeg-librsvg,build-xine-smpeg-librsvg}-stamp
printf "\nCleaning gstreamer-smpeg-librsvg version\n\n"
-cd tmp-gst-smpeg-rsvg; $(MAKE) distclean
+ printf "\n"
printf "\nCleaning xine-smpeg-librsvg version\n\n"
-cd tmp-xine-smpeg-rsvg; $(MAKE) distclean
+ printf "\n"
printf "\nCleaning the rest of temporary files\n\n"
@@ -121,9 +140,12 @@
dh_installdocs -a
dh_installexamples -a
# dh_install -a
- dh_install -a debian/ultrastar-ng.xpm usr/share/pixmaps
- dh_install -a debian/ultrastar-ng.desktop usr/share/applications
- dh_desktop -a -A debian/ultrastar-ng.desktop
+ dh_install -pultrastar-ng-gstreamer debian/ultrastar-ng.xpm
usr/share/pixmaps
+ dh_install -pultrastar-ng-gstreamer debian/ultrastar-ng.desktop
usr/share/applications
+ dh_desktop -pultrastar-ng-gstreamer -A debian/ultrastar-ng.desktop
+ dh_install -pultrastar-ng-xine debian/ultrastar-ng.xpm usr/share/pixmaps
+ dh_install -pultrastar-ng-xine debian/ultrastar-ng.desktop
usr/share/applications
+ dh_desktop -pultrastar-ng-xine -A debian/ultrastar-ng.desktop
# dh_installmenu -a
# dh_installmime -a
dh_installman -a
@@ -138,4 +160,6 @@
dh_builddeb -a
binary: binary-indep binary-arch
+.PHONY: config-common config-gstreamer-smpeg-librsvg config-xine-smpeg-librsvg
+.PHONY: build-gstreamer-smpeg-librsvg build-xine-smpeg-librsvg
.PHONY: build clean binary-indep binary-arch binary install
Deleted: packages/trunk/ultrastar-ng/debian/ultrastar-ng.substvars
===================================================================
--- packages/trunk/ultrastar-ng/debian/ultrastar-ng.substvars 2007-05-11
11:47:28 UTC (rev 2649)
+++ packages/trunk/ultrastar-ng/debian/ultrastar-ng.substvars 2007-05-11
12:50:44 UTC (rev 2650)
@@ -1 +0,0 @@
-shlibs:Depends=fftw3, libasound2 (>> 1.0.12), libc6 (>= 2.3.6-6), libcairo2
(>= 1.2.4), libgcc1 (>= 1:4.1.1-12), libglib2.0-0 (>= 2.12.0),
libgstreamer0.10-0 (>= 0.10.10), libgtk2.0-0 (>= 2.8.0), librsvg2-2 (>=
2.12.7), libsdl-gfx1.2-4 (>= 2.0.13), libsdl-image1.2 (>= 1.2.5),
libsdl1.2debian (>= 1.2.10-1), libsmpeg0, libstdc++6 (>= 4.1.1-12), libxml2 (>=
2.6.27)
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
