Browse Source

Updates from the official Debian package.

original
Tomasz Krasuski 2 years ago
parent
commit
2d79c62ef7
6 changed files with 36 additions and 17 deletions
  1. 5
    0
      DOC/ChangeLog
  2. 17
    2
      debian/changelog
  3. 1
    0
      debian/compat
  4. 4
    4
      debian/control
  5. 8
    11
      debian/rules
  6. 1
    0
      debian/source/format

+ 5
- 0
DOC/ChangeLog View File

@@ -1,3 +1,8 @@
1
+2016-10-08  Tomasz Krasuski  <kr0tki@poczta.onet.pl>
2
+* debian/compat, debian/changelog, debian/control, debian/rules,
3
+  debian/source/format: Updates from the official Debian package.
4
+
5
+
1 6
 2016-10-07  Tomasz Krasuski  <kr0tki@poczta.onet.pl>
2 7
 * sdl/input.c: Fix segfault when using -nojoystick. Fix improper use of
3 8
   SDL_PollEvent - caused keyboard input lag when moving a mouse or joystick.

+ 17
- 2
debian/changelog View File

@@ -1,8 +1,23 @@
1
+atari800 (3.1.0-2) unstable; urgency=medium
2
+
3
+  * [8596bb2] update config.{sub, guess} (Closes: #762477)
4
+  * Thank Aurelien Jarno for report and Tobias Frost for a friendly NMU
5
+
6
+ -- Antonin Kral <A.Kral@sh.cvut.cz>  Mon, 11 Apr 2016 08:36:31 +0200
7
+
8
+atari800 (3.1.0-1) unstable; urgency=medium
9
+
10
+  * [947c00c] Imported Upstream version 3.1.0
11
+  * [6d267ad] update standards version
12
+  * [646e6e7] add source format
13
+
14
+ -- Antonin Kral <A.Kral@sh.cvut.cz>  Tue, 15 Apr 2014 14:07:16 +0200
15
+
1 16
 atari800 (3.0.0-1) unstable; urgency=low
2 17
 
3
-  * New upstream release.
18
+  * New upstream release
4 19
 
5
- -- Petr Stehlik <pstehlik@sophics.cz>  Sun, 03 Mar 2013 03:03:03 +0200
20
+ -- Antonin Kral <A.Kral@sh.cvut.cz>  Sat, 16 Mar 2013 13:02:47 +0100
6 21
 
7 22
 atari800 (2.2.1-2) unstable; urgency=low
8 23
 

+ 1
- 0
debian/compat View File

@@ -0,0 +1 @@
1
+9

+ 4
- 4
debian/control View File

@@ -2,16 +2,16 @@ Source: atari800
2 2
 Section: contrib/otherosfs
3 3
 Priority: optional
4 4
 Maintainer: Antonin Kral <A.Kral@sh.cvut.cz>
5
-Build-Depends: libsdl1.2-dev, zlib1g-dev, libreadline-dev, libgl1-mesa-dev, libpng-dev, autotools-dev
6
-Standards-Version: 3.9.3
5
+Build-Depends: libsdl1.2-dev, zlib1g-dev, libreadline-dev, libgl1-mesa-dev, libpng-dev, autotools-dev, dpkg-dev (>= 1.16.1~), autotools-dev
6
+Standards-Version: 3.9.7
7 7
 Vcs-Git: git://github.com/bobek/aranym800-debian.git
8 8
 Vcs-Browser: https://github.com/bobek/aranym800-debian
9 9
 
10 10
 Package: atari800
11 11
 Architecture: any
12 12
 Depends: ${shlibs:Depends}
13
-Description: Atari800 emulator for SDL
14
- This is an emulator of Atari 8-bit computer systems including the 400, 800,
13
+Description: Atari 8-bit emulator for SDL
14
+ Atari800 is an emulator of Atari 8-bit computer systems including the 400, 800,
15 15
  1200XL, 600XL, 800XL, 65XE, 130XE, 800XE and the XE Game System,
16 16
  and also of the Atari 5200 SuperSystem console.
17 17
  .

+ 8
- 11
debian/rules View File

@@ -9,15 +9,10 @@ P=atari800
9 9
 
10 10
 ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
11 11
 
12
-# Special Debian build options - nostrip yet un-handled
13
-export CFLAGS
14
-CFLAGS += -g -Wall
15
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
16
-CFLAGS += -O0
17
-else
18
-CFLAGS += -O3
19
-endif
20
-
12
+DPKG_EXPORT_BUILDFLAGS = 1
13
+include /usr/share/dpkg/buildflags.mk
14
+CFLAGS+=$(CPPFLAGS)
15
+CXXFLAGS+=$(CPPFLAGS)
21 16
 
22 17
 # Build the binary components and assemble the libraries
23 18
 # =====================================================================
@@ -30,6 +25,7 @@ build-stamp:
30 25
 	touch build-stamp
31 26
 
32 27
 bld-sdl:
28
+	cp /usr/share/misc/config.guess /usr/share/misc/config.sub src
33 29
 	cd src ; if [ -e Makefile ]; then $(MAKE) clean; fi
34 30
 	cd src ; ./configure \
35 31
 		 --with-video=sdl --with-sound=sdl
@@ -42,6 +38,7 @@ clean:
42 38
 	-rm -f build-stamp
43 39
 	cd src ; if [ -e Makefile ]; then $(MAKE) clean; fi; \
44 40
 	 rm -f config.log config.status config.h Makefile
41
+	rm -f src/config.guess src/config.sub
45 42
 	mv ./atari800.spec ./tmp ; rm -f atari800 ; rm -f atari800.* ; mv ./tmp ./atari800.spec
46 43
 	-rm -rf	debian/tmp debian/*~ *~ *.orig *.log \
47 44
 		debian/files* debian/substvars*
@@ -81,7 +78,7 @@ binary-arch:		checkroot build
81 78
 	cp DOC/CREDITS debian/tmp/usr/share/doc/$(P)/CREDITS
82 79
 	cp DOC/README debian/tmp/usr/share/doc/$(P)/README
83 80
 	cp DOC/USAGE debian/tmp/usr/share/doc/$(P)/USAGE
84
-	gzip -9v debian/tmp/usr/share/doc/$(P)/*
81
+	gzip -9nv debian/tmp/usr/share/doc/$(P)/*
85 82
 
86 83
 # These are too small to gzip
87 84
 #
@@ -100,7 +97,7 @@ binary-arch:		checkroot build
100 97
 #
101 98
 	install -d debian/tmp/usr/share/man/man1
102 99
 	install -m 644 src/$(P).man debian/tmp/usr/share/man/man1/$(P).1
103
-	gzip -9 debian/tmp/usr/share/man/man1/$(P).1
100
+	gzip -9nv debian/tmp/usr/share/man/man1/$(P).1
104 101
 
105 102
 # install menu file
106 103
 #

+ 1
- 0
debian/source/format View File

@@ -0,0 +1 @@
1
+3.0 (quilt)

Loading…
Cancel
Save