Re: r11937 - in packages/trunk/amphetamine-data/debian: . source
On Tue, 15 Mar 2011 14:23:37 +0200 Peter Pentchev wrote: > > Modified: packages/trunk/amphetamine-data/debian/copyright > > === > > --- packages/trunk/amphetamine-data/debian/copyright2011-03-14 > > 18:05:31 UTC (rev 11936) > > +++ packages/trunk/amphetamine-data/debian/copyright2011-03-15 > > 03:24:43 UTC (rev 11937) > > @@ -1,9 +1,51 @@ > > -This is a Debian prepackaged version of data files for the game > > -amphetamine. > > +This is a Debian prepackaged version of the game amphetamine. > > > > This package was put together by Joey Hess , using > > sources from: > > http://www.dataway.ch/~lukasl/amph/amph.html > > > > -Amphetamine, including these data files, is GPL'd. The full text of the GPL > > -can be found in /usr/share/common-licenses/GPL > > +The file Gifload.cpp has the following copyright: > [snip more copyright file replacement] > > Errr, was this part actually intended? You replaced the amphetamine-data > copyright file with amphetamine's one :) I decided to sync the text for both since they have the same origin. I'm not even sure why there are two source packages anyway. They're both in main. Mike ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for grhino branch, master, updated. debian/0.16.0-5-9-gf960e79
The following commit has been merged in the master branch: commit f960e79c5372191fd0d9132b685f51846c9bed6e Author: Vincent Legout Date: Tue Mar 15 20:06:21 2011 +0100 debhelper 8 diff --git a/debian/changelog b/debian/changelog index ea9716f..1df1d2f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,13 @@ -grhino (0.16.1-1) UNRELEASED; urgency=low +grhino (0.16.1-1) unstable; urgency=low * New upstream release: - 02_gcc_4_3.diff, 03_desktop_file.diff: Removed, merged upstream * Bump Standards-Version to 3.9.1 - Use Breaks instead of Conflicts - * Switch to debhelper 7 -- debian/compat: Update to 7 + * Switch to debhelper 8 +- debian/compat: Update to 8 - Remove Build-Depends on quilt, cdbs, autoconf, automake1.9 and gettext -- Build-Depends on debhelper (7.0.50~) to use override targets +- Build-Depends on debhelper (>= 8) - Rewrite debian/rules - debian/grhino.docs, debian/clean: Added * debian/copyright: Updated diff --git a/debian/compat b/debian/compat index 7f8f011..45a4fb7 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +8 diff --git a/debian/control b/debian/control index 379a092..4564ab8 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: games Priority: optional Maintainer: Debian Games Team Uploaders: Vincent Legout -Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libgtk2.0-dev, libgnome2-dev, libgnomeui-dev, imagemagick, scrollkeeper +Build-Depends: debhelper (>= 8), autotools-dev, libgtk2.0-dev, libgnome2-dev, libgnomeui-dev, imagemagick, scrollkeeper Standards-Version: 3.9.1 Homepage: http://rhino.sourceforge.net/ Vcs-Git: git://git.debian.org/git/pkg-games/grhino.git -- Packaging for grhino ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for grhino branch, master, updated. debian/0.16.0-5-9-gf960e79
The following commit has been merged in the master branch:
commit 7500d216989f4bb18dba8fe1316b343fa85389a2
Author: Vincent Legout
Date: Tue Mar 15 19:59:17 2011 +0100
Update patch
diff --git a/debian/changelog b/debian/changelog
index 1374869..ea9716f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,9 @@ grhino (0.16.1-1) UNRELEASED; urgency=low
- Rewrite debian/rules
- debian/grhino.docs, debian/clean: Added
* debian/copyright: Updated
+ * debian/patches: DEP3 headers should not start with #
- -- Vincent Legout Tue, 08 Feb 2011 12:34:29 +0100
+ -- Vincent Legout Tue, 15 Mar 2011 19:51:20 +0100
grhino (0.16.0-5) unstable; urgency=low
diff --git a/debian/patches/01_dirname_no_version.diff
b/debian/patches/01_dirname_no_version.diff
index 2788962..8ea85de 100644
--- a/debian/patches/01_dirname_no_version.diff
+++ b/debian/patches/01_dirname_no_version.diff
@@ -1,5 +1,5 @@
-# Description: Remove -${VERSION} in directory name
-# Author: Bart Martens
+Description: Remove -${VERSION} in directory name
+Author: Bart Martens
Index: grhino/Makefile.in
===
--
Packaging for grhino
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for gplanarity branch, master, updated. debian/16723-2-2-g4983270
The following commit has been merged in the master branch: commit 49832708bf671fe494126c356d53d8ce07f0ea3b Author: Vincent Legout Date: Tue Mar 15 19:20:15 2011 +0100 Switch to debhelper 8 diff --git a/debian/changelog b/debian/changelog index 8a26f5f..220f18b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ gplanarity (16723-3) unstable; urgency=low * Upload to unstable + * Switch to debhelper 8 - -- Vincent Legout Thu, 10 Feb 2011 09:03:44 +0100 + -- Vincent Legout Tue, 15 Mar 2011 19:18:25 +0100 gplanarity (16723-2) experimental; urgency=low diff --git a/debian/compat b/debian/compat index 7f8f011..45a4fb7 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +8 diff --git a/debian/control b/debian/control index e3794ed..b7c6e91 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: games Priority: optional Maintainer: Debian Games Team Uploaders: Vincent Legout -Build-Depends: debhelper (>= 7.0.50~), libgtk2.0-dev, libcairo2-dev, libfreetype6-dev, docbook-to-man, libtiff-dev, libjasper-dev +Build-Depends: debhelper (>= 8), libgtk2.0-dev, libcairo2-dev, libfreetype6-dev, docbook-to-man, libtiff-dev, libjasper-dev Standards-Version: 3.9.1 Homepage: http://web.mit.edu/xiphmont/Public/gPlanarity.html Vcs-Git: git://git.debian.org/git/pkg-games/gplanarity.git -- Packaging for gplanarity ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for fairymax annotated tag, debian/4.8q-2, created. debian/4.8q-2
The annotated tag, debian/4.8q-2 has been created at 3eb2bc5e192964c76ceb27e590283632d858a526 (tag) tagging 7400b2ba37a4ba5af96950310dcd9edebc2c73c7 (commit) replaces debian/4.8q-1 tagged by Vincent Legout on Tue Mar 15 18:37:15 2011 +0100 - Shortlog Debian release 4.8q-2 Vincent Legout (2): Upload to unstable Switch to debhelper 8 --- -- Packaging for fairymax ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Packaging for fairymax annotated tag, debian/4.8q-1, updated. debian/4.8q-1
The annotated tag, debian/4.8q-1 has been updated to c3b082195421c903f5a55af2808841c7b91e6b48 (tag) from 6fcfe07ccc1c12c74fa9443e70923a3fe4f0308f (which is now obsolete) tagging 08a2c4e2dcf168f1d724a0d7cf540686c140185e (commit) replaces debian/4.8o-1 tagged by Vincent Legout on Thu Feb 10 09:34:06 2011 +0100 - Shortlog Debian release 4.8q-1 Vincent Legout (7): Imported Upstream version 4.8q Merge commit 'upstream/4.8q' Switch to 3.0 (quilt) source format Bump to Standards-Version 3.9.1 Add debian/clean Update get-orig-source target Upload to experimental --- -- Packaging for fairymax ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
r11944 - packages/tags/fenix
Author: ansgar Date: 2011-03-15 16:22:59 + (Tue, 15 Mar 2011) New Revision: 11944 Added: packages/tags/fenix/0.92a.dfsg1-8/ Log: tagging version 0.92a.dfsg1-8 ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
r11943 - packages/trunk/fenix/debian
Author: roam-guest Date: 2011-03-15 16:21:03 + (Tue, 15 Mar 2011) New Revision: 11943 Modified: packages/trunk/fenix/debian/changelog Log: Uhm, ready for releasing, I think. Modified: packages/trunk/fenix/debian/changelog === --- packages/trunk/fenix/debian/changelog 2011-03-15 16:13:19 UTC (rev 11942) +++ packages/trunk/fenix/debian/changelog 2011-03-15 16:21:03 UTC (rev 11943) @@ -1,8 +1,8 @@ -fenix (0.92a.dfsg1-8) UNRELEASED; urgency=low +fenix (0.92a.dfsg1-8) unstable; urgency=low * Add the kfreebsd patch to fix the FTBFS on GNU/kFreeBSD. - -- Peter Pentchev Mon, 14 Mar 2011 12:44:14 +0200 + -- Peter Pentchev Tue, 15 Mar 2011 15:10:25 +0200 fenix (0.92a.dfsg1-7) unstable; urgency=low ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
r11942 - packages/trunk/rott/debian
Author: fabian-guest
Date: 2011-03-15 16:13:19 + (Tue, 15 Mar 2011)
New Revision: 11942
Modified:
packages/trunk/rott/debian/rott.prerm
Log:
On upgrade and remove, delete all data files that are definitely not in
rott-data. If rott-data is *not* installed on remove, delete the whole data
file directory.
Modified: packages/trunk/rott/debian/rott.prerm
===
--- packages/trunk/rott/debian/rott.prerm 2011-03-15 14:23:22 UTC (rev
11941)
+++ packages/trunk/rott/debian/rott.prerm 2011-03-15 16:13:19 UTC (rev
11942)
@@ -1,12 +1,43 @@
#!/bin/sh
set -e
+remove_data_safe ()
+{
+ # On upgrade and remove, we can safely delete all data files
+ # that are definitely not in rott-data:
+ rm -f /usr/share/doc/rott/vendor.doc
+ rm -f /usr/share/games/rott/1rott13.zip
+ rm -f /usr/share/games/rott/FILE_ID.DIZ
+ rm -f /usr/share/games/rott/INSTALL.EXE
+ rm -f /usr/share/games/rott/MODEM.PCK
+ rm -f /usr/share/games/rott/ORDER.FRM
+ rm -f /usr/share/games/rott/README.EXE
+ rm -f /usr/share/games/rott/ROTT.EXE
+ rm -f /usr/share/games/rott/ROTTHELP.EXE
+ rm -f /usr/share/games/rott/ROTTIPX.EXE
+ rm -f /usr/share/games/rott/ROTTSER.EXE
+ rm -f /usr/share/games/rott/ROTTSW13.SHR
+ rm -f /usr/share/games/rott/ROTTSW13.SHR
+ rm -f /usr/share/games/rott/SETUP.EXE
+ rm -f /usr/share/games/rott/SNDSETUP.EXE
+}
+
case "$1" in
remove|deconfigure)
update-alternatives --quiet --remove-all rott
+
+ remove_data_safe
+
+ if [ ! "`dpkg -l rott-data | grep -q ^ii`" ]
+ then
+ # rott-data is not (yet) installed, it is safe
+ # to delete the whole directory.
+ rm -rf /usr/share/games/rott
+ fi
;;
upgrade|failed-upgrade)
+ remove_data_safe
;;
*)
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
r11941 - packages/trunk/7kaa/debian
Author: miriam Date: 2011-03-15 14:23:22 + (Tue, 15 Mar 2011) New Revision: 11941 Modified: packages/trunk/7kaa/debian/rules Log: clean target in debian/rules does not depend on config anymore Modified: packages/trunk/7kaa/debian/rules === --- packages/trunk/7kaa/debian/rules2011-03-15 12:16:11 UTC (rev 11940) +++ packages/trunk/7kaa/debian/rules2011-03-15 14:23:22 UTC (rev 11941) @@ -41,7 +41,7 @@ $(MAKE) touch $@ -clean: config +clean: dh_testdir dh_testroot rm -fv build-stamp config-stamp ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
Re: r11937 - in packages/trunk/amphetamine-data/debian: . source
On Tue, Mar 15, 2011 at 03:24:49AM +, Michael Gilbert wrote: > Author: gilbert-guest > Date: 2011-03-15 03:24:43 + (Tue, 15 Mar 2011) > New Revision: 11937 > [snip] > Modified: >packages/trunk/amphetamine-data/debian/changelog >packages/trunk/amphetamine-data/debian/control >packages/trunk/amphetamine-data/debian/copyright >packages/trunk/amphetamine-data/debian/rules > Log: > adopt amphetamine-data and update to modern package formats [snip] > Modified: packages/trunk/amphetamine-data/debian/copyright > === > --- packages/trunk/amphetamine-data/debian/copyright 2011-03-14 18:05:31 UTC > (rev 11936) > +++ packages/trunk/amphetamine-data/debian/copyright 2011-03-15 03:24:43 UTC > (rev 11937) > @@ -1,9 +1,51 @@ > -This is a Debian prepackaged version of data files for the game > -amphetamine. > +This is a Debian prepackaged version of the game amphetamine. > > This package was put together by Joey Hess , using > sources from: > http://www.dataway.ch/~lukasl/amph/amph.html > > -Amphetamine, including these data files, is GPL'd. The full text of the GPL > -can be found in /usr/share/common-licenses/GPL > +The file Gifload.cpp has the following copyright: [snip more copyright file replacement] Errr, was this part actually intended? You replaced the amphetamine-data copyright file with amphetamine's one :) G'luck, Peter -- Peter Pentchev r...@ringlet.net r...@freebsd.org pe...@packetscale.com PGP key:http://people.FreeBSD.org/~roam/roam.key.asc Key fingerprint FDBA FD79 C26F 3C51 C95E DF9E ED18 B68D 1619 4553 What would this sentence be like if it weren't self-referential? signature.asc Description: Digital signature ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
r11940 - in packages/trunk/fenix/debian: . patches
Author: roam-guest
Date: 2011-03-15 12:16:11 + (Tue, 15 Mar 2011)
New Revision: 11940
Added:
packages/trunk/fenix/debian/patches/kfreebsd.patch
Modified:
packages/trunk/fenix/debian/changelog
packages/trunk/fenix/debian/patches/series
Log:
Fix the FTBFS on GNU/kFreeBSD.
Modified: packages/trunk/fenix/debian/changelog
===
--- packages/trunk/fenix/debian/changelog 2011-03-15 03:30:57 UTC (rev
11939)
+++ packages/trunk/fenix/debian/changelog 2011-03-15 12:16:11 UTC (rev
11940)
@@ -1,3 +1,9 @@
+fenix (0.92a.dfsg1-8) UNRELEASED; urgency=low
+
+ * Add the kfreebsd patch to fix the FTBFS on GNU/kFreeBSD.
+
+ -- Peter Pentchev Mon, 14 Mar 2011 12:44:14 +0200
+
fenix (0.92a.dfsg1-7) unstable; urgency=low
* Team upload.
Added: packages/trunk/fenix/debian/patches/kfreebsd.patch
===
--- packages/trunk/fenix/debian/patches/kfreebsd.patch
(rev 0)
+++ packages/trunk/fenix/debian/patches/kfreebsd.patch 2011-03-15 12:16:11 UTC
(rev 11940)
@@ -0,0 +1,101 @@
+Description: Fix the build on GNU/kFreeBSD
+Forwarded: no
+Author: Peter Pentchev
+Last-Update: 2011-03-15
+
+--- a/configure
b/configure
+@@ -1621,7 +1621,7 @@
+
+
+ case "$target_os" in
+-linux-gnu*)
++linux-gnu*|kfreebsd-gnu*)
+ case "$target_cpu" in
+ powerpc*)
+ COMMON_CFLAGS="-Wall -DTARGET_LinuxPPC -DTARGET_Linux"
+--- a/configure.in
b/configure.in
+@@ -40,7 +40,7 @@
+
+ dnl Aqui es donde se chequeara el SO, pero solo hay una opcion xD
+ case "$target_os" in
+-linux-gnu*)
++linux-gnu*|kfreebsd-gnu*)
+ case "$target_cpu" in
+ powerpc*)
+ COMMON_CFLAGS="-Wall -DTARGET_LinuxPPC -DTARGET_Linux"
+--- a/fxi/src/i_func.c
b/fxi/src/i_func.c
+@@ -3577,6 +3577,27 @@
+
+ #elif !defined(TARGET_MAC)
+ /* Linux and other Unix (?) */
++#ifdef __FreeBSD_kernel__
++long pagesize, freeram;
++
++pagesize = sysconf(_SC_PAGE_SIZE);
++freeram = sysconf(_SC_AVPHYS_PAGES);
++if (pagesize == -1L)
++{
++ gr_con_printf (_("No pagesize"));
++ return -1;
++}
++else if (freeram == -1L)
++{
++ gr_con_printf (_("No freeram"));
++ return -1;
++}
++else
++{
++ gr_con_printf (_("Returning %d"), pagesize * freeram);
++ return pagesize * freeram;
++}
++#else
+ struct sysinfo meminf;
+ int fv;
+
+@@ -3596,6 +3617,7 @@
+ gr_con_printf (_("Returning %d"), meminf.freeram);
+ return meminf.freeram;
+ }
++#endif
+
+ return -1;
+
+@@ -3623,6 +3645,27 @@
+
+ #elif !defined(TARGET_MAC)
+ /* Linux and other Unix (?) */
++#ifdef __FreeBSD_kernel__
++long pagesize, totalram;
++
++pagesize = sysconf(_SC_PAGE_SIZE);
++totalram = sysconf(_SC_PHYS_PAGES);
++if (pagesize == -1L)
++{
++ gr_con_printf (_("No pagesize"));
++ return -1;
++}
++else if (totalram == -1L)
++{
++ gr_con_printf (_("No totalram"));
++ return -1;
++}
++else
++{
++ gr_con_printf (_("Returning %d"), pagesize * totalram);
++ return pagesize * totalram;
++}
++#else
+ struct sysinfo meminf;
+ int fv;
+
+@@ -3636,6 +3679,7 @@
+ return meminf.totalram * meminf.mem_unit;
+ else
+ return meminf.totalram;
++#endif
+
+ return -1;
+
Modified: packages/trunk/fenix/debian/patches/series
===
--- packages/trunk/fenix/debian/patches/series 2011-03-15 03:30:57 UTC (rev
11939)
+++ packages/trunk/fenix/debian/patches/series 2011-03-15 12:16:11 UTC (rev
11940)
@@ -24,3 +24,4 @@
string_alloc_crash.patch
spelling.patch
headers.patch
+kfreebsd.patch
___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
[SCM] Atari 2600 Emulator for SDL & the X Window System branch, master, updated. debian/3.3-2-1-g53e065b
The following commit has been merged in the master branch: commit 53e065b1038ed247dabaac180d157cc6b11de6ef Author: Stephen Kitt Date: Tue Mar 15 08:00:37 2011 +0100 Set DMUA: yes, as done by Piotr Ożarowski in 3.3-2. diff --git a/debian/control b/debian/control index 23458b0..d5d5810 100644 --- a/debian/control +++ b/debian/control @@ -3,6 +3,7 @@ Section: otherosfs Priority: optional Maintainer: Debian Games Team Uploaders: Stephen Kitt +DM-Upload-Allowed: yes Standards-Version: 3.9.1 Build-Depends: debhelper (>= 7.0.50), libsdl1.2-dev, zlib1g-dev, libpng12-dev, autotools-dev Homepage: http://stella.sf.net -- Atari 2600 Emulator for SDL & the X Window System ___ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
