diff -Nru lwm-1.2.2/debian/changelog lwm-1.2.2/debian/changelog --- lwm-1.2.2/debian/changelog 2012-03-23 17:01:23.000000000 +0000 +++ lwm-1.2.2/debian/changelog 2013-06-11 13:56:43.000000000 +0000 @@ -1,3 +1,19 @@ +lwm (1.2.2-5) unstable; urgency=low + + * debian/control + - (Build-Depends): Rm dpkg-dev; not needed with debhelper 9. + - (Standards-Version): Update to 3.9.4. + - (Vcs-*): Update to anonscm.debian.org. + * debian/copyright + - Sync Debian mantainers with debian/copyright. + - (Comment): New. Move extra information here. + * debian/debian-vars.mk + - Delete. No longer needed. + * debian/rules + - Add install variables form debian-vars.mk. + + -- Jari Aalto Tue, 11 Jun 2013 16:56:19 +0300 + lwm (1.2.2-4) unstable; urgency=low * debian/control diff -Nru lwm-1.2.2/debian/control lwm-1.2.2/debian/control --- lwm-1.2.2/debian/control 2012-03-23 17:01:23.000000000 +0000 +++ lwm-1.2.2/debian/control 2013-06-11 13:56:43.000000000 +0000 @@ -3,9 +3,9 @@ Priority: optional Maintainer: Jari Aalto Build-Depends: debhelper (>= 9), xutils-dev, x11proto-core-dev, libsm-dev, libx11-dev, libxext-dev -Standards-Version: 3.9.3.1 -Vcs-Browser: http://git.debian.org/?p=collab-maint/lwm.git -Vcs-Git: git://git.debian.org/git/collab-maint/lwm.git +Standards-Version: 3.9.4 +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/lwm.git +Vcs-Git: git://anonscm.debian.org/collab-maint/lwm.git Homepage: http://freshmeat.net/projects/lwm Package: lwm diff -Nru lwm-1.2.2/debian/copyright lwm-1.2.2/debian/copyright --- lwm-1.2.2/debian/copyright 2012-03-23 17:01:23.000000000 +0000 +++ lwm-1.2.2/debian/copyright 2013-06-11 13:56:43.000000000 +0000 @@ -1,22 +1,22 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0 -Upstream-Name: lwm +Upstream-Name: Lightweight Window Manager Upstream-Contact: James Carter -Source: http://freshmeat.net /projects/lwm -X-Source: http://www.jfc.org.uk/software/lwm.html -X-Source: http://sourceforge.net/projects/ +Source: http://freshmeat.net/projects/lwm +Comment: + See also http://www.jfc.org.uk/software/lwm.html Files: * Copyright: - 1997-2003 James Carter (Current maintainer) - 1997-2003 Elliott Hughes (2010-03-09 Email not valid) + 1997-2003 James Carter + 1997-2003 Elliott Hughes (2010-03-09 Email invalid) License: GPL-2+ Files: debian/* Copyright: - 2010-2012 Jari Aalto - 2009 Ansgar Burchardt - 2008 Margarita Manterola - 2003-2005 Matthew Wilcox + 2010, 2013 Jari Aalto + 2009 Ansgar Burchardt + 2008 Margarita Manterola + 2003, 2005 Matthew Wilcox 1999-2002 William Ono License: GPL-2+ diff -Nru lwm-1.2.2/debian/debian-vars.mk lwm-1.2.2/debian/debian-vars.mk --- lwm-1.2.2/debian/debian-vars.mk 2012-03-23 17:01:23.000000000 +0000 +++ lwm-1.2.2/debian/debian-vars.mk 1970-01-01 00:00:00.000000000 +0000 @@ -1,84 +0,0 @@ -#!/usr/bin/make -f -# -# debian-vars.mk -- Common variables -# -# Copyright -# -# Copyright (C) 2005-2010 Jari Aalto -# -# License -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -# Description -# -# This is GNU makefile part that defines common variables and -# macros to be used from debian/rules. To install, add following -# to the beginning of debian/rules: -# -# PACKAGE = foo -# include debian/debian-vars.mk - -ifneq (,) - This makefile requires GNU Make. -endif - -PACKAGE ?= foo -PIXPACKAGE ?= $(PACKAGE) -ICONPACKAGE ?= $(PACKAGE) -TOPDIR := $(shell pwd) -PKGDIR = $(shell pwd)/debian/$(PACKAGE) - -SHAREROOTDIR = $(PKGDIR)/usr/share -SHAREDIR = $(SHAREROOTDIR)/$(PACKAGE) -DOCROOTDIR = $(SHAREROOTDIR)/doc -PKGDOCDIR = $(DOCROOTDIR)/$(PACKAGE) -SITELISPDIR = $(SHAREROOTDIR)/emacs/site-lisp -PKGLISPDIR = $(SITELISPDIR)/$(PACKAGE) -DESKTOPDIR = $(SHAREROOTDIR)/applications -XSESSIONDIR = $(SHAREROOTDIR)/xsessions -LOCALEDIR = $(SHAREROOTDIR)/locale -INFODIR = $(SHAREROOTDIR)/info -PIXDIR = $(SHAREROOTDIR)/pixmaps -PKGPIXDIR = $(PIXDIR)/$(PIXPACKAGE) -ICONDIR = $(SHAREROOTDIR)/icons -PKGICONDIR = $(ICONDIR)/$(ICONPACKAGE) - -MANROOTDIR = $(SHAREROOTDIR)/man -MAN1DIR = $(MANROOTDIR)/man1 -MAN5DIR = $(MANROOTDIR)/man5 -MAN7DIR = $(MANROOTDIR)/man7 -MAN8DIR = $(MANROOTDIR)/man8 - -LIBROOTDIR = $(PKGDIR)/usr/lib -LIBDIR = $(LIBROOTDIR)/$(PACKAGE) -LIBPERLDIR = $(LIBROOTDIR)/perl - -BINDIR = $(PKGDIR)/usr/bin -SBINDIR = $(PKGDIR)/usr/sbin -GAMEBINDIR = $(PKGDIR)/usr/games - -INSTALL ?= /usr/bin/install -INSTALL_DIR = $(INSTALL) -m 755 -d -INSTALL_DATA = $(INSTALL) -p -m 644 - -# The difference is that "BIN" may contain binary strip option -INSTALL_SCRIPT = $(INSTALL) -p -m 755 -INSTALL_BIN = $(INSTALL) -p -m 755 - -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_BIN += -s -endif - -# End of Makefile part diff -Nru lwm-1.2.2/debian/rules lwm-1.2.2/debian/rules --- lwm-1.2.2/debian/rules 2012-03-23 17:01:23.000000000 +0000 +++ lwm-1.2.2/debian/rules 2013-06-11 13:56:43.000000000 +0000 @@ -1,17 +1,21 @@ #!/usr/bin/make -f -PACKAGE = lwm - -export DEB_BUILD_MAINT_OPTIONS = hardening=+all -export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic -export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed - -include debian/debian-vars.mk +PACKAGE = lwm +PKGDIR = $(CURDIR)/debian/$(PACKAGE) +SHAREROOTDIR = $(PKGDIR)/usr/share +MANROOTDIR = $(SHAREROOTDIR)/man +XSESSIONDIR = $(SHAREROOTDIR)/xsessions +MAN1DIR = $(SHAREROOTDIR)/man/man1 + +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +CFLAGS += -Wall -D_FILE_OFFSET_BITS=64 +LDFLAGS += -Wl,--as-needed +cc := $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) override_dh_auto_build: - CC=gcc /usr/bin/xmkmf + xmkmf # The only place where to inject extra flags - $(MAKE) CC="$(CC) -I. $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)" + $(MAKE) CC="$(cc)" override_dh_auto_install: $(MAKE) DESTDIR=$(PKGDIR) install @@ -19,8 +23,8 @@ mv --verbose $(MAN1DIR)/lwm.1x $(MAN1DIR)/lwm.1 # Install GDM support - $(INSTALL_DIR) $(XSESSIONDIR) - $(INSTALL_DATA) debian/*.desktop $(XSESSIONDIR) + install -m 755 -d $(XSESSIONDIR) + install -m 644 debian/*.desktop $(XSESSIONDIR) override_dh_installwm: dh_installwm --priority=80 lwm