{"thread":{"id":"242","subject":"[PATCH] git-pasky debian dir","startedAt":"2005-04-22T13:18:06Z","lastAt":"2005-04-22T18:45:51Z","messageCount":4,"participants":["Joshua T. Corbin","Chris Wright"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"1264","messageId":"200504220918.06977.jcorbin@wunjo.org","threadId":"242","inReplyTo":null,"subject":"[PATCH] git-pasky debian dir","fromName":"Joshua T. Corbin","fromEmail":"jcorbin@wunjo.org","sentAt":"2005-04-22T13:18:06Z","receivedAt":"2005-04-22T13:18:06Z","isPatch":true,"sender":{"key":"jcorbin@wunjo.org","avatar":null},"body":"After seeing the spec file, I had to do this:\n\nYou can get the binary here:\n  http://node1.wunjo.org/~jcorbin/git-pasky_0.6.3-1_i386.deb\n\nalternatively you can pull from here:\n  rsync://node1.wunjo.org/git/git\n\nIt's against b31d16fad0013b3f106b227232559e24daf36962. It installs \nto /usr/bin, but I hacked things about so that *.sh goes \nin /usr/share/git-pasky/scripts. Haven't had many people try it yet, but it \nworks for me; this isn't exactly my first debian package, but if anyone sees \nany glaring issues with it, I'd love to hear about it.\n\nSigned-off-by: Joshua T. Corbin \n\n\n--- /dev/null\n+++ 2f556bba4a059b3aaefb0bbacac64d60a14e127a/debian/changelog\n@@ -0,0 +1,6 @@\n+git-pasky (0.6.3-1) unstable; urgency=low\n+\n+ * Saw the spec file, felt obliged ;)\n+\n+ -- Joshua T. Corbin Fri, 22 Apr 2005 00:17:03 -0400\n+\n--- /dev/null\n+++ 2f556bba4a059b3aaefb0bbacac64d60a14e127a/debian/compat\n@@ -0,0 +1 @@\n+4\n--- /dev/null\n+++ 2f556bba4a059b3aaefb0bbacac64d60a14e127a/debian/control\n@@ -0,0 +1,16 @@\n+Source: git-pasky\n+Section: admin\n+Priority: optional\n+Maintainer: Joshua T. Corbin \n+Build-Depends: debhelper (>= 4.0.0)\n+Standards-Version: 3.6.1\n+\n+Package: git-pasky\n+Architecture: any\n+Depends: ${shlibs:Depends}\n+Description: GIT - the stupid content tracker\n+ GIT comes in two layers. The bottom layer is merely an extremely fast and\n+ flexible filesystem-based database designed to store directory trees with\n+ regard to their history. The top layer is a SCM-like tool which enables human\n+ beings to work with the database in a manner to a degree similar to other SCM\n+ tools (like CVS, BitKeeper or Monotone).\n--- /dev/null\n+++ 2f556bba4a059b3aaefb0bbacac64d60a14e127a/debian/copyright\n@@ -0,0 +1,367 @@\n+This package was debianized by Joshua T. Corbin on\n+Fri, 22 Apr 2005 00:17:03 -0400.\n+\n+It was downloaded from rsync://pasky.or.cz/git\n+\n+License:\n+\n+ Note that the only valid version of the GPL as far as this project\n+ is concerned is _this_ particular version of the license (ie v2, not\n+ v2.2 or v3.x or whatever), unless explicitly otherwise stated.\n+\n+ HOWEVER, in order to allow a migration to GPLv3 if that seems like\n+ a good idea, I also ask that people involved with the project make\n+ their preferences known. In particular, if you trust me to make that\n+ decision, you might note so in your copyright message, ie something\n+ like\n+\n+\tThis file is licensed under the GPL v2, or a later version\n+\tat the discretion of Linus.\n+\n+ might avoid issues. But we can also just decide to synchronize and\n+ contact all copyright holders on record if/when the occasion arises.\n+\n+\t\t\tLinus Torvalds\n+\n+----------------------------------------\n+\n+\t\t GNU GENERAL PUBLIC LICENSE\n+\t\t Version 2, June 1991\n+\n+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.\n+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n+ Everyone is permitted to copy and distribute verbatim copies\n+ of this license document, but changing it is not allowed.\n+\n+\t\t\t Preamble\n+\n+ The licenses for most software are designed to take away your\n+freedom to share and change it. By contrast, the GNU General Public\n+License is intended to guarantee your freedom to share and change free\n+software--to make sure the software is free for all its users. This\n+General Public License applies to most of the Free Software\n+Foundation's software and to any other program whose authors commit to\n+using it. (Some other Free Software Foundation software is covered by\n+the GNU Library General Public License instead.) You can apply it to\n+your programs, too.\n+\n+ When we speak of free software, we are referring to freedom, not\n+price. Our General Public Licenses are designed to make sure that you\n+have the freedom to distribute copies of free software (and charge for\n+this service if you wish), that you receive source code or can get it\n+if you want it, that you can change the software or use pieces of it\n+in new free programs; and that you know you can do these things.\n+\n+ To protect your rights, we need to make restrictions that forbid\n+anyone to deny you these rights or to ask you to surrender the rights.\n+These restrictions translate to certain responsibilities for you if you\n+distribute copies of the software, or if you modify it.\n+\n+ For example, if you distribute copies of such a program, whether\n+gratis or for a fee, you must give the recipients all the rights that\n+you have. You must make sure that they, too, receive or can get the\n+source code. And you must show them these terms so they know their\n+rights.\n+\n+ We protect your rights with two steps: (1) copyright the software, and\n+(2) offer you this license which gives you legal permission to copy,\n+distribute and/or modify the software.\n+\n+ Also, for each author's protection and ours, we want to make certain\n+that everyone understands that there is no warranty for this free\n+software. If the software is modified by someone else and passed on, we\n+want its recipients to know that what they have is not the original, so\n+that any problems introduced by others will not reflect on the original\n+authors' reputations.\n+\n+ Finally, any free program is threatened constantly by software\n+patents. We wish to avoid the danger that redistributors of a free\n+program will individually obtain patent licenses, in effect making the\n+program proprietary. To prevent this, we have made it clear that any\n+patent must be licensed for everyone's free use or not licensed at all.\n+\n+ The precise terms and conditions for copying, distribution and\n+modification follow.\n+\f\n+\t\t GNU GENERAL PUBLIC LICENSE\n+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\n+\n+ 0. This License applies to any program or other work which contains\n+a notice placed by the copyright holder saying it may be distributed\n+under the terms of this General Public License. The \"Program\", below,\n+refers to any such program or work, and a \"work based on the Program\"\n+means either the Program or any derivative work under copyright law:\n+that is to say, a work containing the Program or a portion of it,\n+either verbatim or with modifications and/or translated into another\n+language. (Hereinafter, translation is included without limitation in\n+the term \"modification\".) Each licensee is addressed as \"you\".\n+\n+Activities other than copying, distribution and modification are not\n+covered by this License; they are outside its scope. The act of\n+running the Program is not restricted, and the output from the Program\n+is covered only if its contents constitute a work based on the\n+Program (independent of having been made by running the Program).\n+Whether that is true depends on what the Program does.\n+\n+ 1. You may copy and distribute verbatim copies of the Program's\n+source code as you receive it, in any medium, provided that you\n+conspicuously and appropriately publish on each copy an appropriate\n+copyright notice and disclaimer of warranty; keep intact all the\n+notices that refer to this License and to the absence of any warranty;\n+and give any other recipients of the Program a copy of this License\n+along with the Program.\n+\n+You may charge a fee for the physical act of transferring a copy, and\n+you may at your option offer warranty protection in exchange for a fee.\n+\n+ 2. You may modify your copy or copies of the Program or any portion\n+of it, thus forming a work based on the Program, and copy and\n+distribute such modifications or work under the terms of Section 1\n+above, provided that you also meet all of these conditions:\n+\n+ a) You must cause the modified files to carry prominent notices\n+ stating that you changed the files and the date of any change.\n+\n+ b) You must cause any work that you distribute or publish, that in\n+ whole or in part contains or is derived from the Program or any\n+ part thereof, to be licensed as a whole at no charge to all third\n+ parties under the terms of this License.\n+\n+ c) If the modified program normally reads commands interactively\n+ when run, you must cause it, when started running for such\n+ interactive use in the most ordinary way, to print or display an\n+ announcement including an appropriate copyright notice and a\n+ notice that there is no warranty (or else, saying that you provide\n+ a warranty) and that users may redistribute the program under\n+ these conditions, and telling the user how to view a copy of this\n+ License. (Exception: if the Program itself is interactive but\n+ does not normally print such an announcement, your work based on\n+ the Program is not required to print an announcement.)\n+\f\n+These requirements apply to the modified work as a whole. If\n+identifiable sections of that work are not derived from the Program,\n+and can be reasonably considered independent and separate works in\n+themselves, then this License, and its terms, do not apply to those\n+sections when you distribute them as separate works. But when you\n+distribute the same sections as part of a whole which is a work based\n+on the Program, the distribution of the whole must be on the terms of\n+this License, whose permissions for other licensees extend to the\n+entire whole, and thus to each and every part regardless of who wrote it.\n+\n+Thus, it is not the intent of this section to claim rights or contest\n+your rights to work written entirely by you; rather, the intent is to\n+exercise the right to control the distribution of derivative or\n+collective works based on the Program.\n+\n+In addition, mere aggregation of another work not based on the Program\n+with the Program (or with a work based on the Program) on a volume of\n+a storage or distribution medium does not bring the other work under\n+the scope of this License.\n+\n+ 3. You may copy and distribute the Program (or a work based on it,\n+under Section 2) in object code or executable form under the terms of\n+Sections 1 and 2 above provided that you also do one of the following:\n+\n+ a) Accompany it with the complete corresponding machine-readable\n+ source code, which must be distributed under the terms of Sections\n+ 1 and 2 above on a medium customarily used for software interchange; or,\n+\n+ b) Accompany it with a written offer, valid for at least three\n+ years, to give any third party, for a charge no more than your\n+ cost of physically performing source distribution, a complete\n+ machine-readable copy of the corresponding source code, to be\n+ distributed under the terms of Sections 1 and 2 above on a medium\n+ customarily used for software interchange; or,\n+\n+ c) Accompany it with the information you received as to the offer\n+ to distribute corresponding source code. (This alternative is\n+ allowed only for noncommercial distribution and only if you\n+ received the program in object code or executable form with such\n+ an offer, in accord with Subsection b above.)\n+\n+The source code for a work means the preferred form of the work for\n+making modifications to it. For an executable work, complete source\n+code means all the source code for all modules it contains, plus any\n+associated interface definition files, plus the scripts used to\n+control compilation and installation of the executable. However, as a\n+special exception, the source code distributed need not include\n+anything that is normally distributed (in either source or binary\n+form) with the major components (compiler, kernel, and so on) of the\n+operating system on which the executable runs, unless that component\n+itself accompanies the executable.\n+\n+If distribution of executable or object code is made by offering\n+access to copy from a designated place, then offering equivalent\n+access to copy the source code from the same place counts as\n+distribution of the source code, even though third parties are not\n+compelled to copy the source along with the object code.\n+\f\n+ 4. You may not copy, modify, sublicense, or distribute the Program\n+except as expressly provided under this License. Any attempt\n+otherwise to copy, modify, sublicense or distribute the Program is\n+void, and will automatically terminate your rights under this License.\n+However, parties who have received copies, or rights, from you under\n+this License will not have their licenses terminated so long as such\n+parties remain in full compliance.\n+\n+ 5. You are not required to accept this License, since you have not\n+signed it. However, nothing else grants you permission to modify or\n+distribute the Program or its derivative works. These actions are\n+prohibited by law if you do not accept this License. Therefore, by\n+modifying or distributing the Program (or any work based on the\n+Program), you indicate your acceptance of this License to do so, and\n+all its terms and conditions for copying, distributing or modifying\n+the Program or works based on it.\n+\n+ 6. Each time you redistribute the Program (or any work based on the\n+Program), the recipient automatically receives a license from the\n+original licensor to copy, distribute or modify the Program subject to\n+these terms and conditions. You may not impose any further\n+restrictions on the recipients' exercise of the rights granted herein.\n+You are not responsible for enforcing compliance by third parties to\n+this License.\n+\n+ 7. If, as a consequence of a court judgment or allegation of patent\n+infringement or for any other reason (not limited to patent issues),\n+conditions are imposed on you (whether by court order, agreement or\n+otherwise) that contradict the conditions of this License, they do not\n+excuse you from the conditions of this License. If you cannot\n+distribute so as to satisfy simultaneously your obligations under this\n+License and any other pertinent obligations, then as a consequence you\n+may not distribute the Program at all. For example, if a patent\n+license would not permit royalty-free redistribution of the Program by\n+all those who receive copies directly or indirectly through you, then\n+the only way you could satisfy both it and this License would be to\n+refrain entirely from distribution of the Program.\n+\n+If any portion of this section is held invalid or unenforceable under\n+any particular circumstance, the balance of the section is intended to\n+apply and the section as a whole is intended to apply in other\n+circumstances.\n+\n+It is not the purpose of this section to induce you to infringe any\n+patents or other property right claims or to contest validity of any\n+such claims; this section has the sole purpose of protecting the\n+integrity of the free software distribution system, which is\n+implemented by public license practices. Many people have made\n+generous contributions to the wide range of software distributed\n+through that system in reliance on consistent application of that\n+system; it is up to the author/donor to decide if he or she is willing\n+to distribute software through any other system and a licensee cannot\n+impose that choice.\n+\n+This section is intended to make thoroughly clear what is believed to\n+be a consequence of the rest of this License.\n+\f\n+ 8. If the distribution and/or use of the Program is restricted in\n+certain countries either by patents or by copyrighted interfaces, the\n+original copyright holder who places the Program under this License\n+may add an explicit geographical distribution limitation excluding\n+those countries, so that distribution is permitted only in or among\n+countries not thus excluded. In such case, this License incorporates\n+the limitation as if written in the body of this License.\n+\n+ 9. The Free Software Foundation may publish revised and/or new versions\n+of the General Public License from time to time. Such new versions will\n+be similar in spirit to the present version, but may differ in detail to\n+address new problems or concerns.\n+\n+Each version is given a distinguishing version number. If the Program\n+specifies a version number of this License which applies to it and \"any\n+later version\", you have the option of following the terms and conditions\n+either of that version or of any later version published by the Free\n+Software Foundation. If the Program does not specify a version number of\n+this License, you may choose any version ever published by the Free Software\n+Foundation.\n+\n+ 10. If you wish to incorporate parts of the Program into other free\n+programs whose distribution conditions are different, write to the author\n+to ask for permission. For software which is copyrighted by the Free\n+Software Foundation, write to the Free Software Foundation; we sometimes\n+make exceptions for this. Our decision will be guided by the two goals\n+of preserving the free status of all derivatives of our free software and\n+of promoting the sharing and reuse of software generally.\n+\n+\t\t\t NO WARRANTY\n+\n+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY\n+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN\n+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES\n+PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED\n+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\n+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS\n+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE\n+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,\n+REPAIR OR CORRECTION.\n+\n+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\n+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR\n+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,\n+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING\n+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED\n+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY\n+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER\n+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE\n+POSSIBILITY OF SUCH DAMAGES.\n+\n+\t\t END OF TERMS AND CONDITIONS\n+\f\n+\t How to Apply These Terms to Your New Programs\n+\n+ If you develop a new program, and you want it to be of the greatest\n+possible use to the public, the best way to achieve this is to make it\n+free software which everyone can redistribute and change under these terms.\n+\n+ To do so, attach the following notices to the program. It is safest\n+to attach them to the start of each source file to most effectively\n+convey the exclusion of warranty; and each file should have at least\n+the \"copyright\" line and a pointer to where the full notice is found.\n+\n+ \n+ Copyright (C) \n+\n+ This program is free software; you can redistribute it and/or modify\n+ it under the terms of the GNU General Public License as published by\n+ the Free Software Foundation; either version 2 of the License, or\n+ (at your option) any later version.\n+\n+ This program is distributed in the hope that it will be useful,\n+ but WITHOUT ANY WARRANTY; without even the implied warranty of\n+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n+ GNU General Public License for more details.\n+\n+ You should have received a copy of the GNU General Public License\n+ along with this program; if not, write to the Free Software\n+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n+\n+\n+Also add information on how to contact you by electronic and paper mail.\n+\n+If the program is interactive, make it output a short notice like this\n+when it starts in an interactive mode:\n+\n+ Gnomovision version 69, Copyright (C) year name of author\n+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n+ This is free software, and you are welcome to redistribute it\n+ under certain conditions; type `show c' for details.\n+\n+The hypothetical commands `show w' and `show c' should show the appropriate\n+parts of the General Public License. Of course, the commands you use may\n+be called something other than `show w' and `show c'; they could even be\n+mouse-clicks or menu items--whatever suits your program.\n+\n+You should also get your employer (if you work as a programmer) or your\n+school, if any, to sign a \"copyright disclaimer\" for the program, if\n+necessary. Here is a sample; alter the names:\n+\n+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program\n+ `Gnomovision' (which makes passes at compilers) written by James Hacker.\n+\n+ , 1 April 1989\n+ Ty Coon, President of Vice\n+\n+This General Public License does not permit incorporating your program into\n+proprietary programs. If your program is a subroutine library, you may\n+consider it more useful to permit linking proprietary applications with the\n+library. If this is what you want to do, use the GNU Library General\n+Public License instead of this License.\n--- /dev/null\n+++ 2f556bba4a059b3aaefb0bbacac64d60a14e127a/debian/dirs\n@@ -0,0 +1,2 @@\n+usr/bin\n+usr/sbin\n--- /dev/null\n+++ 2f556bba4a059b3aaefb0bbacac64d60a14e127a/debian/docs\n@@ -0,0 +1,3 @@\n+README\n+README.reference\n+COPYING\n--- /dev/null\n+++ 2f556bba4a059b3aaefb0bbacac64d60a14e127a/debian/rules\n@@ -0,0 +1,66 @@\n+#!/usr/bin/make -f\n+\n+#export DH_VERBOSE=1\n+\n+CFLAGS = -Wall -g\n+\n+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))\n+\tCFLAGS += -O0\n+else\n+\tCFLAGS += -O2\n+endif\n+\n+configure:\n+\n+build: build-stamp\n+\n+build-stamp:\n+\tdh_testdir\n+\n+\tpatch -p1 < $(CURDIR)/debian/scriptdir.diff\n+\t$(MAKE)\n+\n+\ttouch build-stamp\n+\n+clean:\n+\tdh_testdir\n+\tdh_testroot\n+\trm -f build-stamp\n+\n+\t-$(MAKE) clean\n+\tpatch -Rp1 < $(CURDIR)/debian/scriptdir.diff\n+\n+\tdh_clean \n+\n+install: build\n+\tdh_testdir\n+\tdh_testroot\n+\tdh_clean -k \n+\tdh_installdirs\n+\n+\t$(MAKE) install DESTDIR=$(CURDIR)/debian/git-pasky prefix='/usr'\n+\tinstall -m755 -d $(CURDIR)/debian/git-pasky/usr/share/doc/git-pasky/contrib\n+\tinstall $(CURDIR)/contrib/* $(CURDIR)/debian/git-pasky/usr/share/doc/git-pasky/contrib\n+\n+binary-arch: build install\n+\tdh_testdir\n+\tdh_testroot\n+\tdh_installchangelogs \n+\tdh_installdocs\n+\tdh_installexamples\n+#\tdh_install\n+#\tdh_installmenu\n+#\tdh_installinfo\n+\tdh_installman\n+\tdh_link\n+\tdh_strip\n+\tdh_compress\n+\tdh_fixperms\n+\tdh_installdeb\n+\tdh_shlibdeps\n+\tdh_gencontrol\n+\tdh_md5sums\n+\tdh_builddeb\n+\n+binary: binary-arch\n+.PHONY: build clean binary-arch binary install\n--- /dev/null\n+++ 2f556bba4a059b3aaefb0bbacac64d60a14e127a/debian/scriptdir.diff\n@@ -0,0 +1,82 @@\n+diff -u a/Makefile b/Makefile\n+--- a/Makefile\t2005-04-22 00:59:22.000000000 -0400\n++++ b/Makefile\t2005-04-22 00:59:43.000000000 -0400\n+@@ -18,6 +18,7 @@\n+ prefix=$(HOME)\n+ \n+ bindir=$(prefix)/bin\n++scriptdir=$(prefix)/share/git-pasky/scripts\n+ \n+ CC=gcc\n+ AR=ar\n+@@ -28,11 +29,11 @@\n+ \tcheck-files ls-tree merge-base merge-cache unpack-file git-export \\\n+ \tdiff-cache convert-cache\n+ \n+-SCRIPT=\tparent-id tree-id git gitXnormid.sh gitadd.sh gitaddremote.sh \\\n+-\tgitcommit.sh gitdiff-do gitdiff.sh gitlog.sh gitls.sh gitlsobj.sh \\\n+-\tgitmerge.sh gitpull.sh gitrm.sh gittag.sh gittrack.sh gitexport.sh \\\n+-\tgitapply.sh gitcancel.sh gitXlntree.sh commit-id gitlsremote.sh \\\n+-\tgitfork.sh gitinit.sh gitseek.sh gitstatus.sh gitpatch.sh \\\n++BINSCRIPTS= parent-id tree-id git gitdiff-do commit-id\n++SCRIPT=\tgitXnormid.sh gitadd.sh gitaddremote.sh gitcommit.sh gitdiff.sh \\\n++ gitlog.sh gitls.sh gitlsobj.sh gitmerge.sh gitpull.sh gitrm.sh gittag.sh \\\n++\tgittrack.sh gitexport.sh gitapply.sh gitcancel.sh gitXlntree.sh \\\n++\tgitlsremote.sh gitfork.sh gitinit.sh gitseek.sh gitstatus.sh gitpatch.sh \\\n+ \tgitmerge-file.sh\n+ \n+ COMMON=\tread-cache.o\n+@@ -80,7 +81,9 @@\n+ \n+ install: $(PROG) $(GEN_SCRIPT)\n+ \tinstall -m755 -d $(DESTDIR)$(bindir)\n+-\tinstall $(PROG) $(SCRIPT) $(GEN_SCRIPT) $(DESTDIR)$(bindir)\n++\tinstall -m755 -d $(DESTDIR)$(scriptdir)\n++\tinstall $(PROG) $(BINSCRIPTS) $(DESTDIR)$(bindir)\n++\tinstall $(SCRIPT) $(GEN_SCRIPT) $(DESTDIR)$(scriptdir)\n+ \n+ clean:\n+ \trm -f *.o mozilla-sha1/*.o $(PROG) $(GEN_SCRIPT) $(LIB_FILE)\n+diff -u a/commit-id b/commit-id\n+--- a/commit-id\t2005-04-22 00:59:22.000000000 -0400\n++++ b/commit-id\t2005-04-22 01:02:40.000000000 -0400\n+@@ -5,4 +5,4 @@\n+ #\n+ # Takes the appropriate ID, defaults to HEAD.\n+ \n+-gitXnormid.sh -c $1\n++/usr/share/git-pasky/scripts/gitXnormid.sh -c $1\n+Common subdirectories: a/contrib and b/contrib\n+Only in b: debian\n+diff -u a/git b/git\n+--- a/git\t2005-04-22 00:59:22.000000000 -0400\n++++ b/git\t2005-04-22 01:01:43.000000000 -0400\n+@@ -17,6 +17,7 @@\n+ \texit 1\n+ }\n+ \n++export PATH=/usr/share/git-pasky/scripts:$PATH\n+ \n+ help () {\n+ \tcat <<__END__\n+Common subdirectories: a/mozilla-sha1 and b/mozilla-sha1\n+diff -u a/parent-id b/parent-id\n+--- a/parent-id\t2005-04-22 00:59:22.000000000 -0400\n++++ b/parent-id\t2005-04-22 01:02:01.000000000 -0400\n+@@ -7,6 +7,6 @@\n+ \n+ PARENT=\"^parent [A-Za-z0-9]{40}$\"\n+ \n+-id=$(gitXnormid.sh -c $1) || exit 1\n++id=$(/usr/share/git-pasky/scripts/gitXnormid.sh -c $1) || exit 1\n+ \n+ cat-file commit $id | egrep \"$PARENT\" | cut -d ' ' -f 2\n+diff -u a/tree-id b/tree-id\n+--- a/tree-id\t2005-04-22 00:59:22.000000000 -0400\n++++ b/tree-id\t2005-04-22 01:00:40.000000000 -0400\n+@@ -5,4 +5,4 @@\n+ #\n+ # Takes ID of the appropriate commit, defaults to HEAD.\n+ \n+-gitXnormid.sh $1\n++/usr/share/git-pasky/scripts/gitXnormid.sh $1\n"},{"id":"1288","messageId":"20050422161635.GA5324@shell0.pdx.osdl.net","threadId":"242","inReplyTo":"200504220918.06977.jcorbin@wunjo.org","subject":"Re: [PATCH] git-pasky debian dir","fromName":"Chris Wright","fromEmail":"chrisw@osdl.org","sentAt":"2005-04-22T16:16:35Z","receivedAt":"2005-04-22T16:16:35Z","isPatch":true,"sender":{"key":"chrisw@sous-sol.org","avatar":null},"body":"* Joshua T. Corbin (jcorbin@wunjo.org) wrote:\n> After seeing the spec file, I had to do this:\n> \n> You can get the binary here:\n>   http://node1.wunjo.org/~jcorbin/git-pasky_0.6.3-1_i386.deb\n> \n> alternatively you can pull from here:\n>   rsync://node1.wunjo.org/git/git\n> \n> It's against b31d16fad0013b3f106b227232559e24daf36962. It installs \n> to /usr/bin, but I hacked things about so that *.sh goes \n> in /usr/share/git-pasky/scripts. Haven't had many people try it yet, but it \n> works for me; this isn't exactly my first debian package, but if anyone sees \n> any glaring issues with it, I'd love to hear about it.\n> \n> --- /dev/null\n> +++ 2f556bba4a059b3aaefb0bbacac64d60a14e127a/debian/scriptdir.diff\n> @@ -0,0 +1,82 @@\n> +diff -u a/Makefile b/Makefile\n> +--- a/Makefile\t2005-04-22 00:59:22.000000000 -0400\n> ++++ b/Makefile\t2005-04-22 00:59:43.000000000 -0400\n> +@@ -18,6 +18,7 @@\n> + prefix=$(HOME)\n> + \n> + bindir=$(prefix)/bin\n> ++scriptdir=$(prefix)/share/git-pasky/scripts\n> + \n> + CC=gcc\n> + AR=ar\n> +@@ -28,11 +29,11 @@\n> + \tcheck-files ls-tree merge-base merge-cache unpack-file git-export \\\n> + \tdiff-cache convert-cache\n> + \n> +-SCRIPT=\tparent-id tree-id git gitXnormid.sh gitadd.sh gitaddremote.sh \\\n> +-\tgitcommit.sh gitdiff-do gitdiff.sh gitlog.sh gitls.sh gitlsobj.sh \\\n> +-\tgitmerge.sh gitpull.sh gitrm.sh gittag.sh gittrack.sh gitexport.sh \\\n> +-\tgitapply.sh gitcancel.sh gitXlntree.sh commit-id gitlsremote.sh \\\n> +-\tgitfork.sh gitinit.sh gitseek.sh gitstatus.sh gitpatch.sh \\\n> ++BINSCRIPTS= parent-id tree-id git gitdiff-do commit-id\n> ++SCRIPT=\tgitXnormid.sh gitadd.sh gitaddremote.sh gitcommit.sh gitdiff.sh \\\n> ++ gitlog.sh gitls.sh gitlsobj.sh gitmerge.sh gitpull.sh gitrm.sh gittag.sh \\\n> ++\tgittrack.sh gitexport.sh gitapply.sh gitcancel.sh gitXlntree.sh \\\n> ++\tgitlsremote.sh gitfork.sh gitinit.sh gitseek.sh gitstatus.sh gitpatch.sh \\\n> + \tgitmerge-file.sh\n> + \n> + COMMON=\tread-cache.o\n> +@@ -80,7 +81,9 @@\n> + \n> + install: $(PROG) $(GEN_SCRIPT)\n> + \tinstall -m755 -d $(DESTDIR)$(bindir)\n> +-\tinstall $(PROG) $(SCRIPT) $(GEN_SCRIPT) $(DESTDIR)$(bindir)\n> ++\tinstall -m755 -d $(DESTDIR)$(scriptdir)\n> ++\tinstall $(PROG) $(BINSCRIPTS) $(DESTDIR)$(bindir)\n> ++\tinstall $(SCRIPT) $(GEN_SCRIPT) $(DESTDIR)$(scriptdir)\n\nThis whole bit should be formalized. Ideally, I'd like to do /usr/bin/git\nfrontend, with all scripts in /usr/libexec/git/. However, this requires\nsomething more than hardcoding paths.\n\n> + clean:\n> + \trm -f *.o mozilla-sha1/*.o $(PROG) $(GEN_SCRIPT) $(LIB_FILE)\n> +diff -u a/commit-id b/commit-id\n> +--- a/commit-id\t2005-04-22 00:59:22.000000000 -0400\n> ++++ b/commit-id\t2005-04-22 01:02:40.000000000 -0400\n> +@@ -5,4 +5,4 @@\n> + #\n> + # Takes the appropriate ID, defaults to HEAD.\n> + \n> +-gitXnormid.sh -c $1\n> ++/usr/share/git-pasky/scripts/gitXnormid.sh -c $1\n\nlike this...\n\n> +Common subdirectories: a/contrib and b/contrib\n> +Only in b: debian\n> +diff -u a/git b/git\n> +--- a/git\t2005-04-22 00:59:22.000000000 -0400\n> ++++ b/git\t2005-04-22 01:01:43.000000000 -0400\n> +@@ -17,6 +17,7 @@\n> + \texit 1\n> + }\n> + \n> ++export PATH=/usr/share/git-pasky/scripts:$PATH\n\nOr this...\n\n> + help () {\n> + \tcat <<__END__\n> +Common subdirectories: a/mozilla-sha1 and b/mozilla-sha1\n> +diff -u a/parent-id b/parent-id\n> +--- a/parent-id\t2005-04-22 00:59:22.000000000 -0400\n> ++++ b/parent-id\t2005-04-22 01:02:01.000000000 -0400\n> +@@ -7,6 +7,6 @@\n> + \n> + PARENT=\"^parent [A-Za-z0-9]{40}$\"\n> + \n> +-id=$(gitXnormid.sh -c $1) || exit 1\n> ++id=$(/usr/share/git-pasky/scripts/gitXnormid.sh -c $1) || exit 1\n\nditto...\n\n> + cat-file commit $id | egrep \"$PARENT\" | cut -d ' ' -f 2\n> +diff -u a/tree-id b/tree-id\n> +--- a/tree-id\t2005-04-22 00:59:22.000000000 -0400\n> ++++ b/tree-id\t2005-04-22 01:00:40.000000000 -0400\n> +@@ -5,4 +5,4 @@\n> + #\n> + # Takes ID of the appropriate commit, defaults to HEAD.\n> + \n> +-gitXnormid.sh $1\n> ++/usr/share/git-pasky/scripts/gitXnormid.sh $1\n\nYou get the idea ;-) I certainly see how it makes sense for a first\nrun to get it going. But this will need fixing upstream.\n\nthanks,\n-chris\n-- \nLinux Security Modules http://lsm.immunix.org http://lsm.bkbits.net\n"},{"id":"1302","messageId":"200504221400.11507.jcorbin@wunjo.org","threadId":"242","inReplyTo":"20050422161635.GA5324@shell0.pdx.osdl.net","subject":"Re: [PATCH] git-pasky debian dir","fromName":"Joshua T. Corbin","fromEmail":"jcorbin@wunjo.org","sentAt":"2005-04-22T18:00:11Z","receivedAt":"2005-04-22T18:00:11Z","isPatch":true,"sender":{"key":"jcorbin@wunjo.org","avatar":null},"body":"On 22 April 2005 12:16, Chris Wright wrote:\n> This whole bit should be formalized.\nAgreed, hence why I did it as a package-build-time patch instead of changing \ndirectly in my repository.\n\n> Ideally, I'd like to do /usr/bin/git frontend, with all scripts\n> in /usr/libexec/git/.\nHow standard is this '/usr/libexec'? I have no such directory on my Debian \nboxes. If /usr/share rubs you the wroung way, what of \nsimply /usr/lib/git-pasky?\n\n> However, this requires something more than hardcoding paths.\nDefinately, and it may not play well with the simpler method of installing to \n$HOME/bin. This was just a quick hack as not to pollute /usr/bin with files \nthat aren't directly executed by the user.\n\n> You get the idea ;-) I certainly see how it makes sense for a first\n> run to get it going. But this will need fixing upstream.\nThis will all be moot when cogito goes the way of cg-* ;-)\n\nCheers,\nJosh\n\n-- \nRegards,\nJoshua T. Corbin \n"},{"id":"1307","messageId":"20050422184551.GB5324@shell0.pdx.osdl.net","threadId":"242","inReplyTo":"200504221400.11507.jcorbin@wunjo.org","subject":"Re: [PATCH] git-pasky debian dir","fromName":"Chris Wright","fromEmail":"chrisw@osdl.org","sentAt":"2005-04-22T18:45:51Z","receivedAt":"2005-04-22T18:45:51Z","isPatch":true,"sender":{"key":"chrisw@sous-sol.org","avatar":null},"body":"* Joshua T. Corbin (jcorbin@wunjo.org) wrote:\n> On 22 April 2005 12:16, Chris Wright wrote:\n> > This whole bit should be formalized.\n> Agreed, hence why I did it as a package-build-time patch instead of changing \n> directly in my repository.\n> \n> > Ideally, I'd like to do /usr/bin/git frontend, with all scripts\n> > in /usr/libexec/git/.\n> How standard is this '/usr/libexec'? I have no such directory on my Debian \n> boxes. If /usr/share rubs you the wroung way, what of \n> simply /usr/lib/git-pasky?\n\nHrm, it's not in FHS, but it's certainly in use on my install:\n\n$ find /usr/libexec | wc -l\n122\n\nI don't care too much, I imagine distros wind up customizing this\nanyway.\n\n> > However, this requires something more than hardcoding paths.\n> Definately, and it may not play well with the simpler method of installing to \n> $HOME/bin. This was just a quick hack as not to pollute /usr/bin with files \n> that aren't directly executed by the user.\n\nYup, that's why I dropped 'em in /usr/local/bin for now.\n\n> > You get the idea ;-) I certainly see how it makes sense for a first\n> > run to get it going. But this will need fixing upstream.\n> This will all be moot when cogito goes the way of cg-* ;-)\n\nHrm...good point.\n\nthanks,\n-chris\n-- \nLinux Security Modules http://lsm.immunix.org http://lsm.bkbits.net\n"}]}