The following commit has been merged in the master branch:
commit 26095b9b045569545d41c8f1e43dd91bcb4a95eb
Author: Andreas Tille <[email protected]>
Date: Mon Mar 9 09:49:21 2009 +0100
Packaging stuff for xteddy 2.2; converted to cdbs; no quilt patches needed
any more
diff --git a/debian/changelog b/debian/changelog
index d00c18d..d329033 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,12 @@
-xteddy (2.2-1) UNRELEASED; urgency=low
-
- * New Upstream Version
-
- -- Andreas Tille <[email protected]> Mon, 09 Mar 2009 08:47:59 +0100
-
-xteddy (2.1-4) UNRELEASED; urgency=low
+xteddy (2.2-1) unstable; urgency=low
* Fixed Vcs fields (from svn to git)
+ * New upstream version which includes the patch of
+ Peter De Wachter <[email protected]>
+ to use Imlib2 instead of Imlib1 (thanks Peter)
+ Closes: #370822
+ * Added debian/post{inst,rm} because lintian claimed missing
+ update-menus call (which is somehow strange)
-- Andreas Tille <[email protected]> Sat, 07 Feb 2009 21:51:26 +0100
diff --git a/debian/control b/debian/control
index f19825c..14bba8f 100644
--- a/debian/control
+++ b/debian/control
@@ -4,14 +4,14 @@ Priority: optional
Maintainer: Debian Games Team <[email protected]>
Uploaders: Andreas Tille <[email protected]>
DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 6.0.7), imlib11-dev (>= 1.9.14-16), quilt
+Build-Depends: debhelper (>= 6.0.7), libimlib2-dev, cdbs, pkg-config
Standards-Version: 3.8.0
Vcs-Git: git://git.debian.org/git/pkg-games/xteddy.git
Vcs-Browser: http://git.debian.org/?p=pkg-games/xteddy.git
Package: xteddy
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: a cuddly teddy bear (or other image) for your X desktop
Normally, xteddy just sits around doing nothing. After all, that's what
teddy bears are for. Look at him, talk to him, place heavy windows on
diff --git a/debian/install b/debian/install
index 034a079..f116e99 100644
--- a/debian/install
+++ b/debian/install
@@ -1 +1,2 @@
images/icons/*.xpm usr/share/pixmaps
+xteddy usr/games
diff --git a/debian/patches/10_makefile.in.patches
b/debian/patches/10_makefile.in.patches
deleted file mode 100644
index 4f98011..0000000
--- a/debian/patches/10_makefile.in.patches
+++ /dev/null
@@ -1,186 +0,0 @@
---- xteddy-2.1.orig/Makefile.in
-+++ xteddy-2.1/Makefile.in
-@@ -117,6 +117,7 @@
-
- TAR = tar
- GZIP_ENV = --best
-+DEP_FILES = .deps/xteddy.P
- SOURCES = $(xteddy_SOURCES)
- OBJECTS = $(xteddy_OBJECTS)
-
-@@ -124,9 +125,9 @@
- .SUFFIXES:
- .SUFFIXES: .S .c .o .s
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
-- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile
-+ cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
-
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
$(BUILT_SOURCES)
- cd $(top_builddir) \
- && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-@@ -163,9 +164,6 @@
- rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed
'$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
- done
-
--.c.o:
-- $(COMPILE) -c $<
--
- .s.o:
- $(COMPILE) -c $<
-
-@@ -371,6 +369,11 @@
- -rm -rf $(distdir)
- mkdir $(distdir)
- -chmod 777 $(distdir)
-+ here=`cd $(top_builddir) && pwd`; \
-+ top_distdir=`cd $(distdir) && pwd`; \
-+ distdir=`cd $(distdir) && pwd`; \
-+ cd $(top_srcdir) \
-+ && $(AUTOMAKE) --include-deps --build-dir=$$here
--srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
- @for file in $(DISTFILES); do \
- d=$(srcdir); \
- if test -d $$d/$$file; then \
-@@ -392,6 +395,37 @@
- fi; \
- done
-
-+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-+
-+-include $(DEP_FILES)
-+
-+mostlyclean-depend:
-+
-+clean-depend:
-+
-+distclean-depend:
-+ -rm -rf .deps
-+
-+maintainer-clean-depend:
-+
-+%.o: %.c
-+ @echo '$(COMPILE) -c $<'; \
-+ $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+ @-cp .deps/$(*F).pp .deps/$(*F).P; \
-+ tr ' ' '\012' < .deps/$(*F).pp \
-+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+ >> .deps/$(*F).P; \
-+ rm .deps/$(*F).pp
-+
-+%.lo: %.c
-+ @echo '$(LTCOMPILE) -c $<'; \
-+ $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
-+ < .deps/$(*F).pp > .deps/$(*F).P; \
-+ tr ' ' '\012' < .deps/$(*F).pp \
-+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+ >> .deps/$(*F).P; \
-+ rm -f .deps/$(*F).pp
- info-am:
- info: info-recursive
- dvi-am:
-@@ -431,24 +465,25 @@
-
- maintainer-clean-generic:
- mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \
-- mostlyclean-tags mostlyclean-generic
-+ mostlyclean-tags mostlyclean-depend mostlyclean-generic
-
- mostlyclean: mostlyclean-recursive
-
--clean-am: clean-binPROGRAMS clean-compile clean-tags clean-generic \
-- mostlyclean-am
-+clean-am: clean-binPROGRAMS clean-compile clean-tags clean-depend \
-+ clean-generic mostlyclean-am
-
- clean: clean-recursive
-
- distclean-am: distclean-binPROGRAMS distclean-compile distclean-tags \
-- distclean-generic clean-am
-+ distclean-depend distclean-generic clean-am
-
- distclean: distclean-recursive
- -rm -f config.status
-
- maintainer-clean-am: maintainer-clean-binPROGRAMS \
- maintainer-clean-compile maintainer-clean-tags \
-- maintainer-clean-generic distclean-am
-+ maintainer-clean-depend maintainer-clean-generic \
-+ distclean-am
- @echo "This command is intended for maintainers to use;"
- @echo "it deletes files that may require special tools to rebuild."
-
-@@ -465,12 +500,14 @@
- all-recursive check-recursive installcheck-recursive info-recursive \
- dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
- maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
--distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
--dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
--install-exec install-data-am install-data install-am install \
--uninstall-am uninstall all-redirect all-am all installdirs-am \
--installdirs mostlyclean-generic distclean-generic clean-generic \
--maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-+distclean-tags clean-tags maintainer-clean-tags distdir \
-+mostlyclean-depend distclean-depend clean-depend \
-+maintainer-clean-depend info-am info dvi-am dvi check check-am \
-+installcheck-am installcheck install-exec-am install-exec \
-+install-data-am install-data install-am install uninstall-am uninstall \
-+all-redirect all-am all installdirs-am installdirs mostlyclean-generic \
-+distclean-generic clean-generic maintainer-clean-generic clean \
-+mostlyclean distclean maintainer-clean
-
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
---- xteddy-2.1.orig/html/Makefile.in
-+++ xteddy-2.1/html/Makefile.in
-@@ -87,9 +87,9 @@
- all: all-redirect
- .SUFFIXES:
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
-- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps html/Makefile
-+ cd $(top_srcdir) && $(AUTOMAKE) --gnu html/Makefile
-
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
$(BUILT_SOURCES)
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-@@ -102,6 +102,11 @@
- subdir = html
-
- distdir: $(DISTFILES)
-+ here=`cd $(top_builddir) && pwd`; \
-+ top_distdir=`cd $(top_distdir) && pwd`; \
-+ distdir=`cd $(distdir) && pwd`; \
-+ cd $(top_srcdir) \
-+ && $(AUTOMAKE) --include-deps --build-dir=$$here
--srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu html/Makefile
- $(mkinstalldirs) $(distdir)/images
- @for file in $(DISTFILES); do \
- d=$(srcdir); \
---- xteddy-2.1.orig/images/Makefile.in
-+++ xteddy-2.1/images/Makefile.in
-@@ -91,9 +91,9 @@
- all: all-redirect
- .SUFFIXES:
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
-- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps images/Makefile
-+ cd $(top_srcdir) && $(AUTOMAKE) --gnu images/Makefile
-
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
$(BUILT_SOURCES)
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-@@ -125,6 +125,11 @@
- subdir = images
-
- distdir: $(DISTFILES)
-+ here=`cd $(top_builddir) && pwd`; \
-+ top_distdir=`cd $(top_distdir) && pwd`; \
-+ distdir=`cd $(distdir) && pwd`; \
-+ cd $(top_srcdir) \
-+ && $(AUTOMAKE) --include-deps --build-dir=$$here
--srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu images/Makefile
- @for file in $(DISTFILES); do \
- d=$(srcdir); \
- if test -d $$d/$$file; then \
diff --git a/debian/patches/20_xteddy-nocursor.patch
b/debian/patches/20_xteddy-nocursor.patch
deleted file mode 100644
index 2b29c56..0000000
--- a/debian/patches/20_xteddy-nocursor.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-This patch from Frank Heckenbach <[email protected]> enables
-the -nocursor option which prevents xteddy from displaying a heart
-shaped cursor in case the program is "misused" to display "honest"
-images with transparent background
---- xteddy-2.1/xteddy.c.orig 2005-05-25 08:11:37.000000000 +0200
-+++ xteddy-2.1/xteddy.c 2008-11-07 20:18:01.000000000 +0100
-@@ -140,7 +140,7 @@
- XClassHint class_hints;
- XTextProperty windowName;
- int argnum;
-- int use_wm, float_up, allow_quit;
-+ int use_wm, float_up, allow_quit, cursor_blank;
- XEvent report;
- char *display_name = NULL;
- char buffer[20];
-@@ -169,14 +169,15 @@
- teddy = progname;
-
-
-- /* Option handling: "-wm", "-float", "-noquit", "-geometry" */
-- /* and "-display" are recognized. See manual page for details. */
-+ /* Option handling: "-wm", "-float", "-noquit", "-geometry", */
-+ /* "-display" and "-nocursor" are recognized. See manual page for details.
*/
- /* -F<name> ... Other pixmap name */
- /* -F or -f are equivalent. A space may be included if desired after the
option (eg "-f xduck") */
- /* -v prints version. -h or --help prints help */
- use_wm = FALSE;
- float_up = FALSE;
- allow_quit = TRUE;
-+ cursor_blank = FALSE;
- x = y = 0;
- geomflags = 0;
- for ( argnum = 1; argnum < argc; argnum++ ) {
-@@ -190,6 +191,8 @@
- geomflags = XParseGeometry(argv[++argnum], &x, &y, &xw, &xh);
- if (!strcmp(argv[argnum],"-display"))
- display_name = argv[++argnum];
-+ if (!strcmp(argv[argnum],"-nocursor"))
-+ cursor_blank = TRUE;
- /* Use -f or -F; -f seems more natural. But -float does not mean "-f
loat" ! */
- if ( (!strncmp(argv[argnum],"-F", 2)) || ( (!strncmp(argv[argnum],"-f",
2)) && (strcmp(argv[argnum],"-float")) ) )
- teddy = argv[argnum] + 2;
-@@ -266,7 +269,24 @@
- setwinattr.override_redirect = FALSE;
- else
- setwinattr.override_redirect = TRUE;
-- cursor = XCreateFontCursor(display, XC_heart);
-+
-+ if (cursor_blank)
-+ {
-+ Pixmap blank;
-+ XColor dummy;
-+ const char data[1] = { 0 };
-+ blank = XCreateBitmapFromData (display, win, data, 1, 1);
-+ if (blank == None)
-+ {
-+ fprintf (stderr, "error: out of memory.\n");
-+ exit (1);
-+ }
-+ cursor = XCreatePixmapCursor (display, blank, blank, &dummy, &dummy, 0,
0);
-+ XFreePixmap (display , blank);
-+ }
-+ else
-+ cursor = XCreateFontCursor(display, XC_heart);
-+
- setwinattr.cursor = cursor;
- valuemask = CWOverrideRedirect | CWCursor;
- XChangeWindowAttributes(display, win, valuemask, &setwinattr);
---- xteddy-2.1/xteddy.6.orig 2008-11-07 20:19:42.000000000 +0100
-+++ xteddy-2.1/xteddy.6 2008-11-07 20:20:48.000000000 +0100
-@@ -4,7 +4,7 @@
- .SH SYNOPSIS
- .B xteddy
- [
--.B \-wm \-float \-noquit \-F<file>
-+.B \-wm \-float \-noquit \-nocursor \-F<file>
- ]
- .br
- [
-@@ -62,6 +62,11 @@
- window. I you use the -wm option in conjunction with a click-to-type
- window manager, you would probably want to include this option.
- .TP
-+.B \-nocursor
-+Disable the X11 cursor over the
-+.I xteddy
-+window.
-+.TP
- .B \-F,\-f
- <
- .I file
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index bb8211b..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-10_makefile.in.patches
-20_xteddy-nocursor.patch
diff --git a/debian/rules b/debian/rules
index 36913ae..d8ca4a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,92 +1,21 @@
#!/usr/bin/make -f
-############################ -*- Mode: Makefile -*- ###########################
-## rules ---
-## Author : Andreas Tille <[email protected]>
-## Created On : Tue, 24 Apr 2001 10:49:56 +0200
-## Description : debian/rules for xteddy
-###############################################################################
+# debian/rules for xteddy using cdbs
+# Andreas Tille <[email protected]>, GPL
-pkg=xteddy
-PREFIX=/usr
-bindir=$(PREFIX)/games
-mandir=$(PREFIX)/share/man
-man6=$(mandir)/man6
+# include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+pkg:=xteddy
-FILES_TO_CLEAN = debian/files debian/*.debhelper debian/substvars config.h.in
config.log
-DIRS_TO_CLEAN = debian/`dh_listpackages` .deps
-STAMPS_TO_CLEAN = stamp-configure stamp-build stamp-binary
+DEB_MAKE_INSTALL_TARGET := install bindir=$(CURDIR)/debian/$(pkg)/usr/games \
+ datadir=$(CURDIR)/debian/$(pkg)/usr/share \
+ prefix=$(CURDIR)/debian/$(pkg)/usr
-include /usr/share/quilt/quilt.make
-
-build: patch build-stamp
-build-stamp:
- dh_testdir
-
- ./configure --prefix=$(PREFIX)
- $(MAKE)
-
- touch build-stamp
-
-clean: unpatch
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- -test -f Makefile && $(MAKE) recursive-clean
- -test -f Makefile && $(MAKE) distclean
- -rm -f $(FILES_TO_CLEAN) $(STAMPS_TO_CLEAN)
- -rm -rf $(DIRS_TO_CLEAN)
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- $(MAKE) install \
- prefix=`pwd`/debian/`dh_listpackages`/$(PREFIX) \
- bindir=`pwd`/debian/`dh_listpackages`/$(bindir) \
- mandir=`pwd`/debian/`dh_listpackages`/$(mandir)
+install/$(pkg)::
for i in `ls debian/$(pkg)/usr/share/$(pkg)` ; do \
- if [ `basename $$i .png` != $(pkg) ] ; then \
- ( ln -s $(pkg) debian/`dh_listpackages`/$(PREFIX)/games/`basename
$$i .png`; \
- ln -s $(pkg).6.gz debian/`dh_listpackages`/$(man6)/`basename $$i
.png`.6.gz ) \
- fi \
+ if [ `basename $$i .png` != $(pkg) ] ; then \
+ ( ln -s $(pkg) debian/$(pkg)/usr/games/`basename $$i .png`; \
+ ln -s $(pkg).6.gz debian/$(pkg)/usr/share/man/man6/`basename
$$i .png`.6.gz ) \
+ fi \
done
- ln -s $(pkg).6.gz debian/`dh_listpackages`/$(man6)/xtoys.6.gz
- ln -s $(pkg).6.gz debian/`dh_listpackages`/$(man6)/xteddy_test.6.gz
- dh_install
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
-# dh_installdebconf
- dh_installdocs
-# dh_installexamples
- dh_installmenu
-# Installation of manpages is handled above
-# dh_installman
- dh_installchangelogs ChangeLog
- dh_lintian
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
--
a cuddly teddy bear (or other image) for your X desktop
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
