reverted: --- bsdgames-2.17/debian/README.source +++ bsdgames-2.17.orig/debian/README.source @@ -1,57 +0,0 @@ -This package uses quilt to manage all modifications to the upstream -source. Changes are stored in the source package as diffs in -debian/patches and applied during the build. - -To configure quilt to use debian/patches instead of patches, you want -either to export QUILT_PATCHES=debian/patches in your environment -or use this snippet in your ~/.quiltrc: - - for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do - if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then - export QUILT_PATCHES=debian/patches - fi - done - -To get the fully patched source after unpacking the source package, cd to -the root level of the source package and run: - - quilt push -a - -The last patch listed in debian/patches/series will become the current -patch. - -To add a new set of changes, first run quilt push -a, and then run: - - quilt new - -where is a descriptive name for the patch, used as the filename in -debian/patches. Then, for every file that will be modified by this patch, -run: - - quilt add - -before editing those files. You must tell quilt with quilt add what files -will be part of the patch before making changes or quilt will not work -properly. After editing the files, run: - - quilt refresh - -to save the results as a patch. - -Alternately, if you already have an external patch and you just want to -add it to the build system, run quilt push -a and then: - - quilt import -P /path/to/patch - quilt push -a - -(add -p 0 to quilt import if needed). as above is the filename to -use in debian/patches. The last quilt push -a will apply the patch to -make sure it works properly. - -To remove an existing patch from the list of patches that will be applied, -run: - - quilt delete - -You may need to run quilt pop -a to unapply patches first before running -this command. diff -u bsdgames-2.17/debian/rules bsdgames-2.17/debian/rules --- bsdgames-2.17/debian/rules +++ bsdgames-2.17/debian/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f %: - dh --with quilt $@ + dh $@ build: build-stamp build-stamp: diff -u bsdgames-2.17/debian/changelog bsdgames-2.17/debian/changelog --- bsdgames-2.17/debian/changelog +++ bsdgames-2.17/debian/changelog @@ -1,3 +1,16 @@ +bsdgames (2.17-16ubuntu2) karmic; urgency=low + + * The "quilt is broken" upload, Remaining Changes: + * Add patches directly inline as quilt is broken :( + * debian/control: + + Remove build-depend on quilt. + * Remove README.source file + * [gomuku/{bdisp,main},gomuku.h; cribbage/{crib,io}.c,cribbage.h; + boggle/boggle/{bog,mach}.c,extern.h]: + + Change getline to get_line to fix ftbfs with gcc 4.4 LP:#439396 + + -- Bhavani Shankar Fri, 02 Oct 2009 13:39:53 +0530 + bsdgames (2.17-16ubuntu1) karmic; urgency=low * debian/control: diff -u bsdgames-2.17/debian/control bsdgames-2.17/debian/control --- bsdgames-2.17/debian/control +++ bsdgames-2.17/debian/control @@ -2,8 +2,8 @@ Section: games Priority: optional Build-Depends: debhelper (>= 7), libncurses5-dev, flex, bison, wamerican, - wbritish, dpkg-dev (>= 1.9.0), quilt -Maintainer: Ubuntu MOTU Developers + wbritish, dpkg-dev (>= 1.9.0) +Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian QA Group Standards-Version: 3.8.3 reverted: --- bsdgames-2.17/debian/patches/quiz-presidents.patch +++ bsdgames-2.17.orig/debian/patches/quiz-presidents.patch @@ -1,66 +0,0 @@ -Index: bsdgames-2.17/quiz/datfiles/pres -=================================================================== ---- bsdgames-2.17.orig/quiz/datfiles/pres 2009-09-24 15:19:25.000000000 +0200 -+++ bsdgames-2.17/quiz/datfiles/pres 2009-09-24 15:19:44.000000000 +0200 -@@ -79,5 +79,7 @@ - {J{ames} }{D{anforth|an} }Quayle:{W{illiam|m} }{J{efferson} }Clinton - {W{illiam|m} }{J{efferson} }Clinton:1993-2001:\ - {A{lbert} }{A{rnold} }Gore{{,} J{unio}r}:{G{eorge} }{W{alker} }Bush{{,} J{unio}r} --{G{eorge} }{W{alker} }Bush{{,} J{unio}r}:2001-:\ --{R{ichard} }{B{ruce} }Cheney: -+{G{eorge} }{W{alker} }Bush{{,} J{unio}r}:2001-{{20}0}9:\ -+{R{ichard} }{B{ruce} }Cheney:{B{arack} }{H{ussein} }Obama{ II} -+{B{arack} }{H{ussein} }Obama{ II}:2009-:\ -+{J{oe{seph}} }{R{obinette} }{Biden}{{,} J{unio}r}: -Index: bsdgames-2.17/gomoku/gomoku.6 -=================================================================== ---- bsdgames-2.17.orig/gomoku/gomoku.6 2009-09-24 15:19:50.000000000 +0200 -+++ bsdgames-2.17/gomoku/gomoku.6 2009-09-24 15:19:52.000000000 +0200 -@@ -45,7 +45,7 @@ - .Op Ar inputfile - .Sh DESCRIPTION - .Nm --is a two player game were the object is to get 5 in a row horizontally, -+is a two player game where the object is to get 5 in a row horizontally, - vertically or diagonally on a 19 by 19 grid. - By convention, black always moves first. - With no arguments, -Index: bsdgames-2.17/arithmetic/arithmetic.6 -=================================================================== ---- bsdgames-2.17.orig/arithmetic/arithmetic.6 2009-09-24 15:21:28.000000000 +0200 -+++ bsdgames-2.17/arithmetic/arithmetic.6 2009-09-24 15:21:30.000000000 +0200 -@@ -79,7 +79,7 @@ - .Nm - will not ask you to divide by 0.) - The default --.I range -+.It range - is 10. - .El - .Pp -Index: bsdgames-2.17/backgammon/teachgammon/ttext2.c -=================================================================== ---- bsdgames-2.17.orig/backgammon/teachgammon/ttext2.c 2009-09-24 15:22:41.000000000 +0200 -+++ bsdgames-2.17/backgammon/teachgammon/ttext2.c 2009-09-24 15:22:43.000000000 +0200 -@@ -65,7 +65,7 @@ - "points in a row) are difficult to form, many points nestled close-", - "ly together produce a formidable barrier. Also, while it is good", - "to move back men forward, doing so lessens the opportunity for you", -- "to hit men. Finally, remember that once the two player's have", -+ "to hit men. Finally, remember that once the two players have", - "passed each other on the board, there is no chance of either team", - "being hit, so the game reduces to a race off the board. Addi-", - "tional hints on strategy are presented in the practice game.", -Index: bsdgames-2.17/backgammon/teachgammon/ttext1.c -=================================================================== ---- bsdgames-2.17.orig/backgammon/teachgammon/ttext1.c 2009-09-24 15:23:30.000000000 +0200 -+++ bsdgames-2.17/backgammon/teachgammon/ttext1.c 2009-09-24 15:23:31.000000000 +0200 -@@ -94,7 +94,7 @@ - "\n Although not indicated on the board, the players' homes are", - "located just to the right of the board. A player's men are placed", - "there when they are removed from the board. The board you just", -- "saw was in it's initial position. All games start with the board", -+ "saw was in its initial position. All games start with the board", - "looking like this. Notice that red's pieces are represented by the", - "letter 'r' and white's pieces are represented by the letter 'w'.", - "Also, a position may have zero or more pieces on it, e.g. posi-", reverted: --- bsdgames-2.17/debian/patches/series +++ bsdgames-2.17.orig/debian/patches/series @@ -1,2 +0,0 @@ -add-acronyms.patch -quiz-presidents.patch reverted: --- bsdgames-2.17/debian/patches/add-acronyms.patch +++ bsdgames-2.17.orig/debian/patches/add-acronyms.patch @@ -1,120 +0,0 @@ -Index: bsdgames-2.17/wtf/acronyms -=================================================================== ---- bsdgames-2.17.orig/wtf/acronyms 2009-09-24 14:14:18.000000000 +0200 -+++ bsdgames-2.17/wtf/acronyms 2009-09-24 14:42:25.000000000 +0200 -@@ -139,6 +139,8 @@ - NFI no fucking idea - NFW no fucking way - NIH not invented here -+NIMB not in my backyard -+NIMBY not in my backyard - NMF not my fault - NMP not my problem - NOYB none of your business -@@ -146,6 +148,7 @@ - NP no problem - NRFPT not ready for prime time - NRN no reply necessary -+NSFW not safe for work - OIC oh, I see - OMG oh, my god - OT off topic -@@ -187,6 +190,7 @@ - SFA sweet fuck all - SHID slaps head in disgust - SIMCA sitting in my chair amused -+SIYH sooner if you help - SMLSFB so many losers, so few bullets - SMOP simple matter of programming - SNAFU situation normal, all fucked up -@@ -237,6 +241,7 @@ - WFM works for me - WIBNI wouldn't it be nice if - WIP work in progress -+WIR when it's ready - WOFTAM waste of fucking time and money - WOMBAT waste of money, brain, and time - WRT with respect to -Index: bsdgames-2.17/wtf/acronyms.comp -=================================================================== ---- bsdgames-2.17.orig/wtf/acronyms.comp 2009-09-24 14:14:18.000000000 +0200 -+++ bsdgames-2.17/wtf/acronyms.comp 2009-09-24 14:55:53.000000000 +0200 -@@ -62,7 +62,9 @@ - DCE data control equipment - DCE distributed computing environment - DCT discrete cosine transform -+DD Debian developer - DDC display data channel -+DDPO Debian developer's package overview (http://qa.debian.org/developer.php) - DDR double data rate - DDWG digital display working group - DER distinguished encoding rules -@@ -108,12 +110,14 @@ - FM frequency modulation - FPM fast page mode - FQDN fully qualified domain name -+FTBFS fails to build from source - FTP file transfer protocol - GC garbage collector - GCR group-coded recording - GIF graphics interchange format --GNU gnu's not unix --GPL gnu/general public license -+GIYF google is your friend -+GNU GNU's not unix -+GPL GNU general public license - GPU graphics processing unit - GRE generic routing encapsulation - GUI graphics user interface -@@ -160,6 +164,7 @@ - LCP link control protocol - LDAP lightweight directory access protocol - LED light emitting diode -+LGPL GNU lesser general public license - LIR local internet registry - LLC logical link control - LRC longitudinal redundancy check -@@ -174,7 +179,9 @@ - MIME multipurpose internet mail extensions - MIPS million instructions per second - MMU memory management unit -+MOTU masters of the universe (Ubuntu developer) - MPEG moving picture experts group -+MPL Mozilla public license - MSB most significant bit [or: byte] - MSF minutes seconds frames - MSS maximum segment size -@@ -236,6 +243,7 @@ - RAM random access memory - RCS revision control system - RFC request for comments -+RFS request for sponsorship - RGB red green blue - RIP routing information protocol - RIR regional internet registry -@@ -246,6 +254,9 @@ - RPM revolutions per minute - RTF rich text format - RTS request to send -+RTSL read the source, Luke (open source programming) -+RTSL real-time systems laboratory -+RTSL real-time shading language (Stanford University) - RTT round time trip - S/PDIF sony/phillips digital interface - SACD super audio compact disc -@@ -265,6 +276,7 @@ - SNMP simple network management protocol - SPD serial presence detect - SRAM static random access memory -+SRU stable release update - SSFDC solid state floppy disc card - SSH secure shell - SSL secure sockets layer -@@ -296,6 +308,7 @@ - USB universal serial bus - USWC uncacheable speculative write combining - UTP unshielded twisted pair -+UTSL use the source, Luke (open source programming) - UUCP unix-to-unix copy protocol - VAX virtual address extension - VCM virtual channel memory only in patch2: unchanged: --- bsdgames-2.17.orig/quiz/datfiles/pres +++ bsdgames-2.17/quiz/datfiles/pres @@ -79,5 +79,7 @@ {J{ames} }{D{anforth|an} }Quayle:{W{illiam|m} }{J{efferson} }Clinton {W{illiam|m} }{J{efferson} }Clinton:1993-2001:\ {A{lbert} }{A{rnold} }Gore{{,} J{unio}r}:{G{eorge} }{W{alker} }Bush{{,} J{unio}r} -{G{eorge} }{W{alker} }Bush{{,} J{unio}r}:2001-:\ -{R{ichard} }{B{ruce} }Cheney: +{G{eorge} }{W{alker} }Bush{{,} J{unio}r}:2001-{{20}0}9:\ +{R{ichard} }{B{ruce} }Cheney:{B{arack} }{H{ussein} }Obama{ II} +{B{arack} }{H{ussein} }Obama{ II}:2009-:\ +{J{oe{seph}} }{R{obinette} }{Biden}{{,} J{unio}r}: only in patch2: unchanged: --- bsdgames-2.17.orig/gomoku/bdisp.c +++ bsdgames-2.17/gomoku/bdisp.c @@ -241,7 +241,7 @@ } int -getline(buf, size) +get_line(buf, size) char *buf; int size; { only in patch2: unchanged: --- bsdgames-2.17.orig/gomoku/main.c +++ bsdgames-2.17/gomoku/main.c @@ -155,7 +155,7 @@ if (inputfp == NULL && test == 0) { for (;;) { ask("black or white? "); - getline(buf, sizeof(buf)); + get_line(buf, sizeof(buf)); if (buf[0] == 'b' || buf[0] == 'B') { color = BLACK; break; @@ -172,7 +172,7 @@ } } else { setbuf(stdout, 0); - getline(buf, sizeof(buf)); + get_line(buf, sizeof(buf)); if (strcmp(buf, "black") == 0) color = BLACK; else if (strcmp(buf, "white") == 0) @@ -244,7 +244,7 @@ getinput: if (interactive) ask("move? "); - if (!getline(buf, sizeof(buf))) { + if (!get_line(buf, sizeof(buf))) { curmove = RESIGN; break; } @@ -256,7 +256,7 @@ FILE *fp; ask("save file name? "); - (void)getline(buf, sizeof(buf)); + (void)get_line(buf, sizeof(buf)); if ((fp = fopen(buf, "w")) == NULL) { glog("cannot create save file"); goto getinput; @@ -309,14 +309,14 @@ if (i != RESIGN) { replay: ask("replay? "); - if (getline(buf, sizeof(buf)) && + if (get_line(buf, sizeof(buf)) && (buf[0] == 'y' || buf[0] == 'Y')) goto again; if (strcmp(buf, "save") == 0) { FILE *fp; ask("save file name? "); - (void)getline(buf, sizeof(buf)); + (void)get_line(buf, sizeof(buf)); if ((fp = fopen(buf, "w")) == NULL) { glog("cannot create save file"); goto replay; @@ -367,7 +367,7 @@ quit(); top: ask("cmd? "); - if (!getline(fmtbuf, sizeof(fmtbuf))) + if (!get_line(fmtbuf, sizeof(fmtbuf))) quit(); switch (*fmtbuf) { case '\0': only in patch2: unchanged: --- bsdgames-2.17.orig/gomoku/gomoku.h +++ bsdgames-2.17/gomoku/gomoku.h @@ -263,7 +263,7 @@ void bdinit(struct spotstr *); void init_overlap(void); -int getline(char *, int); +int get_line(char *, int); void ask(const char *); void dislog(const char *); void bdump(FILE *); only in patch2: unchanged: --- bsdgames-2.17.orig/wtf/acronyms.comp +++ bsdgames-2.17/wtf/acronyms.comp @@ -62,7 +62,9 @@ DCE data control equipment DCE distributed computing environment DCT discrete cosine transform +DD Debian developer DDC display data channel +DDPO Debian developer's package overview (http://qa.debian.org/developer.php) DDR double data rate DDWG digital display working group DER distinguished encoding rules @@ -108,12 +110,14 @@ FM frequency modulation FPM fast page mode FQDN fully qualified domain name +FTBFS fails to build from source FTP file transfer protocol GC garbage collector GCR group-coded recording GIF graphics interchange format -GNU gnu's not unix -GPL gnu/general public license +GIYF google is your friend +GNU GNU's not unix +GPL GNU general public license GPU graphics processing unit GRE generic routing encapsulation GUI graphics user interface @@ -160,6 +164,7 @@ LCP link control protocol LDAP lightweight directory access protocol LED light emitting diode +LGPL GNU lesser general public license LIR local internet registry LLC logical link control LRC longitudinal redundancy check @@ -174,7 +179,9 @@ MIME multipurpose internet mail extensions MIPS million instructions per second MMU memory management unit +MOTU masters of the universe (Ubuntu developer) MPEG moving picture experts group +MPL Mozilla public license MSB most significant bit [or: byte] MSF minutes seconds frames MSS maximum segment size @@ -236,6 +243,7 @@ RAM random access memory RCS revision control system RFC request for comments +RFS request for sponsorship RGB red green blue RIP routing information protocol RIR regional internet registry @@ -246,6 +254,9 @@ RPM revolutions per minute RTF rich text format RTS request to send +RTSL read the source, Luke (open source programming) +RTSL real-time systems laboratory +RTSL real-time shading language (Stanford University) RTT round time trip S/PDIF sony/phillips digital interface SACD super audio compact disc @@ -265,6 +276,7 @@ SNMP simple network management protocol SPD serial presence detect SRAM static random access memory +SRU stable release update SSFDC solid state floppy disc card SSH secure shell SSL secure sockets layer @@ -296,6 +308,7 @@ USB universal serial bus USWC uncacheable speculative write combining UTP unshielded twisted pair +UTSL use the source, Luke (open source programming) UUCP unix-to-unix copy protocol VAX virtual address extension VCM virtual channel memory only in patch2: unchanged: --- bsdgames-2.17.orig/wtf/acronyms +++ bsdgames-2.17/wtf/acronyms @@ -139,6 +139,8 @@ NFI no fucking idea NFW no fucking way NIH not invented here +NIMB not in my backyard +NIMBY not in my backyard NMF not my fault NMP not my problem NOYB none of your business @@ -146,6 +148,7 @@ NP no problem NRFPT not ready for prime time NRN no reply necessary +NSFW not safe for work OIC oh, I see OMG oh, my god OT off topic @@ -187,6 +190,7 @@ SFA sweet fuck all SHID slaps head in disgust SIMCA sitting in my chair amused +SIYH sooner if you help SMLSFB so many losers, so few bullets SMOP simple matter of programming SNAFU situation normal, all fucked up @@ -237,6 +241,7 @@ WFM works for me WIBNI wouldn't it be nice if WIP work in progress +WIR when it's ready WOFTAM waste of fucking time and money WOMBAT waste of money, brain, and time WRT with respect to only in patch2: unchanged: --- bsdgames-2.17.orig/cribbage/crib.c +++ bsdgames-2.17/cribbage/crib.c @@ -221,7 +221,7 @@ if (!rflag) { /* player cuts deck */ msg(quiet ? "Cut for crib? " : "Cut to see whose crib it is -- low card wins? "); - getline(); + get_line(); } i = (rand() >> 4) % CARDS; /* random cut */ do { /* comp cuts deck */ @@ -397,7 +397,7 @@ if (!rflag) { /* random cut */ msg(quiet ? "Cut the deck? " : "How many cards down do you wish to cut the deck? "); - getline(); + get_line(); } i = (rand() >> 4) % (CARDS - pos); turnover = deck[i + pos]; only in patch2: unchanged: --- bsdgames-2.17.orig/cribbage/io.c +++ bsdgames-2.17/cribbage/io.c @@ -245,7 +245,7 @@ retval = FALSE; rnk = sut = EMPTY; - if (!(line = getline())) + if (!(line = get_line())) goto gotit; p = p1 = line; while (*p1 != ' ' && *p1 != '\0') @@ -346,7 +346,7 @@ for (sum = 0;;) { msg(prompt); - if (!(p = getline()) || *p == '\0') { + if (!(p = get_line()) || *p == '\0') { msg(quiet ? "Not a number" : "That doesn't look like a number"); continue; @@ -533,7 +533,7 @@ * compressed to one space; a space is inserted before a ',' */ char * -getline() +get_line() { char *sp; int c, oy, ox; only in patch2: unchanged: --- bsdgames-2.17.orig/cribbage/cribbage.h +++ bsdgames-2.17/cribbage/cribbage.h @@ -77,7 +77,7 @@ int fifteens(const CARD [], int); void game(void); void gamescore(void); -char *getline(void); +char *get_line(void); int getuchar(void); int incard(CARD *); int infrom(const CARD [], int, const char *); only in patch2: unchanged: --- bsdgames-2.17.orig/boggle/boggle/extern.h +++ bsdgames-2.17/boggle/boggle/extern.h @@ -43,7 +43,7 @@ long dictseek(FILE *, long, int); void findword(void); void flushin(FILE *); -char *getline(char *); +char *get_line(char *); void getword(char *); int help(void); int inputch(void); only in patch2: unchanged: --- bsdgames-2.17.orig/boggle/boggle/mach.c +++ bsdgames-2.17/boggle/boggle/mach.c @@ -168,7 +168,7 @@ * - doesn't accept words longer than MAXWORDLEN or containing caps */ char * -getline(q) +get_line(q) char *q; { int ch, done; only in patch2: unchanged: --- bsdgames-2.17.orig/boggle/boggle/bog.c +++ bsdgames-2.17/boggle/boggle/bog.c @@ -336,7 +336,7 @@ } while (1) { - if (getline(buf) == NULL) { + if (get_line(buf) == NULL) { if (feof(stdin)) clearerr(stdin); break;