r11596 - in packages/trunk/gamine/debian: . patches
Gonéri Le Bouder
goneri at alioth.debian.org
Sun Jan 2 17:13:17 UTC 2011
Author: goneri
Date: 2011-01-02 17:13:14 +0000 (Sun, 02 Jan 2011)
New Revision: 11596
Added:
packages/trunk/gamine/debian/patches/makefile-DESTDIR.diff
Removed:
packages/trunk/gamine/debian/script/
Modified:
packages/trunk/gamine/debian/changelog
packages/trunk/gamine/debian/gamine-data.install
packages/trunk/gamine/debian/gamine.install
packages/trunk/gamine/debian/patches/series
packages/trunk/gamine/debian/rules
Log:
add makefile-DESTDIR.diff to be able to use DESTDIR
Modified: packages/trunk/gamine/debian/changelog
===================================================================
--- packages/trunk/gamine/debian/changelog 2011-01-02 14:51:23 UTC (rev 11595)
+++ packages/trunk/gamine/debian/changelog 2011-01-02 17:13:14 UTC (rev 11596)
@@ -14,6 +14,7 @@
* refresh debian/copyright
* add a B-P on libgconf2-dev
* remove upstream debian/prerm script to avoid conflict
+ * add makefile-DESTDIR.diff to be able to use DESTDIR
-- Gonéri Le Bouder <goneri at rulezlan.org> Sun, 02 Jan 2011 15:50:51 +0100
Modified: packages/trunk/gamine/debian/gamine-data.install
===================================================================
--- packages/trunk/gamine/debian/gamine-data.install 2011-01-02 14:51:23 UTC (rev 11595)
+++ packages/trunk/gamine/debian/gamine-data.install 2011-01-02 17:13:14 UTC (rev 11596)
@@ -1 +1 @@
-sounds /usr/share/games/gamine
+usr/share/games/gamine
Modified: packages/trunk/gamine/debian/gamine.install
===================================================================
--- packages/trunk/gamine/debian/gamine.install 2011-01-02 14:51:23 UTC (rev 11595)
+++ packages/trunk/gamine/debian/gamine.install 2011-01-02 17:13:14 UTC (rev 11596)
@@ -1,3 +1,2 @@
-bin/gamine /usr/lib/gamine
-debian/script/gamine /usr/games
debian/gamine.xpm /usr/share/pixmaps
+usr/games
Added: packages/trunk/gamine/debian/patches/makefile-DESTDIR.diff
===================================================================
--- packages/trunk/gamine/debian/patches/makefile-DESTDIR.diff (rev 0)
+++ packages/trunk/gamine/debian/patches/makefile-DESTDIR.diff 2011-01-02 17:13:14 UTC (rev 11596)
@@ -0,0 +1,99 @@
+--- gamine-1.1.orig/Makefile
++++ gamine-1.1/Makefile
+@@ -1,21 +1,22 @@
+ PREFIX = /usr/local
+-bindir = $(PREFIX)/bin
+-datadir = $(PREFIX)/share
+-pkgdatadir = $(datadir)/gamine
+-docdir = $(datadir)/doc/gamine
+-sysconfdir = $(PREFIX)/etc
+-desktopdir = $(datadir)/applications
+-icondir = $(datadir)/icons/hicolor/scalable/apps
+-localedir = $(datadir)/locale
++DESTDIR =
++BINDIR = $(PREFIX)/bin
++DATADIR = $(PREFIX)/share
++PKGDATADIR = $(DATADIR)/gamine
++DOCDIR = $(DATADIR)/doc/gamine
++SYSCONFDIR = $(PREFIX)/etc
++DESKTOPDIR = $(DATADIR)/applications
++ICONDIR = $(DATADIR)/icons/hicolor/scalable/apps
++LOCALEDIR = $(DATADIR)/locale
+
+ GCONFTOOL = /usr/bin/gconftool-2
+ GCONF_SCHEMA_CONFIG_SOURCE = xml:merged:/etc/gconf/gconf.xml.defaults
+-GCONF_SCHEMA_FILE_DIR = $(sysconfdir)/gconf/schemas
++GCONF_SCHEMA_FILE_DIR = $(SYSCONFDIR)/gconf/schemas
+ GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL = 0
+ CFLAGS = -Wall
+ #CFLAGS = -Wall -g
+-CPPFLAGS = $(shell pkg-config --cflags gtk+-2.0 cairo glib-2.0 gstreamer-0.10 gconf-2.0) -DDATADIR=\""$(pkgdatadir)"\" -DLOCALDIR=\""$(localedir)"\"
+-LDLIBS = $(shell pkg-config --libs gtk+-2.0 cairo glib-2.0 gstreamer-0.10 gconf-2.0) -DDATADIR=\""$(pkgdatadir)"\" -DLOCALDIR=\""$(localedir)"\"
++CPPFLAGS = $(shell pkg-config --cflags gtk+-2.0 cairo glib-2.0 gstreamer-0.10 gconf-2.0) -DDATADIR=\""$(PKGDATADIR)"\" -DLOCALDIR=\""$(LOCALEDIR)"\"
++LDLIBS = $(shell pkg-config --libs gtk+-2.0 cairo glib-2.0 gstreamer-0.10 gconf-2.0) -DDATADIR=\""$(PKGDATADIR)"\" -DLOCALDIR=\""$(LOCALEDIR)"\"
+ LDFLAGS = -g
+ CC = gcc
+ target = gamine
+@@ -23,7 +24,7 @@
+
+ $(target): $(objs)
+ $(CC) -o $@ $^ $(LDFLAGS) $(LDLIBS)
+- sed 's at BINDIR@$(bindir)@' gamine.desktop.in > gamine.desktop
++ sed 's at BINDIR@$(BINDIR)@' gamine.desktop.in > gamine.desktop
+ msgfmt -c -o locale/fr.mo locale/fr.po
+
+ %.o: %.c
+@@ -32,28 +33,30 @@
+ rm -f $(target) $(objs) gamine.desktop *~ locale/*.mo
+
+ install:
+- mkdir -p $(bindir)
+- mkdir -p $(pkgdatadir)/sounds
+- mkdir -p $(docdir)
+- mkdir -p $(icondir)
+- mkdir -p $(desktopdir)
+- mkdir -p $(GCONF_SCHEMA_FILE_DIR)
+- mkdir -p $(localedir)/fr/LC_MESSAGES
+- install -m 755 gamine $(bindir)/
+- install -m 644 pencil.png $(pkgdatadir)/
+- install -m 644 gamine.png $(pkgdatadir)/
+- install -m 644 sounds/* $(pkgdatadir)/sounds/
+- install -m 644 README.pencil README.sounds README ChangeLog COPYING $(docdir)/
+- install -m 644 gamine.schemas $(GCONF_SCHEMA_FILE_DIR)/
+- install -m 644 locale/fr.mo $(localedir)/fr/LC_MESSAGES/gamine.mo
+- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(GCONF_SCHEMA_FILE_DIR)/gamine.schemas
+- install -m 644 gamine.desktop $(desktopdir)/
+- install -m 644 gamine.svg $(icondir)/
++ mkdir -p $(DESTDIR)$(BINDIR)
++ mkdir -p $(DESTDIR)$(PKGDATADIR)/sounds
++ mkdir -p $(DESTDIR)$(DOCDIR)
++ mkdir -p $(DESTDIR)$(ICONDIR)
++ mkdir -p $(DESTDIR)$(DESKTOPDIR)
++ mkdir -p $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)
++ mkdir -p $(DESTDIR)$(LOCALEDIR)/fr/LC_MESSAGES
++ install -m 755 gamine $(DESTDIR)$(BINDIR)/
++ install -m 644 pencil.png $(DESTDIR)$(PKGDATADIR)/
++ install -m 644 gamine.png $(DESTDIR)$(PKGDATADIR)/
++ install -m 644 sounds/* $(DESTDIR)$(PKGDATADIR)/sounds/
++ install -m 644 README.pencil README.sounds README ChangeLog COPYING $(DESTDIR)$(DOCDIR)/
++ install -m 644 gamine.schemas $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)/
++ install -m 644 locale/fr.mo $(DESTDIR)$(LOCALEDIR)/fr/LC_MESSAGES/gamine.mo
++ install -m 644 gamine.desktop $(DESTDIR)$(DESKTOPDIR)/
++ install -m 644 gamine.svg $(DESTDIR)$(ICONDIR)/
++ifeq ($(DESTDIR), "")
++ [ ! -z "$(DESTDIR)" ] || GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(GCONF_SCHEMA_FILE_DIR)/gamine.schemas
++endif
+
+ uninstall:
+- rm -rf $(bindir)/gamine
+- rm -rf $(pkgdatadir)
+- rm -rf $(docdir)
+- rm -rf $(GCONF_SCHEMA_FILE_DIR)/gamine.schemas
+- rm -rf $(desktopdir)/gamine.desktop
+- rm -rf $(icondir)/gamine.svg
++ rm -rf $(DESTDIR)$(BINDIR)/gamine
++ rm -rf $(DESTDIR)$(PKGDATADIR)
++ rm -rf $(DESTDIR)$(DOCDIR)
++ rm -rf $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)/gamine.schemas
++ rm -rf $(DESTDIR)$(DESKTOPDIR)/gamine.desktop
++ rm -rf $(DESTDIR)$(ICONDIR)/gamine.svg
Modified: packages/trunk/gamine/debian/patches/series
===================================================================
--- packages/trunk/gamine/debian/patches/series 2011-01-02 14:51:23 UTC (rev 11595)
+++ packages/trunk/gamine/debian/patches/series 2011-01-02 17:13:14 UTC (rev 11596)
@@ -1 +1,2 @@
+makefile-DESTDIR.diff
no-gconftool.diff
Modified: packages/trunk/gamine/debian/rules
===================================================================
--- packages/trunk/gamine/debian/rules 2011-01-02 14:51:23 UTC (rev 11595)
+++ packages/trunk/gamine/debian/rules 2011-01-02 17:13:14 UTC (rev 11596)
@@ -4,11 +4,11 @@
dh $@
override_dh_auto_build:
- $(MAKE) PREFIX=$(CURDIR)/debian/tmp
+ $(MAKE) PREFIX=/usr BINDIR=/usr/games DESTDIR=$(CURDIR)/debian/tmp PKGDATADIR=/usr/share/games/gamine
/usr/bin/docbook-to-man debian/gamine.sgml > gamine.6
override_dh_auto_install:
- $(MAKE) install PREFIX=$(CURDIR)/debian/tmp
+ $(MAKE) install PREFIX=/usr BINDIR=/usr/games DESTDIR=$(CURDIR)/debian/tmp PKGDATADIR=/usr/share/games/gamine
dh_gconf
override_dh_clean:
More information about the Pkg-games-commits
mailing list