[Pkg-wmaker-commits] [wmaker] 24/24: debian: Update with version 0.95.7-5 packaging.
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Thu Mar 24 20:09:23 UTC 2016
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch upstream
in repository wmaker.
commit fd31b29d0d18bef1e987f4e62b700cb8656d8fb0
Author: Doug Torrance <dtorrance at piedmont.edu>
Date: Tue Mar 8 11:26:46 2016 -0500
debian: Update with version 0.95.7-5 packaging.
---
debian/README.build | 78 --------------------------------
debian/changelog | 13 ++++++
debian/control | 18 --------
debian/copyright | 57 +++++++++++++----------
debian/libwings-dev.changelog-upstream | 1 -
debian/libwings3.changelog-upstream | 1 -
debian/libwraster-dev.changelog-upstream | 1 -
debian/libwraster5.changelog-upstream | 1 -
debian/libwutil5.changelog-upstream | 1 -
debian/rules | 7 +--
debian/wmaker-common.changelog-upstream | 1 -
debian/wmaker-common.maintscript | 5 ++
debian/wmaker-dbg.changelog-upstream | 1 -
debian/wmaker.changelog-upstream | 1 -
14 files changed, 53 insertions(+), 133 deletions(-)
diff --git a/debian/README.build b/debian/README.build
deleted file mode 100644
index be5b8f2..0000000
--- a/debian/README.build
+++ /dev/null
@@ -1,78 +0,0 @@
-Building Window Maker for Debian
---------------------------------
-
-* The patches
-
- debian/rules scans debian/patches/ for files named *.diff and these
- are sorted _alphabetically_ before being applied.
-
- You can apply these patches by calling
-
- $ debian/rules patch-wmaker-stamp
-
- and remove them with
-
- $ debian/rules unpatch-wmaker
-
- Why are some patches in debian/patches and others are stored in the
- debian .diff?
-
- For starters I (still) dislike the idea of doing:
-
- $ dpkg -x package.dsc
-
- and being left with something that is not the source from
- which the package is built. It makes NMUs harder for both the
- NMUer and the maintainer, mostly because people tend to get it
- wrong (since it's undocumented). I use CVS for (almost all
- of) my packages, and I like to be able to take a look at the
- source used to build certain release of a package _without_
- having to check out that release. On the other hand, I try to
- send patches upstream, and over the years I've learned that
- Debian's source package format is really not the best thing to
- use in this context. Merging between debian's source and
- upstream's (after accepting patches) is messy.
-
- The system used by this package is a compromise between these
- two things: "most" of the patches are applied directly by just
- unpacking the Debian sources, and some are left out. The
- things that are left out (those stored in debian/patches) are
- in general things that should go upstream. Things that aren't
- really Debian specific. Security fixes, patches submitted
- upstream by other people, that kind of thing. This keeps the
- patches nicely separated, makes it easy to send the upstream,
- to take them out and to update them if that becomes necessary.
- In general, if it's Debian specific, patch the sources
- directly. If it should go upstream, put it in debian/patches.
-
- The easiest way to generate patches is to use CVS. Patches coming out
- of 'cvs diff -u whaterver/you.modded' will just work if you put them
- in debian/patches. If you can't use CVS for whatever reason, just:
-
- $ diff -u wmaker.orig wmaker > your.patch
-
- will do the right thing.
-
-* Building options
-
- The following make variables are used to pass options to the configure
- script:
-
- XLOCALE := --disable-locale
- MODELOCK := --enable-modelock
-
- XINERAMA := --enable-xinerama
-
- (*) These are not used by default
-
- Since these are make variables, you can do something like:
-
- $ SOUND=--disable-sound debian/rules build
-
- If you want to build a debugging version, this will do it:
-
- $ export DEB_BUILD_OPTIONS=nostrip,debug,noopt
- $ fakeroot debian/rules binary
-
---
-vim: tw=72 ft=text
diff --git a/debian/changelog b/debian/changelog
index 1d594a5..1b92eac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+wmaker (0.95.7-5) unstable; urgency=medium
+
+ * Clean up debian/copyright. Add some files which were missed in the LGPL
+ paragraph and bump its version to 2+. Restore debian/* paragraph.
+ * Remove useless debian/*.changelog-upstream files.
+ * Remove out of date file README.build.
+ * Drop wmaker-dbg package in favor of automatically generated wmaker-dbgsym.
+ * New file debian/wmaker-common.maintscript; removes obsolete config files
+ (Closes: #726075).
+ * Do not use buggy --enable-randr configure option (Closes: #816993).
+
+ -- Doug Torrance <dtorrance at piedmont.edu> Mon, 07 Mar 2016 11:04:33 -0500
+
wmaker (0.95.7-4) unstable; urgency=medium
* Update Vcs-Browser to use https; fixes vcs-field-uses-insecure-uri Lintian
diff --git a/debian/control b/debian/control
index 07c3797..91a4339 100644
--- a/debian/control
+++ b/debian/control
@@ -147,21 +147,3 @@ Description: Window Maker's own widget set - runtime library
the WindowMaker window manager.
.
This package contains the libWINGs runtime library.
-
-Package: wmaker-dbg
-Architecture: any
-Multi-Arch: same
-Section: debug
-Priority: extra
-Depends: libwraster5 (= ${binary:Version}) | libwings3 (= ${binary:Version}) | libwutil5 (= ${binary:Version}) | wmaker (= ${binary:Version}),
- ${misc:Depends}
-Description: Debugging symbols for WindowMaker packages
- Written by Alfredo Kojima almost from scratch, resembles the NeXTStep look
- very closely, and it is now an official GNU project. Window Maker is not
- overloaded with features, and it is easier to configure than most other window
- managers. Its final goal is to produce a window manager that doesn't require
- editing of configuration files. Window Maker is fast and doesn't require tons
- of memory to run.
- .
- This package contains debugging symbols for Window Maker and its core
- libraries (libWINGs, libWutils, libwraster).
diff --git a/debian/copyright b/debian/copyright
index 9fdc3c5..63983f8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,31 +7,12 @@ Files: *
Copyright: 1997, Alfredo Kengi Kojima <kojima at windowmaker.info>
2011, Carlos R. Mafra <crmafra at gmail.com>
License: GPL-2+
- 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 package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA 02110-1301 USA
- .
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
-Files: wrlib/*
-Copyright: 2000-2003, Alfredo Kengi Kojima <kojima at windowmaker.info>
- 2011, Carlos R. Mafra <crmafra at gmail.com>
-License: LGPL-2
+Files: util/common.h wmlib/* wrlib/*
+Copyright: 1997-2003 Alfredo Kengi Kojima <kojima at windowmaker.info>
+ 1998-2004 Dan Pascu
+ 2011 Carlos R. Mafra <crmafra at gmail.com>
+License: LGPL-2+
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
@@ -98,12 +79,40 @@ License: WTFPL-1
.
DO WHAT THE FUCK YOU WANT TO.
+Files: debian/*
+Copyright: 1997, Neil A. Rubin <nar5 at po.cwru.edu>
+ 1997, Marcelo E. Magallon <mmagallo at debian.org>
+ 2011, Rodolfo García Peñas (kix) <kix at kix.es>
+License: GPL-2+
+
Files: debian/debianfiles/Themes/DebianLegacy.style
debian/debianfiles/Themes/DebianLegacy.txt
debian/debianfiles/Themes/DebianSwirl.jpg
Copyright: 1999 Gary Burke <gfburke at earthlink.net>
License: GPL-1+
+License: GPL-2+
+ 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 package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
+
License: GPL-1+
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
diff --git a/debian/libwings-dev.changelog-upstream b/debian/libwings-dev.changelog-upstream
deleted file mode 100644
index 56631ab..0000000
--- a/debian/libwings-dev.changelog-upstream
+++ /dev/null
@@ -1 +0,0 @@
-ChangeLog
diff --git a/debian/libwings3.changelog-upstream b/debian/libwings3.changelog-upstream
deleted file mode 100644
index 56631ab..0000000
--- a/debian/libwings3.changelog-upstream
+++ /dev/null
@@ -1 +0,0 @@
-ChangeLog
diff --git a/debian/libwraster-dev.changelog-upstream b/debian/libwraster-dev.changelog-upstream
deleted file mode 100644
index 56631ab..0000000
--- a/debian/libwraster-dev.changelog-upstream
+++ /dev/null
@@ -1 +0,0 @@
-ChangeLog
diff --git a/debian/libwraster5.changelog-upstream b/debian/libwraster5.changelog-upstream
deleted file mode 100644
index 56631ab..0000000
--- a/debian/libwraster5.changelog-upstream
+++ /dev/null
@@ -1 +0,0 @@
-ChangeLog
diff --git a/debian/libwutil5.changelog-upstream b/debian/libwutil5.changelog-upstream
deleted file mode 100644
index 56631ab..0000000
--- a/debian/libwutil5.changelog-upstream
+++ /dev/null
@@ -1 +0,0 @@
-ChangeLog
diff --git a/debian/rules b/debian/rules
index 71a41a3..0fa1168 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,8 +6,8 @@ export DEB_CFLAGS_MAINT_APPEND += -Wall -DGLOBAL_DEFAULTS_SUBDIR=\"GNUstep/Defau
LINGUAS := $(patsubst po/%.po, %, $(wildcard po/*.po))
-WMAKER_OPTIONS := --disable-locale --enable-modelock --enable-randr --enable-pango --enable-xinerama
-#not-enabled --enable-usermenu --disable-shape --disable-shm --enable-xrandr
+WMAKER_OPTIONS := --disable-locale --enable-modelock --enable-pango --enable-xinerama
+#not-enabled --enable-usermenu --disable-shape --disable-shm --enable-randr
#not-enabled --disable-xpm --disable-png --disable-jpeg --disable-gif --disable-tiff
# Debian packages destination folder
@@ -57,6 +57,3 @@ override_dh_install:
# Install files
dh_install
-
-override_dh_strip:
- dh_strip --dbg-package=wmaker-dbg
diff --git a/debian/wmaker-common.changelog-upstream b/debian/wmaker-common.changelog-upstream
deleted file mode 100644
index 56631ab..0000000
--- a/debian/wmaker-common.changelog-upstream
+++ /dev/null
@@ -1 +0,0 @@
-ChangeLog
diff --git a/debian/wmaker-common.maintscript b/debian/wmaker-common.maintscript
new file mode 100644
index 0000000..64ff91b
--- /dev/null
+++ b/debian/wmaker-common.maintscript
@@ -0,0 +1,5 @@
+rm_conffile /etc/X11/WindowMaker/appearance.menu 0.95.7-5~
+rm_conffile /etc/X11/WindowMaker/menu.posthook 0.95.7-5~
+rm_conffile /etc/X11/WindowMaker/menu.prehook 0.95.7-5~
+mv_conffile /etc/X11/WindowMaker/background.menu /usr/share/WindowMaker/background.menu 0.95.7-5~
+mv_conffile /etc/X11/WindowMaker/wmmacros /usr/share/WindowMaker/wmmacros 0.95.7-5~
diff --git a/debian/wmaker-dbg.changelog-upstream b/debian/wmaker-dbg.changelog-upstream
deleted file mode 100644
index 56631ab..0000000
--- a/debian/wmaker-dbg.changelog-upstream
+++ /dev/null
@@ -1 +0,0 @@
-ChangeLog
diff --git a/debian/wmaker.changelog-upstream b/debian/wmaker.changelog-upstream
deleted file mode 100644
index 56631ab..0000000
--- a/debian/wmaker.changelog-upstream
+++ /dev/null
@@ -1 +0,0 @@
-ChangeLog
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmaker.git
More information about the Pkg-wmaker-commits
mailing list