Subversion Repositories crystalcursors

Compare Revisions

Ignore whitespace Rev 6 → Rev 5

/trunk/debian/changelog
2,15 → 2,8
 
* New maintainer (Closes: #529434).
* Do not remove alternatives on upgrade.
* Delete unused and unnecessary stuff from debian/rules.
* Add build-indep target.
* Drop 01-correct-upstreams-makefile.patch:
- Pass PREFIX instead of DESTDIR from debian/rules
- The "all" target should not have "clean" as a prerequisite; the
problem in bug #368468 was just that patch-stamp wasn't created
and we don't need that with source format 3.0.
 
-- Magnus Holmgren <holmgren@debian.org> Sun, 15 Aug 2010 01:12:59 +0200
-- Magnus Holmgren <holmgren@debian.org> Sun, 08 Aug 2010 20:43:02 +0200
 
crystalcursors (1.1.1-12) unstable; urgency=medium
 
/trunk/debian/patches/01-correct-upstreams-makefile.patch
0,0 → 1,29
From 0997604f023d4eabc440c149f45e8eb9604aafd2 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aalto@cante.net>
Date: Sat, 8 May 2010 23:25:47 +0300
Subject: [PATCH] Makefile: Fix PREFIX, ajust all
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
 
Signed-off-by: Jari Aalto <jari.aalto@cante.net>
---
Makefile | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
 
diff --git a/Makefile b/Makefile
index 7f35c5c..81590d6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
-export PREFIX=$(HOME)/.icons/
+export PREFIX=$(DESTDIR)
-all:
+all: clean
mkdir blue_cursors
mkdir blue_cursors_nonanim
mkdir blue_cursors_classic
--
1.7.0
 
/trunk/debian/patches/series
1,0 → 0,0
01-correct-upstreams-makefile.patch
03-bashism.patch
/trunk/debian/rules
9,13 → 9,30
SHAREDIR=usr/share/crystalcursors
WRAPPERDIR=etc/X11/cursors
 
build: build-indep
CFLAGS = -Wall -g
 
build-indep: build-stamp
build-stamp:
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
else
CFLAGS += -O2
endif
 
configure: configure-stamp
configure-stamp:
dh_testdir
# Add here commands to configure the package.
 
touch configure-stamp
 
 
build: build-stamp
 
build-stamp: configure-stamp
dh_testdir
 
# Add here commands to compile the package.
$(MAKE)
#docbook-to-man debian/crystalcursors.sgml > crystalcursors.1
 
touch build-stamp
 
24,11 → 41,12
dh_testroot
rm -f build-stamp configure-stamp
 
$(MAKE) clean
# Add here commands to clean up after the build process.
[ ! Makefile ] || $(MAKE) clean
 
dh_clean
 
install: build-indep
install: build
dh_testdir
dh_testroot
dh_prep
35,7 → 53,7
dh_installdirs
 
# Add here commands to install the package into debian/crystalcursors.
$(MAKE) install PREFIX=$(CURDIR)/debian/crystalcursors/$(ICONDIR)
$(MAKE) install DESTDIR=$(CURDIR)/debian/crystalcursors/$(ICONDIR)
find $(CURDIR)/debian/crystalcursors/$(ICONDIR) -type f -exec chmod 644 {} \;
find $(CURDIR)/debian/crystalcursors/$(ICONDIR) -type d -exec chmod 755 {} \;
 
59,14 → 77,31
done ; \
cd $${OLDDIR}
 
binary-indep: build-indep install
# Build architecture-independent files here.
binary-indep: build install
dh_testdir
dh_testroot
dh_installchangelogs CHANGELOG
dh_installdocs
# dh_installexamples
# dh_install
# dh_installmenu
# dh_installdebconf
# dh_installlogrotate
# dh_installemacsen
# dh_installpam
# dh_installmime
# dh_installinit
# dh_installcron
# dh_installinfo
# dh_installman
# dh_link
# dh_strip
dh_compress
dh_fixperms
# dh_perl
# dh_python
# dh_makeshlibs
dh_installdeb
dh_shlibdeps
dh_gencontrol
73,8 → 108,8
dh_md5sums
dh_builddeb
 
binary-arch:
# No arch-dependent packages
# Build architecture-dependent files here.
binary-arch: build install
 
binary: binary-indep
.PHONY: build-indep build clean binary-indep binary-arch binary install configure
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install configure