diff -u grandr-0.1+git20080326/debian/changelog grandr-0.1+git20080326/debian/changelog --- grandr-0.1+git20080326/debian/changelog +++ grandr-0.1+git20080326/debian/changelog @@ -1,3 +1,11 @@ +grandr (0.1+git20080326-1ubuntu1) intrepid; urgency=low + + * src/interface.c: applied patch by Stefan Ott to make the program + exit after clicking on the "close" button (LP: #203026) + * debian/rules: Updated clean target to correct some lintian warnings. + + -- Kurt Litsch Thu, 04 Sep 2008 21:35:21 -0500 + grandr (0.1+git20080326-1) unstable; urgency=low * New upstream pull with some minor fixes diff -u grandr-0.1+git20080326/debian/control grandr-0.1+git20080326/debian/control --- grandr-0.1+git20080326/debian/control +++ grandr-0.1+git20080326/debian/control @@ -1,7 +1,8 @@ Source: grandr Section: x11 Priority: optional -Maintainer: Debian X Strike Force +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian X Strike Force Uploaders: David Nusinow Build-Depends: debhelper (>= 5), libgtk2.0-dev, libgconf2-dev, libxrandr-dev (>= 2:1.2) Standards-Version: 3.7.2 diff -u grandr-0.1+git20080326/debian/rules grandr-0.1+git20080326/debian/rules --- grandr-0.1+git20080326/debian/rules +++ grandr-0.1+git20080326/debian/rules @@ -43,6 +43,7 @@ rm -f config.cache config.log config.status rm -f */config.cache */config.log */config.status + rm -f config.status.lineno configure.lineno dh_clean @@ -63,6 +64,7 @@ binary-arch: build install dh_testdir dh_testroot + dh_desktop dh_installchangelogs ChangeLog dh_installdocs dh_installexamples only in patch2: unchanged: --- grandr-0.1+git20080326.orig/Makefile +++ grandr-0.1+git20080326/Makefile @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # Makefile. Generated from Makefile.in by configure. # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -33,11 +33,15 @@ # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. +srcdir = . +top_srcdir = . pkgdatadir = $(datadir)/grandr pkglibdir = $(libdir)/grandr pkgincludedir = $(includedir)/grandr +top_builddir = . am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = /usr/bin/install -c install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -51,17 +55,17 @@ POST_UNINSTALL = : build_triplet = i686-pc-linux-gnu host_triplet = i686-pc-linux-gnu -subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ config.guess config.sub depcomp install-sh missing +subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno config.status.lineno + configure.lineno configure.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = @@ -69,13 +73,10 @@ DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive + install-exec-recursive install-info-recursive \ + install-recursive installcheck-recursive installdirs-recursive \ + pdf-recursive ps-recursive uninstall-info-recursive \ + uninstall-recursive ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -93,6 +94,8 @@ ACLOCAL = ${SHELL} /home/david/debian/xorg/git/app/tmp/tmp/grandr/missing --run aclocal-1.10 ADMIN_MAN_DIR = $(mandir)/man$(ADMIN_MAN_SUFFIX) ADMIN_MAN_SUFFIX = 8 +AMDEP_FALSE = # +AMDEP_TRUE = AMTAR = ${SHELL} /home/david/debian/xorg/git/app/tmp/tmp/grandr/missing --run tar APP_MAN_DIR = $(mandir)/man$(APP_MAN_SUFFIX) APP_MAN_SUFFIX = 1 @@ -118,7 +121,6 @@ FILE_MAN_DIR = $(mandir)/man$(FILE_MAN_SUFFIX) FILE_MAN_SUFFIX = 5 GREP = /bin/grep -INSTALL = /usr/bin/install -c INSTALL_DATA = ${INSTALL} -m 644 INSTALL_PROGRAM = ${INSTALL} INSTALL_SCRIPT = ${INSTALL} @@ -130,10 +132,11 @@ LIB_MAN_SUFFIX = 3 LTLIBOBJS = MAINT = +MAINTAINER_MODE_FALSE = # +MAINTAINER_MODE_TRUE = MAKEINFO = ${SHELL} /home/david/debian/xorg/git/app/tmp/tmp/grandr/missing --run makeinfo MISC_MAN_DIR = $(mandir)/man$(MISC_MAN_SUFFIX) MISC_MAN_SUFFIX = 7 -MKDIR_P = /bin/mkdir -p OBJEXT = o PACKAGE = grandr PACKAGE_BUGREPORT = https://bugs.freedesktop.org/enter_bug.cgi?product=xorg @@ -149,11 +152,9 @@ SHELL = /bin/sh STRIP = VERSION = 0.1 -abs_builddir = /home/david/debian/xorg/git/app/tmp/tmp/grandr -abs_srcdir = /home/david/debian/xorg/git/app/tmp/tmp/grandr -abs_top_builddir = /home/david/debian/xorg/git/app/tmp/tmp/grandr -abs_top_srcdir = /home/david/debian/xorg/git/app/tmp/tmp/grandr ac_ct_CC = gcc +am__fastdepCC_FALSE = # +am__fastdepCC_TRUE = am__include = include am__leading_dot = . am__quote = @@ -165,7 +166,6 @@ build_cpu = i686 build_os = linux-gnu build_vendor = pc -builddir = . datadir = ${datarootdir} datarootdir = ${prefix}/share docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} @@ -193,11 +193,8 @@ psdir = ${docdir} sbindir = ${exec_prefix}/sbin sharedstatedir = ${prefix}/com -srcdir = . sysconfdir = ${prefix}/etc target_alias = -top_builddir = . -top_srcdir = . SUBDIRS = src EXTRA_DIST = \ autogen.sh \ @@ -245,7 +242,7 @@ config.h: stamp-h1 @if test ! -f $@; then \ rm -f stamp-h1; \ - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ + $(MAKE) stamp-h1; \ else :; fi stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @@ -258,6 +255,7 @@ distclean-hdr: -rm -f config.h stamp-h1 +uninstall-info-am: # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -290,7 +288,8 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): +mostlyclean-recursive clean-recursive distclean-recursive \ +maintainer-clean-recursive: @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -334,8 +333,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -360,8 +359,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -371,12 +370,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -391,22 +391,23 @@ distdir: $(DISTFILES) $(am__remove_distdir) - test -d $(distdir) || mkdir $(distdir) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ + mkdir $(distdir) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -420,7 +421,7 @@ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ + || $(mkdir_p) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -428,8 +429,6 @@ $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ @@ -440,7 +439,7 @@ -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ + ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r $(distdir) dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz @@ -449,10 +448,6 @@ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) - dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -480,8 +475,6 @@ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ @@ -521,7 +514,7 @@ $(am__remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' + sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' distuninstallcheck: @cd $(distuninstallcheck_dir) \ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ @@ -590,20 +583,12 @@ install-data-am: install-data-local -install-dvi: install-dvi-recursive - install-exec-am: -install-html: install-html-recursive - install-info: install-info-recursive install-man: -install-pdf: install-pdf-recursive - -install-ps: install-ps-recursive - installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -624,26 +609,24 @@ ps-am: -uninstall-am: +uninstall-am: uninstall-info-am -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ - install-strip +uninstall-info: uninstall-info-recursive -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-generic \ - ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-hook dist-lzma dist-shar dist-tarZ dist-zip distcheck \ - distclean distclean-generic distclean-hdr distclean-tags \ - distcleancheck distdir distuninstallcheck dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-data-local install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ + check-am clean clean-generic clean-recursive ctags \ + ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-hook \ + dist-shar dist-tarZ dist-zip distcheck distclean \ + distclean-generic distclean-hdr distclean-recursive \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-data-local install-exec \ + install-exec-am install-info install-info-am install-man \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + maintainer-clean-recursive mostlyclean mostlyclean-generic \ + mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am uninstall-info-am install-data-local: only in patch2: unchanged: --- grandr-0.1+git20080326.orig/src/interface.c +++ grandr-0.1+git20080326/src/interface.c @@ -495,6 +495,9 @@ gtk_container_add (GTK_CONTAINER (hbuttonbox1), apply_btn); GTK_WIDGET_SET_FLAGS (apply_btn, GTK_CAN_DEFAULT); + g_signal_connect ((gpointer) main_win, "delete_event", + G_CALLBACK (gtk_main_quit), + NULL); g_signal_connect ((gpointer) about_btn, "clicked", G_CALLBACK (on_about_btn_clicked), NULL); only in patch2: unchanged: --- grandr-0.1+git20080326.orig/src/Makefile +++ grandr-0.1+git20080326/src/Makefile @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # src/Makefile. Generated from Makefile.in by configure. # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -34,11 +34,15 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. +srcdir = . +top_srcdir = .. pkgdatadir = $(datadir)/grandr pkglibdir = $(libdir)/grandr pkgincludedir = $(includedir)/grandr +top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = /usr/bin/install -c install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -70,7 +74,7 @@ pixmap.$(OBJEXT) grandr_OBJECTS = $(am_grandr_OBJECTS) grandr_DEPENDENCIES = -DEFAULT_INCLUDES = -I. -I$(top_builddir) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -85,6 +89,8 @@ ACLOCAL = ${SHELL} /home/david/debian/xorg/git/app/tmp/tmp/grandr/missing --run aclocal-1.10 ADMIN_MAN_DIR = $(mandir)/man$(ADMIN_MAN_SUFFIX) ADMIN_MAN_SUFFIX = 8 +AMDEP_FALSE = # +AMDEP_TRUE = AMTAR = ${SHELL} /home/david/debian/xorg/git/app/tmp/tmp/grandr/missing --run tar APP_MAN_DIR = $(mandir)/man$(APP_MAN_SUFFIX) APP_MAN_SUFFIX = 1 @@ -110,7 +116,6 @@ FILE_MAN_DIR = $(mandir)/man$(FILE_MAN_SUFFIX) FILE_MAN_SUFFIX = 5 GREP = /bin/grep -INSTALL = /usr/bin/install -c INSTALL_DATA = ${INSTALL} -m 644 INSTALL_PROGRAM = ${INSTALL} INSTALL_SCRIPT = ${INSTALL} @@ -122,10 +127,11 @@ LIB_MAN_SUFFIX = 3 LTLIBOBJS = MAINT = +MAINTAINER_MODE_FALSE = # +MAINTAINER_MODE_TRUE = MAKEINFO = ${SHELL} /home/david/debian/xorg/git/app/tmp/tmp/grandr/missing --run makeinfo MISC_MAN_DIR = $(mandir)/man$(MISC_MAN_SUFFIX) MISC_MAN_SUFFIX = 7 -MKDIR_P = /bin/mkdir -p OBJEXT = o PACKAGE = grandr PACKAGE_BUGREPORT = https://bugs.freedesktop.org/enter_bug.cgi?product=xorg @@ -141,11 +147,9 @@ SHELL = /bin/sh STRIP = VERSION = 0.1 -abs_builddir = /home/david/debian/xorg/git/app/tmp/tmp/grandr/src -abs_srcdir = /home/david/debian/xorg/git/app/tmp/tmp/grandr/src -abs_top_builddir = /home/david/debian/xorg/git/app/tmp/tmp/grandr -abs_top_srcdir = /home/david/debian/xorg/git/app/tmp/tmp/grandr ac_ct_CC = gcc +am__fastdepCC_FALSE = # +am__fastdepCC_TRUE = am__include = include am__leading_dot = . am__quote = @@ -157,7 +161,6 @@ build_cpu = i686 build_os = linux-gnu build_vendor = pc -builddir = . datadir = ${datarootdir} datarootdir = ${prefix}/share docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} @@ -185,11 +188,8 @@ psdir = ${docdir} sbindir = ${exec_prefix}/sbin sharedstatedir = ${prefix}/com -srcdir = . sysconfdir = ${prefix}/etc target_alias = -top_builddir = .. -top_srcdir = .. INCLUDES = \ -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ @@ -240,7 +240,7 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" + test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ @@ -263,7 +263,7 @@ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) grandr$(EXEEXT): $(grandr_OBJECTS) $(grandr_DEPENDENCIES) @rm -f grandr$(EXEEXT) - $(LINK) $(grandr_OBJECTS) $(grandr_LDADD) $(LIBS) + $(LINK) $(grandr_LDFLAGS) $(grandr_OBJECTS) $(grandr_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -279,26 +279,27 @@ include ./$(DEPDIR)/support.Po .c.o: - $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ + then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi # source='$<' object='$@' libtool=no \ # DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ # $(COMPILE) -c $< .c.obj: - $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` - mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ + then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi # source='$<' object='$@' libtool=no \ # DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ # $(COMPILE) -c `$(CYGPATH_W) '$<'` +uninstall-info-am: ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -310,8 +311,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -321,12 +322,13 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -340,21 +342,22 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -370,7 +373,7 @@ all-am: Makefile $(PROGRAMS) installdirs: for dir in "$(DESTDIR)$(bindir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -418,20 +421,12 @@ install-data-am: -install-dvi: install-dvi-am - install-exec-am: install-binPROGRAMS -install-html: install-html-am - install-info: install-info-am install-man: -install-pdf: install-pdf-am - -install-ps: install-ps-am - installcheck-am: maintainer-clean: maintainer-clean-am @@ -451,22 +446,18 @@ ps-am: -uninstall-am: uninstall-binPROGRAMS - -.MAKE: install-am install-strip +uninstall-am: uninstall-binPROGRAMS uninstall-info-am .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ clean-generic ctags distclean distclean-compile \ distclean-generic distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-binPROGRAMS \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ + install-data install-data-am install-exec install-exec-am \ + install-info install-info-am install-man install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-binPROGRAMS + uninstall-am uninstall-binPROGRAMS uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. only in patch2: unchanged: --- grandr-0.1+git20080326.orig/debian/changelog.dch +++ grandr-0.1+git20080326/debian/changelog.dch @@ -0,0 +1,44 @@ +grandr (0.1+git20080326-1ubuntu1) intrepid; urgency=low + + * src/interface.c: applied patch by Stefan Ott to make the program + exit after clicking on the "close" button (LP: #203026) + * debian/rules: Updated clean target to correct some lintian warnings. + * + + -- Kurt Litsch Sun, 07 Sep 2008 18:11:39 -0500 + +grandr (0.1+git20080326-1) unstable; urgency=low + + * New upstream pull with some minor fixes + * Make the XSF the maintainer with me as uploader + * Fix a segfault when clicking on the monitor list. + Thanks Ari Pollak for the patch. Closes: #445310 + + -- David Nusinow Wed, 26 Mar 2008 19:52:16 -0400 + +grandr (0.1-3) unstable; urgency=low + + * Add a .desktop file courtesy of Marcelo Boveto Shima + + -- David Nusinow Thu, 28 Jun 2007 21:11:13 -0400 + +grandr (0.1-2) unstable; urgency=low + + [ Julien Cristau ] + * Fix typo in description. + * Minor debian/control fixups + + Build-dep on libxrandr >= 1.2 + + add XS-Vcs-* + + don't depend on an X server + + [ David Nusinow ] + * Build-dep on libxrandr-dev instead of libxrandr + + -- David Nusinow Thu, 21 Jun 2007 17:12:43 +0100 + +grandr (0.1-1) unstable; urgency=low + + * Initial release (Closes: #429941) + + -- David Nusinow Thu, 21 Jun 2007 14:02:00 +0100 +